diff options
| author | Matt Caswell <matt@openssl.org> | 2020-08-12 13:41:59 +0100 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-08-29 17:40:11 +1000 |
| commit | 2cf765e5a20762df1442c80cd2afc99e8bb1b823 (patch) | |
| tree | 3d60094e569638e0e69960945254b28ea78172d1 /crypto/cmac | |
| parent | a540ef90f55c1e10feb709d09332dfa352d9f33e (diff) | |
Delete unused PKEY MAC files
Now that the all the legacy PKEY MAC bridge code has been moved to the
providers we no longer need the old bridge and it can be removed.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12637)
Diffstat (limited to 'crypto/cmac')
| -rw-r--r-- | crypto/cmac/build.info | 2 | ||||
| -rw-r--r-- | crypto/cmac/cm_ameth.c | 59 |
2 files changed, 1 insertions, 60 deletions
diff --git a/crypto/cmac/build.info b/crypto/cmac/build.info index a2f6f218c2..0c0e50941f 100644 --- a/crypto/cmac/build.info +++ b/crypto/cmac/build.info @@ -2,5 +2,5 @@ LIBS=../../libcrypto $COMMON=cmac.c -SOURCE[../../libcrypto]=$COMMON cm_ameth.c +SOURCE[../../libcrypto]=$COMMON SOURCE[../../providers/libfips.a]=$COMMON diff --git a/crypto/cmac/cm_ameth.c b/crypto/cmac/cm_ameth.c deleted file mode 100644 index aa06cdc98a..0000000000 --- a/crypto/cmac/cm_ameth.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2010-2020 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the Apache License 2.0 (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy - * in the file LICENSE in the source distribution or at - * https://www.openssl.org/source/license.html - */ - -/* - * CMAC low level APIs are deprecated for public use, but still ok for internal - * use. - */ -#include "internal/deprecated.h" - -#include <stdio.h> -#include "internal/cryptlib.h" -#include <openssl/evp.h> -#include "crypto/asn1.h" - -/* - * CMAC "ASN1" method. This is just here to indicate the maximum CMAC output - * length and to free up a CMAC key. - */ - -static int cmac_size(const EVP_PKEY *pkey) -{ - return EVP_MAX_BLOCK_LENGTH; -} - -static void cmac_key_free(EVP_PKEY *pkey) -{ - EVP_MAC_CTX *cmctx = EVP_PKEY_get0(pkey); - EVP_MAC *mac = cmctx == NULL ? NULL : EVP_MAC_CTX_mac(cmctx); - - EVP_MAC_CTX_free(cmctx); - EVP_MAC_free(mac); -} - -const EVP_PKEY_ASN1_METHOD cmac_asn1_meth = { - EVP_PKEY_CMAC, - EVP_PKEY_CMAC, - 0, - - "CMAC", - "OpenSSL CMAC method", - - 0, 0, 0, 0, - - 0, 0, 0, - - cmac_size, - 0, 0, - 0, 0, 0, 0, 0, 0, 0, - - cmac_key_free, - 0, - 0, 0 -}; |