diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-12-20 12:56:14 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-12-20 19:02:20 +0100 |
| commit | 22e9f9211de80d7edcb1bd3b86eef7611718ab5c (patch) | |
| tree | edcb250fdc9fcfa1d9b646f238263e003dd2fba3 /include | |
| parent | f7a2da1d584bed2e05774f92d69fee39ce3edda2 (diff) | |
M_check_autoarg: sanity check the key
For now, checking that the size is non-zero will suffice.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2120)
(cherry picked from commit d7c8f142ea5953bf260b70a58739c1c9b0f038eb)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index b9c83b2b52..8216a8f2c4 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -1546,6 +1546,7 @@ int ERR_load_EVP_strings(void); # define EVP_R_INPUT_NOT_INITIALIZED 111 # define EVP_R_INVALID_DIGEST 152 # define EVP_R_INVALID_FIPS_MODE 168 +# define EVP_R_INVALID_KEY 163 # define EVP_R_INVALID_KEY_LENGTH 130 # define EVP_R_INVALID_OPERATION 148 # define EVP_R_KEYGEN_FAILURE 120 @@ -1568,12 +1569,12 @@ int ERR_load_EVP_strings(void); # define EVP_R_UNKNOWN_DIGEST 161 # define EVP_R_UNKNOWN_OPTION 169 # define EVP_R_UNKNOWN_PBE_ALGORITHM 121 -# define EVP_R_UNSUPPORTED_NUMBER_OF_ROUNDS 135 # define EVP_R_UNSUPPORTED_ALGORITHM 156 # define EVP_R_UNSUPPORTED_CIPHER 107 # define EVP_R_UNSUPPORTED_KEYLENGTH 123 # define EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION 124 # define EVP_R_UNSUPPORTED_KEY_SIZE 108 +# define EVP_R_UNSUPPORTED_NUMBER_OF_ROUNDS 135 # define EVP_R_UNSUPPORTED_PRF 125 # define EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM 118 # define EVP_R_UNSUPPORTED_SALT_TYPE 126 |