diff options
| author | Matt Caswell <matt@openssl.org> | 2019-09-02 16:48:26 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-09-09 14:00:00 +0100 |
| commit | 390acbebfa90500c79c5014e6659eacda861550c (patch) | |
| tree | 359600e65c4416217e11444c0eb25f3460c732ef /include | |
| parent | 4889dadcb8511176c30888c748f1981adc38451d (diff) | |
Add support for verify/verify_recover functions to EVP_SIGNATURE
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9753)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/core_numbers.h | 24 | ||||
| -rw-r--r-- | include/openssl/evp.h | 2 |
2 files changed, 23 insertions, 3 deletions
diff --git a/include/openssl/core_numbers.h b/include/openssl/core_numbers.h index ea320537e7..35e6056ba1 100644 --- a/include/openssl/core_numbers.h +++ b/include/openssl/core_numbers.h @@ -406,9 +406,13 @@ OSSL_CORE_MAKE_FUNC(int, OP_keyexch_set_params, (void *ctx, # define OSSL_FUNC_SIGNATURE_NEWCTX 1 # define OSSL_FUNC_SIGNATURE_SIGN_INIT 2 # define OSSL_FUNC_SIGNATURE_SIGN 3 -# define OSSL_FUNC_SIGNATURE_FREECTX 4 -# define OSSL_FUNC_SIGNATURE_DUPCTX 5 -# define OSSL_FUNC_SIGNATURE_SET_PARAMS 6 +# define OSSL_FUNC_SIGNATURE_VERIFY_INIT 4 +# define OSSL_FUNC_SIGNATURE_VERIFY 5 +# define OSSL_FUNC_SIGNATURE_VERIFY_RECOVER_INIT 6 +# define OSSL_FUNC_SIGNATURE_VERIFY_RECOVER 7 +# define OSSL_FUNC_SIGNATURE_FREECTX 8 +# define OSSL_FUNC_SIGNATURE_DUPCTX 9 +# define OSSL_FUNC_SIGNATURE_SET_PARAMS 10 OSSL_CORE_MAKE_FUNC(void *, OP_signature_newctx, (void *provctx)) OSSL_CORE_MAKE_FUNC(int, OP_signature_sign_init, (void *ctx, void *provkey)) @@ -416,6 +420,20 @@ OSSL_CORE_MAKE_FUNC(int, OP_signature_sign, (void *ctx, unsigned char *sig, size_t *siglen, size_t sigsize, const unsigned char *tbs, size_t tbslen)) +OSSL_CORE_MAKE_FUNC(int, OP_signature_verify_init, (void *ctx, void *provkey)) +OSSL_CORE_MAKE_FUNC(int, OP_signature_verify, (void *ctx, + const unsigned char *sig, + size_t siglen, + const unsigned char *tbs, + size_t tbslen)) +OSSL_CORE_MAKE_FUNC(int, OP_signature_verify_recover_init, (void *ctx, + void *provkey)) +OSSL_CORE_MAKE_FUNC(int, OP_signature_verify_recover, (void *ctx, + unsigned char *rout, + size_t *routlen, + size_t routsize, + const unsigned char *sig, + size_t siglen)) OSSL_CORE_MAKE_FUNC(void, OP_signature_freectx, (void *ctx)) OSSL_CORE_MAKE_FUNC(void *, OP_signature_dupctx, (void *ctx)) OSSL_CORE_MAKE_FUNC(int, OP_signature_set_params, (void *ctx, diff --git a/include/openssl/evp.h b/include/openssl/evp.h index dc70686f8f..2ea8d2799f 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -1479,10 +1479,12 @@ int EVP_PKEY_sign_init(EVP_PKEY_CTX *ctx); int EVP_PKEY_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen, const unsigned char *tbs, size_t tbslen); +int EVP_PKEY_verify_init_ex(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature); int EVP_PKEY_verify_init(EVP_PKEY_CTX *ctx); int EVP_PKEY_verify(EVP_PKEY_CTX *ctx, const unsigned char *sig, size_t siglen, const unsigned char *tbs, size_t tbslen); +int EVP_PKEY_verify_recover_init_ex(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature); int EVP_PKEY_verify_recover_init(EVP_PKEY_CTX *ctx); int EVP_PKEY_verify_recover(EVP_PKEY_CTX *ctx, unsigned char *rout, size_t *routlen, |