diff options
| author | FdaSilvaYY <fdasilvayy@gmail.com> | 2018-03-29 20:59:58 +0200 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2018-03-29 22:46:10 +0200 |
| commit | 3484236d8d7afedd3e5c7771bd49d3385340e3bf (patch) | |
| tree | 15f0816c0636545ac6aa9e68aba5faa4e233491a /include | |
| parent | 88b8d83e9e8869c60c556a86bee09f92c56c5a64 (diff) | |
| download | openssl-3484236d8d7afedd3e5c7771bd49d3385340e3bf.zip openssl-3484236d8d7afedd3e5c7771bd49d3385340e3bf.tar.gz openssl-3484236d8d7afedd3e5c7771bd49d3385340e3bf.tar.bz2 | |
EVP,KDF: Add more error code along some return 0 in ...
methods :
- EVP_PBE_scrypt
- EVP_PKEY_meth_add0
- EVP_PKEY_meth_new
- EVP_PKEY_CTX_dup
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/5783)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evperr.h | 3 | ||||
| -rw-r--r-- | include/openssl/kdferr.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h index b269a8e..09b7d7b 100644 --- a/include/openssl/evperr.h +++ b/include/openssl/evperr.h @@ -77,6 +77,8 @@ int ERR_load_EVP_strings(void); # define EVP_F_EVP_PKEY_GET0_SIPHASH 172 # define EVP_F_EVP_PKEY_KEYGEN 146 # define EVP_F_EVP_PKEY_KEYGEN_INIT 147 +# define EVP_F_EVP_PKEY_METH_ADD0 194 +# define EVP_F_EVP_PKEY_METH_NEW 195 # define EVP_F_EVP_PKEY_NEW 106 # define EVP_F_EVP_PKEY_NEW_CMAC_KEY 193 # define EVP_F_EVP_PKEY_NEW_RAW_PRIVATE_KEY 191 @@ -155,6 +157,7 @@ int ERR_load_EVP_strings(void); # define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE 150 # define EVP_R_OPERATON_NOT_INITIALIZED 151 # define EVP_R_PARTIALLY_OVERLAPPING 162 +# define EVP_R_PBKDF2_ERROR 181 # define EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED 179 # define EVP_R_PRIVATE_KEY_DECODE_ERROR 145 # define EVP_R_PRIVATE_KEY_ENCODE_ERROR 146 diff --git a/include/openssl/kdferr.h b/include/openssl/kdferr.h index ea30fb9..5a03b5c 100644 --- a/include/openssl/kdferr.h +++ b/include/openssl/kdferr.h @@ -24,6 +24,8 @@ int ERR_load_KDF_strings(void); # define KDF_F_PKEY_SCRYPT_CTRL_STR 104 # define KDF_F_PKEY_SCRYPT_CTRL_UINT64 105 # define KDF_F_PKEY_SCRYPT_DERIVE 109 +# define KDF_F_PKEY_SCRYPT_INIT 106 +# define KDF_F_PKEY_SCRYPT_SET_MEMBUF 107 # define KDF_F_PKEY_TLS1_PRF_CTRL_STR 100 # define KDF_F_PKEY_TLS1_PRF_DERIVE 101 |