diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-05-21 01:16:31 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-05-26 13:09:25 +0100 |
| commit | fef034f85ea8b533423d4102cb8f83ef0ac24154 (patch) | |
| tree | cbbd750cc1c2fa0eccd542581257f2d5d91cdba7 /include | |
| parent | 764ca96c953b4bcc23a390a1f68dbcad81a2b12f (diff) | |
| download | openssl-fef034f85ea8b533423d4102cb8f83ef0ac24154.tar.gz | |
Error if memory limit exceeded.
Set a specific error if the parameters are otherwise valid but exceed the
memory limit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 3a4bcbd505..dd4d70179a 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -1447,6 +1447,7 @@ void ERR_load_EVP_strings(void); # define EVP_F_EVP_PBE_ALG_ADD 115 # define EVP_F_EVP_PBE_ALG_ADD_TYPE 160 # define EVP_F_EVP_PBE_CIPHERINIT 116 +# define EVP_F_EVP_PBE_SCRYPT 181 # define EVP_F_EVP_PKCS82PKEY 111 # define EVP_F_EVP_PKCS82PKEY_BROKEN 136 # define EVP_F_EVP_PKEY2PKCS8_BROKEN 113 @@ -1538,6 +1539,7 @@ void ERR_load_EVP_strings(void); # define EVP_R_INVALID_OPERATION 148 # define EVP_R_IV_TOO_LARGE 102 # define EVP_R_KEYGEN_FAILURE 120 +# define EVP_R_MEMORY_LIMIT_EXCEEDED 172 # define EVP_R_MESSAGE_DIGEST_IS_NULL 159 # define EVP_R_METHOD_NOT_SUPPORTED 144 # define EVP_R_MISSING_PARAMETERS 103 |