diff options
| author | jsing <> | 2014-05-15 14:14:56 +0000 |
|---|---|---|
| committer | jsing <> | 2014-05-15 14:14:56 +0000 |
| commit | adc9381efba015741fc5ed51d459725dee87fb54 (patch) | |
| tree | d1545fae6b44d7a9d7d6aa80a89b700911a313f3 /src/lib/libcrypto/evp/e_aes.c | |
| parent | 06e9116771d440a4cc40f2d8654de552543b9c00 (diff) | |
| download | openbsd-adc9381efba015741fc5ed51d459725dee87fb54.tar.gz openbsd-adc9381efba015741fc5ed51d459725dee87fb54.tar.bz2 openbsd-adc9381efba015741fc5ed51d459725dee87fb54.zip | |
KNF.
Diffstat (limited to 'src/lib/libcrypto/evp/e_aes.c')
| -rw-r--r-- | src/lib/libcrypto/evp/e_aes.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c index e4d9457c96..4da61b8f62 100644 --- a/src/lib/libcrypto/evp/e_aes.c +++ b/src/lib/libcrypto/evp/e_aes.c | |||
| @@ -658,7 +658,8 @@ aes_gcm_cleanup(EVP_CIPHER_CTX *c) | |||
| 658 | 658 | ||
| 659 | /* increment counter (64-bit int) by 1 */ | 659 | /* increment counter (64-bit int) by 1 */ |
| 660 | static void | 660 | static void |
| 661 | ctr64_inc(unsigned char *counter) { | 661 | ctr64_inc(unsigned char *counter) |
| 662 | { | ||
| 662 | int n = 8; | 663 | int n = 8; |
| 663 | unsigned char c; | 664 | unsigned char c; |
| 664 | 665 | ||
| @@ -991,11 +992,11 @@ aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, | |||
| 991 | | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \ | 992 | | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \ |
| 992 | | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT) | 993 | | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT) |
| 993 | 994 | ||
| 994 | BLOCK_CIPHER_custom(NID_aes, 128, 1,12, gcm, GCM, | 995 | BLOCK_CIPHER_custom(NID_aes, 128, 1, 12, gcm, GCM, |
| 995 | EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS) | 996 | EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS) |
| 996 | BLOCK_CIPHER_custom(NID_aes, 192, 1,12, gcm, GCM, | 997 | BLOCK_CIPHER_custom(NID_aes, 192, 1, 12, gcm, GCM, |
| 997 | EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS) | 998 | EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS) |
| 998 | BLOCK_CIPHER_custom(NID_aes, 256, 1,12, gcm, GCM, | 999 | BLOCK_CIPHER_custom(NID_aes, 256, 1, 12, gcm, GCM, |
| 999 | EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS) | 1000 | EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS) |
| 1000 | 1001 | ||
| 1001 | static int | 1002 | static int |
| @@ -1104,8 +1105,8 @@ aes_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, | |||
| 1104 | #define XTS_FLAGS (EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CUSTOM_IV \ | 1105 | #define XTS_FLAGS (EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CUSTOM_IV \ |
| 1105 | | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT) | 1106 | | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT) |
| 1106 | 1107 | ||
| 1107 | BLOCK_CIPHER_custom(NID_aes, 128, 1,16, xts, XTS, EVP_CIPH_FLAG_FIPS|XTS_FLAGS) | 1108 | BLOCK_CIPHER_custom(NID_aes, 128, 1, 16, xts, XTS, EVP_CIPH_FLAG_FIPS|XTS_FLAGS) |
| 1108 | BLOCK_CIPHER_custom(NID_aes, 256, 1,16, xts, XTS, EVP_CIPH_FLAG_FIPS|XTS_FLAGS) | 1109 | BLOCK_CIPHER_custom(NID_aes, 256, 1, 16, xts, XTS, EVP_CIPH_FLAG_FIPS|XTS_FLAGS) |
| 1109 | 1110 | ||
| 1110 | static int | 1111 | static int |
| 1111 | aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) | 1112 | aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) |
| @@ -1254,11 +1255,11 @@ aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, | |||
| 1254 | 1255 | ||
| 1255 | #define aes_ccm_cleanup NULL | 1256 | #define aes_ccm_cleanup NULL |
| 1256 | 1257 | ||
| 1257 | BLOCK_CIPHER_custom(NID_aes, 128, 1,12, ccm, CCM, | 1258 | BLOCK_CIPHER_custom(NID_aes, 128, 1, 12, ccm, CCM, |
| 1258 | EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS) | 1259 | EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS) |
| 1259 | BLOCK_CIPHER_custom(NID_aes, 192, 1,12, ccm, CCM, | 1260 | BLOCK_CIPHER_custom(NID_aes, 192, 1, 12, ccm, CCM, |
| 1260 | EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS) | 1261 | EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS) |
| 1261 | BLOCK_CIPHER_custom(NID_aes, 256, 1,12, ccm, CCM, | 1262 | BLOCK_CIPHER_custom(NID_aes, 256, 1, 12, ccm, CCM, |
| 1262 | EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS) | 1263 | EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS) |
| 1263 | 1264 | ||
| 1264 | #define EVP_AEAD_AES_GCM_TAG_LEN 16 | 1265 | #define EVP_AEAD_AES_GCM_TAG_LEN 16 |
| @@ -1390,7 +1391,7 @@ aead_aes_gcm_open(const EVP_AEAD_CTX *ctx, unsigned char *out, | |||
| 1390 | 1391 | ||
| 1391 | if (gcm_ctx->ctr) { | 1392 | if (gcm_ctx->ctr) { |
| 1392 | if (CRYPTO_gcm128_decrypt_ctr32(&gcm, in + bulk, out + bulk, | 1393 | if (CRYPTO_gcm128_decrypt_ctr32(&gcm, in + bulk, out + bulk, |
| 1393 | in_len-bulk-gcm_ctx->tag_len, gcm_ctx->ctr)) | 1394 | in_len - bulk - gcm_ctx->tag_len, gcm_ctx->ctr)) |
| 1394 | return -1; | 1395 | return -1; |
| 1395 | } else { | 1396 | } else { |
| 1396 | if (CRYPTO_gcm128_decrypt(&gcm, in + bulk, out + bulk, | 1397 | if (CRYPTO_gcm128_decrypt(&gcm, in + bulk, out + bulk, |
