summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp/e_aes.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/evp/e_aes.c')
-rw-r--r--src/lib/libcrypto/evp/e_aes.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c
index bd6c0a3a62..7b67984fa1 100644
--- a/src/lib/libcrypto/evp/e_aes.c
+++ b/src/lib/libcrypto/evp/e_aes.c
@@ -48,12 +48,10 @@
48 * 48 *
49 */ 49 */
50 50
51#include <openssl/opensslconf.h>
52#ifndef OPENSSL_NO_AES 51#ifndef OPENSSL_NO_AES
53#include <openssl/evp.h> 52#include <openssl/evp.h>
54#include <openssl/err.h> 53#include <openssl/err.h>
55#include <string.h> 54#include <string.h>
56#include <assert.h>
57#include <openssl/aes.h> 55#include <openssl/aes.h>
58#include "evp_locl.h" 56#include "evp_locl.h"
59 57
@@ -69,32 +67,32 @@ typedef struct
69 67
70IMPLEMENT_BLOCK_CIPHER(aes_128, ks, AES, EVP_AES_KEY, 68IMPLEMENT_BLOCK_CIPHER(aes_128, ks, AES, EVP_AES_KEY,
71 NID_aes_128, 16, 16, 16, 128, 69 NID_aes_128, 16, 16, 16, 128,
72 0, aes_init_key, NULL, 70 EVP_CIPH_FLAG_FIPS, aes_init_key, NULL,
73 EVP_CIPHER_set_asn1_iv, 71 EVP_CIPHER_set_asn1_iv,
74 EVP_CIPHER_get_asn1_iv, 72 EVP_CIPHER_get_asn1_iv,
75 NULL) 73 NULL)
76IMPLEMENT_BLOCK_CIPHER(aes_192, ks, AES, EVP_AES_KEY, 74IMPLEMENT_BLOCK_CIPHER(aes_192, ks, AES, EVP_AES_KEY,
77 NID_aes_192, 16, 24, 16, 128, 75 NID_aes_192, 16, 24, 16, 128,
78 0, aes_init_key, NULL, 76 EVP_CIPH_FLAG_FIPS, aes_init_key, NULL,
79 EVP_CIPHER_set_asn1_iv, 77 EVP_CIPHER_set_asn1_iv,
80 EVP_CIPHER_get_asn1_iv, 78 EVP_CIPHER_get_asn1_iv,
81 NULL) 79 NULL)
82IMPLEMENT_BLOCK_CIPHER(aes_256, ks, AES, EVP_AES_KEY, 80IMPLEMENT_BLOCK_CIPHER(aes_256, ks, AES, EVP_AES_KEY,
83 NID_aes_256, 16, 32, 16, 128, 81 NID_aes_256, 16, 32, 16, 128,
84 0, aes_init_key, NULL, 82 EVP_CIPH_FLAG_FIPS, aes_init_key, NULL,
85 EVP_CIPHER_set_asn1_iv, 83 EVP_CIPHER_set_asn1_iv,
86 EVP_CIPHER_get_asn1_iv, 84 EVP_CIPHER_get_asn1_iv,
87 NULL) 85 NULL)
88 86
89#define IMPLEMENT_AES_CFBR(ksize,cbits) IMPLEMENT_CFBR(aes,AES,EVP_AES_KEY,ks,ksize,cbits,16) 87#define IMPLEMENT_AES_CFBR(ksize,cbits,flags) IMPLEMENT_CFBR(aes,AES,EVP_AES_KEY,ks,ksize,cbits,16,flags)
90 88
91IMPLEMENT_AES_CFBR(128,1) 89IMPLEMENT_AES_CFBR(128,1,EVP_CIPH_FLAG_FIPS)
92IMPLEMENT_AES_CFBR(192,1) 90IMPLEMENT_AES_CFBR(192,1,EVP_CIPH_FLAG_FIPS)
93IMPLEMENT_AES_CFBR(256,1) 91IMPLEMENT_AES_CFBR(256,1,EVP_CIPH_FLAG_FIPS)
94 92
95IMPLEMENT_AES_CFBR(128,8) 93IMPLEMENT_AES_CFBR(128,8,EVP_CIPH_FLAG_FIPS)
96IMPLEMENT_AES_CFBR(192,8) 94IMPLEMENT_AES_CFBR(192,8,EVP_CIPH_FLAG_FIPS)
97IMPLEMENT_AES_CFBR(256,8) 95IMPLEMENT_AES_CFBR(256,8,EVP_CIPH_FLAG_FIPS)
98 96
99static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 97static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
100 const unsigned char *iv, int enc) 98 const unsigned char *iv, int enc)