Skip to content

Commit

Permalink
hashes_cmac: rename to hashes_aes128_cmac
Browse files Browse the repository at this point in the history
  • Loading branch information
@miri64
miri64 committed Aug 31, 2022
1 parent 0e2eb91 commit 5e59649
Show file tree
Hide file tree
Showing 3 changed files with 132 additions and 37 deletions.
42 changes: 22 additions & 20 deletions sys/hashes/cmac.c → sys/hashes/aes128_cmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
*/

/**
* @ingroup sys_hashes_cmac
* @ingroup sys_hashes_aes128_cmac
* @{
*
* @file
* @brief AES_CMAC implementation
* @brief AES128_CMAC implementation
*
* @author José Ignacio Alamos <jose.alamos@inria.cl>
*
Expand All @@ -23,7 +23,7 @@
#include <string.h>

#include "crypto/ciphers.h"
#include "hashes/cmac.h"
#include "hashes/aes128_cmac.h"

#define MIN(a, b) a < b ? a : b

Expand All @@ -42,17 +42,19 @@ static void _leftshift(uint8_t *x, uint8_t *y)
y[15] = x[15] << 1;
}

int cmac_init(cmac_context_t *ctx, const uint8_t *key, uint8_t key_size)
int aes128_cmac_init(aes128_cmac_context_t *ctx,
const uint8_t *key, uint8_t key_size)
{
if (key_size != CMAC_BLOCK_SIZE) {
if (key_size != AES128_CMAC_BLOCK_SIZE) {
return CIPHER_ERR_INVALID_KEY_SIZE;
}

memset(ctx, 0, sizeof(cmac_context_t));
return cipher_init(&(ctx->aes_ctx), CIPHER_AES, key, key_size);
memset(ctx, 0, sizeof(aes128_cmac_context_t));
return cipher_init(&(ctx->aes128_ctx), CIPHER_AES, key, key_size);
}

void cmac_update(cmac_context_t *ctx, const void *data, size_t len)
void aes128_cmac_update(aes128_cmac_context_t *ctx,
const void *data, size_t len)
{
uint8_t d[16];

Expand All @@ -61,29 +63,29 @@ void cmac_update(cmac_context_t *ctx, const void *data, size_t len)
if (ctx->M_n == 16) {
ctx->M_n = 0;
_xor128(ctx->M_last, ctx->X);
cipher_encrypt(&ctx->aes_ctx, ctx->X, d);
memcpy(ctx->X, d, CMAC_BLOCK_SIZE);
cipher_encrypt(&ctx->aes128_ctx, ctx->X, d);
memcpy(ctx->X, d, AES128_CMAC_BLOCK_SIZE);
}
c = MIN(CMAC_BLOCK_SIZE - ctx->M_n, len);
c = MIN(AES128_CMAC_BLOCK_SIZE - ctx->M_n, len);
memcpy(ctx->M_last + ctx->M_n, data, c);
ctx->M_n += c;
len -= c;
data = (void *) (((uint8_t *) data) + c);

if (ctx->M_n < CMAC_BLOCK_SIZE) {
if (ctx->M_n < AES128_CMAC_BLOCK_SIZE) {
break;
}
}
}

void cmac_final(cmac_context_t *ctx, void *digest)
void aes128_cmac_final(aes128_cmac_context_t *ctx, void *digest)
{
/* Generate subkeys */
uint8_t K[CMAC_BLOCK_SIZE];
uint8_t L[CMAC_BLOCK_SIZE];
uint8_t K[AES128_CMAC_BLOCK_SIZE];
uint8_t L[AES128_CMAC_BLOCK_SIZE];

memset(K, 0, CMAC_BLOCK_SIZE);
cipher_encrypt(&ctx->aes_ctx, K, L);
memset(K, 0, AES128_CMAC_BLOCK_SIZE);
cipher_encrypt(&ctx->aes128_ctx, K, L);

if (L[0] & 0x80) {
_leftshift(L, K);
Expand All @@ -103,11 +105,11 @@ void cmac_final(cmac_context_t *ctx, void *digest)
_leftshift(K, K);
}
/* Padding */
memset(ctx->M_last + ctx->M_n, 0, CMAC_BLOCK_SIZE - ctx->M_n);
memset(ctx->M_last + ctx->M_n, 0, AES128_CMAC_BLOCK_SIZE - ctx->M_n);
ctx->M_last[ctx->M_n] = 0x80;
}
_xor128(K, ctx->M_last);
_xor128(ctx->M_last, ctx->X);
cipher_encrypt(&ctx->aes_ctx, ctx->X, L);
memcpy(digest, L, CMAC_BLOCK_SIZE);
cipher_encrypt(&ctx->aes128_ctx, ctx->X, L);
memcpy(digest, L, AES128_CMAC_BLOCK_SIZE);
}
88 changes: 88 additions & 0 deletions sys/include/hashes/aes128_cmac.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
/*
* Copyright (C) 2016 Fundación Inria Chile
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/

/**
* @defgroup sys_hashes_aes128_cmac AES128_CMAC
* @ingroup sys_hashes_keyed
* @brief Implementation of the AES128 CMAC hashing function
* @{
*
* @file
* @brief AES128_CMAC interface definition
*
* @author José Ignacio Alamos <jose.alamos@inria.cl>
*/

#ifndef HASHES_AES128_CMAC_H
#define HASHES_AES128_CMAC_H

#include <stdio.h>
#include "crypto/ciphers.h"

#ifdef __cplusplus
extern "C" {
#endif

/**
* @brief Length of AES128_CMAC block in bytes
*/
#define AES128_CMAC_BLOCK_SIZE 16

/**
* @brief AES128_CMAC calculation context
*/
typedef struct {
/** AES128 context */
cipher_t aes128_ctx;
/** auxiliary array for CMAC calculations **/
uint8_t X[AES128_CMAC_BLOCK_SIZE];
/** current last block **/
uint8_t M_last[AES128_CMAC_BLOCK_SIZE];
/** last byte in last block */
uint32_t M_n;
} aes128_cmac_context_t;

/**
* @brief Initialize AES128 CMAC message digest context
*
* @param[in] ctx Pointer to the AES128 CMAC context to initialize
* @param[in] key Key to be set
* @param[in] key_size Size of the key
*
* @return CIPHER_INIT_SUCCESS if the initialization was successful.
* CIPHER_ERR_INVALID_KEY_SIZE if the key size is not valid.
*/
int aes128_cmac_init(aes128_cmac_context_t *ctx,
const uint8_t *key, uint8_t key_size);

/**
* @brief Update the AES128 CMAC context with a portion of the message being
* hashed
*
* @param[in] ctx Pointer to the AES128 CMAC context to update
* @param[in] data Input data
* @param[in] len Length of @p data
*/
void aes128_cmac_update(aes128_cmac_context_t *ctx,
const void *data, size_t len);

/**
* @brief Finalizes the CMAC message digest
*
* @param[in] ctx Pointer to the AES128 CMAC context
* @param[out] digest Result location
*/
void aes128_cmac_final(aes128_cmac_context_t *ctx, void *digest);

#ifdef __cplusplus
}
#endif

#endif /* HASHES_AES128_CMAC_H */
/** @} */
39 changes: 22 additions & 17 deletions sys/include/hashes/cmac.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2016 Fundación Inria Chile
* Copyright (C) 2022 Freie Universität Berlin
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
Expand All @@ -10,20 +11,22 @@
* @defgroup sys_hashes_cmac AES_CMAC
* @ingroup sys_hashes_keyed
* @brief Implementation of the AES CMAC hashing function
* @deprecated Will be removed after the 2023.01 release. Please use
* @ref sys_hashes_aes128_cmac instead.
* @{
*
* @file
* @brief AES_CMAC interface definition
*
* @author José Ignacio Alamos <jose.alamos@inria.cl>
* @author Martine S. Lenders <m.lenders@fu-berlin.de>
*/

#ifndef HASHES_CMAC_H
#define HASHES_CMAC_H

#include <stdio.h>
#include "crypto/ciphers.h"
#include "hashes/aes128_cmac.h"

#ifdef __cplusplus
extern "C" {
Expand All @@ -32,21 +35,12 @@ extern "C" {
/**
* @brief Length of AES_CMAC block in bytes
*/
#define CMAC_BLOCK_SIZE 16
#define CMAC_BLOCK_SIZE AES128_CMAC_BLOCK_SIZE

/**
* @brief AES_CMAC calculation context
* @brief CMAC calculation context
*/
typedef struct {
/** AES128 context */
cipher_t aes_ctx;
/** auxiliary array for CMAC calculations **/
uint8_t X[CMAC_BLOCK_SIZE];
/** current last block **/
uint8_t M_last[CMAC_BLOCK_SIZE];
/** last byte in last block */
uint32_t M_n;
} cmac_context_t;
typedef aes128_cmac_context_t cmac_context_t;

/**
* @brief Initialize CMAC message digest context
Expand All @@ -58,7 +52,11 @@ typedef struct {
* @return CIPHER_INIT_SUCCESS if the initialization was successful.
* CIPHER_ERR_INVALID_KEY_SIZE if the key size is not valid.
*/
int cmac_init(cmac_context_t *ctx, const uint8_t *key, uint8_t key_size);
static inline int cmac_init(cmac_context_t *ctx,
const uint8_t *key, uint8_t key_size)
{
return aes128_cmac_init(ctx, key, key_size);
}

/**
* @brief Update the CMAC context with a portion of the message being hashed
Expand All @@ -67,15 +65,22 @@ int cmac_init(cmac_context_t *ctx, const uint8_t *key, uint8_t key_size);
* @param[in] data Input data
* @param[in] len Length of @p data
*/
void cmac_update(cmac_context_t *ctx, const void *data, size_t len);
static inline void cmac_update(cmac_context_t *ctx,
const void *data, size_t len)
{
aes128_cmac_update(ctx, data, len);
}

/**
* @brief Finalizes the CMAC message digest
*
* @param[in] ctx Pointer to the CMAC context
* @param[out] digest Result location
*/
void cmac_final(cmac_context_t *ctx, void *digest);
static inline void cmac_final(cmac_context_t *ctx, void *digest)
{
aes128_cmac_final(ctx, digest);
}

#ifdef __cplusplus
}
Expand Down

0 comments on commit 5e59649

Please sign in to comment.