Commit 9c04199d authored by Niels Möller's avatar Niels Möller
Browse files

Add meta interface for CMAC functions.

Based on patches by Daiki Ueno.
* testsuite/cmac-test.c (nettle_cmac_aes128, nettle_cmac_aes256):
Moved to...
* cmac-aes128-meta.c: New file.
* cmac-aes256-meta.c: New file.
parent 197ae827
2020-02-09 Niels Möller <nisse@lysator.liu.se>
Based on patches by Daiki Ueno.
* testsuite/cmac-test.c (nettle_cmac_aes128, nettle_cmac_aes256):
Moved to...
* cmac-aes128-meta.c: New file.
* cmac-aes256-meta.c: New file.
* Makefile.in (nettle_SOURCES): Add cmac-aes128-meta.c cmac-aes256-meta.c.
* nettle-meta.h (struct nettle_mac): New public struct,
* testsuite/testutils.h: ...moved from this file.
......
......@@ -103,6 +103,7 @@ nettle_SOURCES = aes-decrypt-internal.c aes-decrypt.c \
gcm-camellia128.c gcm-camellia128-meta.c \
gcm-camellia256.c gcm-camellia256-meta.c \
cmac.c cmac64.c cmac-aes128.c cmac-aes256.c cmac-des3.c \
cmac-aes128-meta.c cmac-aes256-meta.c \
gost28147.c gosthash94.c gosthash94-meta.c \
hmac.c hmac-gosthash94.c hmac-md5.c hmac-ripemd160.c \
hmac-sha1.c hmac-sha224.c hmac-sha256.c hmac-sha384.c \
......
/* cmac-aes128-meta.c
Copyright (C) 2013, 2014 Niels Möller
This file is part of GNU Nettle.
GNU Nettle is free software: you can redistribute it and/or
modify it under the terms of either:
* the GNU Lesser General Public License as published by the Free
Software Foundation; either version 3 of the License, or (at your
option) any later version.
or
* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
option) any later version.
or both in parallel, as here.
GNU Nettle is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received copies of the GNU General Public License and
the GNU Lesser General Public License along with this program. If
not, see http://www.gnu.org/licenses/.
*/
#if HAVE_CONFIG_H
# include "config.h"
#endif
#include <assert.h>
#include "nettle-meta.h"
#include "cmac.h"
const struct nettle_mac nettle_cmac_aes128 =
{
"cmac_aes128",
sizeof(struct cmac_aes128_ctx),
CMAC128_DIGEST_SIZE,
AES128_KEY_SIZE,
(nettle_set_key_func*) cmac_aes128_set_key,
(nettle_hash_update_func*) cmac_aes128_update,
(nettle_hash_digest_func*) cmac_aes128_digest
};
/* cmac-aes256-meta.c
Copyright (C) 2013, 2014 Niels Möller
This file is part of GNU Nettle.
GNU Nettle is free software: you can redistribute it and/or
modify it under the terms of either:
* the GNU Lesser General Public License as published by the Free
Software Foundation; either version 3 of the License, or (at your
option) any later version.
or
* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
option) any later version.
or both in parallel, as here.
GNU Nettle is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received copies of the GNU General Public License and
the GNU Lesser General Public License along with this program. If
not, see http://www.gnu.org/licenses/.
*/
#if HAVE_CONFIG_H
# include "config.h"
#endif
#include <assert.h>
#include "nettle-meta.h"
#include "cmac.h"
const struct nettle_mac nettle_cmac_aes256 =
{
"cmac-aes256",
sizeof(struct cmac_aes256_ctx),
CMAC128_DIGEST_SIZE,
AES256_KEY_SIZE,
(nettle_set_key_func*) cmac_aes256_set_key,
(nettle_hash_update_func*) cmac_aes256_update,
(nettle_hash_digest_func*) cmac_aes256_digest
};
......@@ -257,6 +257,9 @@ extern const struct nettle_armor nettle_base64;
extern const struct nettle_armor nettle_base64url;
extern const struct nettle_armor nettle_base16;
extern const struct nettle_mac nettle_cmac_aes128;
extern const struct nettle_mac nettle_cmac_aes256;
#ifdef __cplusplus
}
#endif
......
......@@ -2,30 +2,6 @@
#include "nettle-internal.h"
#include "cmac.h"
const struct nettle_mac nettle_cmac_aes128 =
{
"CMAC-AES128",
sizeof(struct cmac_aes128_ctx),
CMAC128_DIGEST_SIZE,
AES128_KEY_SIZE,
(nettle_set_key_func*) cmac_aes128_set_key,
(nettle_hash_update_func*) cmac_aes128_update,
(nettle_hash_digest_func*) cmac_aes128_digest
};
const struct nettle_mac nettle_cmac_aes256 =
{
"CMAC-AES256",
sizeof(struct cmac_aes256_ctx),
CMAC128_DIGEST_SIZE,
AES256_KEY_SIZE,
(nettle_set_key_func*) cmac_aes256_set_key,
(nettle_hash_update_func*) cmac_aes256_update,
(nettle_hash_digest_func*) cmac_aes256_digest
};
const struct nettle_mac nettle_cmac_des3 =
{
"CMAC-3DES",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment