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:23:54 +0100 |
| commit | 26675d1cf407fb7ba248c04767eccda56b06263f (patch) | |
| tree | 12b331ae0098987b96614b3867763527ac7d3108 /include | |
| parent | 25ccb5896bbf28b74d4d72010948b0ac7d141622 (diff) | |
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)
(cherry picked from commit 792cb4ee8d82e4b063f707fc9f4992271ffd65ab)
Diffstat (limited to 'include')
| -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 0a5b7e24f3..3a14fd5be1 100644 --- a/include/openssl/evperr.h +++ b/include/openssl/evperr.h @@ -118,6 +118,7 @@ int ERR_load_EVP_strings(void); # define EVP_F_PKEY_SET_TYPE 158 # 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_UPDATE 173 @@ -127,6 +128,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_PARAMETER_ERROR 122 |