diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-09-15 11:08:27 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-09-17 12:55:39 +1000 |
| commit | 8230710f04ed70fee41ec3ed8f3e4b1af55be05a (patch) | |
| tree | 4d5e61c9cb5093b6593f0392bde9f281a61170dd /providers | |
| parent | eb750219f2ab7886f174a071f880b31cedeeb0a8 (diff) | |
Update AES GCM IV max length to be 1024 bits (was 512)
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/12875)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/implementations/ciphers/cipher_aes_gcm.c | 6 | ||||
| -rw-r--r-- | providers/implementations/ciphers/cipher_aria_gcm.c | 5 | ||||
| -rw-r--r-- | providers/implementations/include/prov/ciphercommon_gcm.h | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/providers/implementations/ciphers/cipher_aes_gcm.c b/providers/implementations/ciphers/cipher_aes_gcm.c index 2f22c32067..409dfa7b33 100644 --- a/providers/implementations/ciphers/cipher_aes_gcm.c +++ b/providers/implementations/ciphers/cipher_aes_gcm.c @@ -20,6 +20,9 @@ #include "prov/implementations.h" #include "prov/providercommon.h" +#define AES_GCM_IV_MIN_SIZE (64 / 8) /* size in bytes */ +/* Note: GCM_IV_MAX_SIZE is listed in ciphercommon_gcm.h */ + static void *aes_gcm_newctx(void *provctx, size_t keybits) { PROV_AES_GCM_CTX *ctx; @@ -29,7 +32,8 @@ static void *aes_gcm_newctx(void *provctx, size_t keybits) ctx = OPENSSL_zalloc(sizeof(*ctx)); if (ctx != NULL) - gcm_initctx(provctx, &ctx->base, keybits, PROV_AES_HW_gcm(keybits), 8); + gcm_initctx(provctx, &ctx->base, keybits, PROV_AES_HW_gcm(keybits), + AES_GCM_IV_MIN_SIZE); return ctx; } diff --git a/providers/implementations/ciphers/cipher_aria_gcm.c b/providers/implementations/ciphers/cipher_aria_gcm.c index de228a0755..a54afae1bb 100644 --- a/providers/implementations/ciphers/cipher_aria_gcm.c +++ b/providers/implementations/ciphers/cipher_aria_gcm.c @@ -13,6 +13,8 @@ #include "prov/implementations.h" #include "prov/providercommon.h" +#define ARIA_GCM_IV_MIN_SIZE (32 / 8) /* size in bytes */ + static void *aria_gcm_newctx(void *provctx, size_t keybits) { PROV_ARIA_GCM_CTX *ctx; @@ -22,7 +24,8 @@ static void *aria_gcm_newctx(void *provctx, size_t keybits) ctx = OPENSSL_zalloc(sizeof(*ctx)); if (ctx != NULL) - gcm_initctx(provctx, &ctx->base, keybits, PROV_ARIA_HW_gcm(keybits), 4); + gcm_initctx(provctx, &ctx->base, keybits, PROV_ARIA_HW_gcm(keybits), + ARIA_GCM_IV_MIN_SIZE); return ctx; } diff --git a/providers/implementations/include/prov/ciphercommon_gcm.h b/providers/implementations/include/prov/ciphercommon_gcm.h index c7d8b3c0a3..b6d5c74949 100644 --- a/providers/implementations/include/prov/ciphercommon_gcm.h +++ b/providers/implementations/include/prov/ciphercommon_gcm.h @@ -14,7 +14,7 @@ typedef struct prov_gcm_hw_st PROV_GCM_HW; #define GCM_IV_DEFAULT_SIZE 12 /* IV's for AES_GCM should normally be 12 bytes */ -#define GCM_IV_MAX_SIZE 64 +#define GCM_IV_MAX_SIZE (1024 / 8) #define GCM_TAG_MAX_SIZE 16 #if defined(OPENSSL_CPUID_OBJ) && defined(__s390__) |