diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-10-24 21:35:00 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-10-30 05:34:50 +0100 |
| commit | e74a435f58441c6f1f6b4558c762e17d0ab67b7f (patch) | |
| tree | fdc448e5ea42fd00147b1eb4545be7fbf1a378c7 /crypto/evp/pkey_mac.c | |
| parent | f71faf2753cc1b1cbba0da0997b70e5a908ac24b (diff) | |
| download | openssl-e74a435f58441c6f1f6b4558c762e17d0ab67b7f.zip openssl-e74a435f58441c6f1f6b4558c762e17d0ab67b7f.tar.gz openssl-e74a435f58441c6f1f6b4558c762e17d0ab67b7f.tar.bz2 | |
EVP_MAC: Integrate CMAC EVP_PKEY_METHOD into generic MAC EVP_PKEY_METHOD
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7484)
Diffstat (limited to 'crypto/evp/pkey_mac.c')
| -rw-r--r-- | crypto/evp/pkey_mac.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/crypto/evp/pkey_mac.c b/crypto/evp/pkey_mac.c index d4aa585..ecf70bb 100644 --- a/crypto/evp/pkey_mac.c +++ b/crypto/evp/pkey_mac.c @@ -327,15 +327,8 @@ static int pkey_mac_ctrl_str(EVP_PKEY_CTX *ctx, return EVP_MAC_ctrl_str(hctx->ctx, type, value); } -/* - * When this is actually used, the following will be replaced with real - * EVP_PKEY_METHODs, all exactly the same apart from the type and possibly - * the flags. - */ - -extern const EVP_PKEY_METHOD FAKE_pkey_meth; -const EVP_PKEY_METHOD FAKE_pkey_meth = { - 20870442 /* EVP_PKEY_FAKE, a beast times 31337 (you do the math) */, +const EVP_PKEY_METHOD cmac_pkey_meth = { + EVP_PKEY_CMAC, EVP_PKEY_FLAG_SIGCTX_CUSTOM, pkey_mac_init, pkey_mac_copy, |