diff options
| author | Pauli <paul.dale@oracle.com> | 2019-08-24 20:14:51 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-09-06 19:27:57 +1000 |
| commit | 59cba5ac8591dba5113fb674ad001d45450e59d1 (patch) | |
| tree | 6d091b2d538ae5817be7d6a4ec1939996d29fe94 /include | |
| parent | a308acb2c2809cb9ac30e8e987b2bdfb21f096e0 (diff) | |
KDF error codes reworked
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9662)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/ecerr.h | 10 | ||||
| -rw-r--r-- | include/openssl/evperr.h | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/include/openssl/ecerr.h b/include/openssl/ecerr.h index 43d41d8340..95723ec94b 100644 --- a/include/openssl/ecerr.h +++ b/include/openssl/ecerr.h @@ -39,9 +39,14 @@ int ERR_load_EC_strings(void); # define EC_F_ECDH_SIMPLE_COMPUTE_KEY 0 # define EC_F_ECDSA_DO_SIGN_EX 0 # define EC_F_ECDSA_DO_VERIFY 0 +# define EC_F_ECDSA_S390X_NISTP_SIGN_SIG 0 +# define EC_F_ECDSA_S390X_NISTP_VERIFY_SIG 0 # define EC_F_ECDSA_SIGN_EX 0 # define EC_F_ECDSA_SIGN_SETUP 0 # define EC_F_ECDSA_SIG_NEW 0 +# define EC_F_ECDSA_SIMPLE_SIGN_SETUP 0 +# define EC_F_ECDSA_SIMPLE_SIGN_SIG 0 +# define EC_F_ECDSA_SIMPLE_VERIFY_SIG 0 # define EC_F_ECDSA_VERIFY 0 # define EC_F_ECD_ITEM_VERIFY 0 # define EC_F_ECKEY_PARAM2TYPE 0 @@ -110,6 +115,7 @@ int ERR_load_EC_strings(void); # define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES 0 # define EC_F_EC_GROUP_CHECK 0 # define EC_F_EC_GROUP_CHECK_DISCRIMINANT 0 +# define EC_F_EC_GROUP_CHECK_NAMED_CURVE 0 # define EC_F_EC_GROUP_COPY 0 # define EC_F_EC_GROUP_GET_CURVE 0 # define EC_F_EC_GROUP_GET_CURVE_GF2M 0 @@ -121,6 +127,8 @@ int ERR_load_EC_strings(void); # define EC_F_EC_GROUP_GET_TRINOMIAL_BASIS 0 # define EC_F_EC_GROUP_NEW 0 # define EC_F_EC_GROUP_NEW_BY_CURVE_NAME 0 +# define EC_F_EC_GROUP_NEW_BY_CURVE_NAME_EX 0 +# define EC_F_EC_GROUP_NEW_EX 0 # define EC_F_EC_GROUP_NEW_FROM_DATA 0 # define EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS 0 # define EC_F_EC_GROUP_NEW_FROM_ECPKPARAMETERS 0 @@ -134,6 +142,7 @@ int ERR_load_EC_strings(void); # define EC_F_EC_KEY_GENERATE_KEY 0 # define EC_F_EC_KEY_NEW 0 # define EC_F_EC_KEY_NEW_METHOD 0 +# define EC_F_EC_KEY_NEW_METHOD_INT 0 # define EC_F_EC_KEY_OCT2PRIV 0 # define EC_F_EC_KEY_PRINT 0 # define EC_F_EC_KEY_PRINT_FP 0 @@ -186,6 +195,7 @@ int ERR_load_EC_strings(void); # define EC_F_O2I_ECPUBLICKEY 0 # define EC_F_OLD_EC_PRIV_DECODE 0 # define EC_F_OSSL_ECDH_COMPUTE_KEY 0 +# define EC_F_OSSL_ECDSA_SIGN_SETUP 0 # define EC_F_OSSL_ECDSA_SIGN_SIG 0 # define EC_F_OSSL_ECDSA_VERIFY_SIG 0 # define EC_F_PKEY_ECD_CTRL 0 diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h index 4a29c4b827..64ed5a3b95 100644 --- a/include/openssl/evperr.h +++ b/include/openssl/evperr.h @@ -65,11 +65,8 @@ int ERR_load_EVP_strings(void); # define EVP_F_EVP_ENCRYPTDECRYPTUPDATE 0 # define EVP_F_EVP_ENCRYPTFINAL_EX 0 # define EVP_F_EVP_ENCRYPTUPDATE 0 -# define EVP_F_EVP_KDF_CTRL 0 -# define EVP_F_EVP_KDF_CTRL_STR 0 # define EVP_F_EVP_KDF_CTX_DUP 0 # define EVP_F_EVP_KDF_CTX_NEW 0 -# define EVP_F_EVP_KDF_CTX_NEW_ID 0 # define EVP_F_EVP_KEYEXCH_FETCH 0 # define EVP_F_EVP_KEYEXCH_FROM_DISPATCH 0 # define EVP_F_EVP_MAC_CTRL 0 |