From: Dr. Stephen Henson Date: Mon, 2 May 2011 23:29:57 +0000 (+0000) Subject: PR: 2499 X-Git-Tag: OpenSSL-fips-2_0-rc1~479 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e9093c9832699196abca7f90c2f22108fd56f779;p=oweals%2Fopenssl.git PR: 2499 Submitted by: "James 'J.C.' Jones" Typos. --- diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index e862096369..b0cb33e735 100644 --- a/crypto/evp/e_aes.c +++ b/crypto/evp/e_aes.c @@ -418,7 +418,7 @@ const EVP_CIPHER *EVP_aes_128_gcm (void) static const EVP_CIPHER aes_192_gcm_cipher= { - NID_aes_128_gcm,1,24,12, + NID_aes_192_gcm,1,24,12, EVP_CIPH_GCM_MODE|EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT, @@ -437,7 +437,7 @@ const EVP_CIPHER *EVP_aes_192_gcm (void) static const EVP_CIPHER aes_256_gcm_cipher= { - NID_aes_128_gcm,1,32,12, + NID_aes_256_gcm,1,32,12, EVP_CIPH_GCM_MODE|EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT, @@ -744,7 +744,7 @@ const EVP_CIPHER *EVP_aes_128_ccm (void) static const EVP_CIPHER aes_192_ccm_cipher= { - NID_aes_128_ccm,1,24,12, + NID_aes_192_ccm,1,24,12, EVP_CIPH_CCM_MODE|EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT, @@ -763,7 +763,7 @@ const EVP_CIPHER *EVP_aes_192_ccm (void) static const EVP_CIPHER aes_256_ccm_cipher= { - NID_aes_128_ccm,1,32,12, + NID_aes_256_ccm,1,32,12, EVP_CIPH_CCM_MODE|EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT,