diff options
| author | Pauli <pauli@openssl.org> | 2021-04-28 12:58:35 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-05-05 22:12:20 +1000 |
| commit | b039c87a4ca3dd4e4ebbea4a5d1fd3821497f900 (patch) | |
| tree | 4fbdcd2fd9d4d8d541d015eca553874e43ed69e0 /include | |
| parent | 6a38b09a7fa6eaac6bcbe567382fbe7d3d719503 (diff) | |
mac: add EVP_MAC_finalXOF() function
Fixes #14140
Fixes #13232
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15061)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evp.h | 1 | ||||
| -rw-r--r-- | include/openssl/evperr.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index f527de4d4c..91b84ebf6f 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -1181,6 +1181,7 @@ int EVP_MAC_init(EVP_MAC_CTX *ctx, const unsigned char *key, size_t keylen, int EVP_MAC_update(EVP_MAC_CTX *ctx, const unsigned char *data, size_t datalen); int EVP_MAC_final(EVP_MAC_CTX *ctx, unsigned char *out, size_t *outl, size_t outsize); +int EVP_MAC_finalXOF(EVP_MAC_CTX *ctx, unsigned char *out, size_t outsize); const OSSL_PARAM *EVP_MAC_gettable_params(const EVP_MAC *mac); const OSSL_PARAM *EVP_MAC_gettable_ctx_params(const EVP_MAC *mac); const OSSL_PARAM *EVP_MAC_settable_ctx_params(const EVP_MAC *mac); diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h index b2e08b14b6..ffa8bacd5b 100644 --- a/include/openssl/evperr.h +++ b/include/openssl/evperr.h @@ -95,8 +95,8 @@ # define EVP_R_NO_OPERATION_SET 149 # define EVP_R_NULL_MAC_PKEY_CTX 208 # define EVP_R_ONLY_ONESHOT_SUPPORTED 177 -# define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE 150 # define EVP_R_OPERATION_NOT_INITIALIZED 151 +# define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE 150 # define EVP_R_OUTPUT_WOULD_OVERFLOW 202 # define EVP_R_PARAMETER_TOO_LARGE 187 # define EVP_R_PARTIALLY_OVERLAPPING 162 @@ -105,6 +105,7 @@ # define EVP_R_PRIVATE_KEY_DECODE_ERROR 145 # define EVP_R_PRIVATE_KEY_ENCODE_ERROR 146 # define EVP_R_PUBLIC_KEY_NOT_RSA 106 +# define EVP_R_SETTING_XOF_FAILED 227 # define EVP_R_SET_DEFAULT_PROPERTY_FAILURE 209 # define EVP_R_TOO_MANY_RECORDS 183 # define EVP_R_UNABLE_TO_ENABLE_LOCKING 212 |