diff options
| author | Matt Caswell <matt@openssl.org> | 2019-04-26 12:11:13 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-07-01 10:18:37 +0100 |
| commit | 792cb4ee8d82e4b063f707fc9f4992271ffd65ab (patch) | |
| tree | 156e8395a325dd9503a17a02326a07c0a4034f43 /include/openssl | |
| parent | 08607613d573de9e3e021227506759f4f58debc6 (diff) | |
| download | openssl-792cb4ee8d82e4b063f707fc9f4992271ffd65ab.tar.gz | |
Ensure that rc5 doesn't try to use a key longer than 2040 bits
The maximum key length for rc5 is 2040 bits so we should not attempt to
use keys longer than this.
Issue found by OSS-Fuzz and Guido Vranken.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8834)
Diffstat (limited to 'include/openssl')
| -rw-r--r-- | include/openssl/evperr.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h index 9810a1e5a1..0e0d5f40f5 100644 --- a/include/openssl/evperr.h +++ b/include/openssl/evperr.h @@ -151,6 +151,7 @@ int ERR_load_EVP_strings(void); # define EVP_F_POLY1305_CTRL 216 # define EVP_F_RC2_MAGIC_TO_METH 109 # define EVP_F_RC5_CTRL 125 +# define EVP_F_R_32_12_16_INIT_KEY 242 # define EVP_F_S390X_AES_GCM_CTRL 201 # define EVP_F_S390X_AES_GCM_TLS_CIPHER 208 # define EVP_F_SCRYPT_ALG 228 @@ -162,6 +163,7 @@ int ERR_load_EVP_strings(void); # define EVP_R_AES_KEY_SETUP_FAILED 143 # define EVP_R_ARIA_KEY_SETUP_FAILED 176 # define EVP_R_BAD_DECRYPT 100 +# define EVP_R_BAD_KEY_LENGTH 195 # define EVP_R_BUFFER_TOO_SMALL 155 # define EVP_R_CAMELLIA_KEY_SETUP_FAILED 157 # define EVP_R_CIPHER_NOT_GCM_MODE 184 |