Skip to content

Commit

Permalink
core: crypto: merge aes-gcm.h and aes-gcm_ext.h
Browse files Browse the repository at this point in the history 
Merges aes-gcm.h and aes-gcm_ext.h and aligns types of function argument
etc.

Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
  • Loading branch information
@jenswi-linaro
jenswi-linaro committed Nov 16, 2017
1 parent a865014 commit b1538e9
Show file tree
Hide file tree
Showing 6 changed files with 92 additions and 107 deletions.
2 changes: 1 addition & 1 deletion core/arch/arm/crypto/aes-gcm-ce.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/

#include <crypto/aes-gcm_ext.h>
#include <crypto/aes-gcm.h>
#include <crypto/ghash-ce-core.h>
#include <io.h>
#include <kernel/panic.h>
Expand Down
2 changes: 1 addition & 1 deletion core/crypto/aes-gcm-ghash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#include <crypto/aes-gcm_ext.h>
#include <crypto/aes-gcm.h>
#include <kernel/panic.h>
#include <string.h>
#include <tee_api_types.h>
Expand Down
2 changes: 1 addition & 1 deletion core/crypto/aes-gcm-sw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#include <crypto/aes-gcm_ext.h>
#include <crypto/aes-gcm.h>
#include <kernel/panic.h>
#include <string.h>
#include <tee_api_types.h>
Expand Down
53 changes: 22 additions & 31 deletions core/crypto/aes-gcm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/

#include <crypto/aes-gcm_ext.h>
#include <crypto/aes-gcm.h>
#include <io.h>
#include <string_ext.h>
#include <string.h>
Expand All @@ -14,11 +14,6 @@
#include <utee_defines.h>
#include <util.h>

size_t crypto_aes_gcm_get_ctx_size(void)
{
return sizeof(struct crypto_aes_gcm_ctx);
}

static void xor_buf(uint8_t *dst, const uint8_t *src, size_t len)
{
size_t n;
Expand Down Expand Up @@ -74,12 +69,11 @@ static void ghash_update_lengths(struct crypto_aes_gcm_ctx *ctx, uint32_t l1,
crypto_aes_gcm_ghash_update(ctx, (uint8_t *)len_fields, NULL, 0);
}

TEE_Result crypto_aes_gcm_init(void *c, TEE_OperationMode mode,
const uint8_t *key, size_t key_len,
const uint8_t *nonce, size_t nonce_len,
size_t tag_len)
TEE_Result crypto_aes_gcm_init(struct crypto_aes_gcm_ctx *ctx,
TEE_OperationMode mode, const void *key,
size_t key_len, const void *nonce,
size_t nonce_len, size_t tag_len)
{
struct crypto_aes_gcm_ctx *ctx = c;
TEE_Result res;

COMPILE_TIME_ASSERT(sizeof(ctx->ctr) == TEE_AES_BLOCK_SIZE);
Expand Down Expand Up @@ -132,10 +126,9 @@ TEE_Result crypto_aes_gcm_init(void *c, TEE_OperationMode mode,
return TEE_SUCCESS;
}

TEE_Result crypto_aes_gcm_update_aad(void *c,
const uint8_t *data, size_t len)
TEE_Result crypto_aes_gcm_update_aad(struct crypto_aes_gcm_ctx *ctx,
const void *data, size_t len)
{
struct crypto_aes_gcm_ctx *ctx = c;
const uint8_t *d = data;
size_t l = len;
const uint8_t *head = NULL;
Expand Down Expand Up @@ -175,11 +168,10 @@ TEE_Result crypto_aes_gcm_update_aad(void *c,
return TEE_SUCCESS;
}

TEE_Result crypto_aes_gcm_update_payload(void *c, TEE_OperationMode m,
const uint8_t *src, size_t len,
uint8_t *dst)
TEE_Result crypto_aes_gcm_update_payload(struct crypto_aes_gcm_ctx *ctx,
TEE_OperationMode mode,
const void *src, size_t len, void *dst)
{
struct crypto_aes_gcm_ctx *ctx = c;
size_t n;
const uint8_t *s = src;
uint8_t *d = dst;
Expand All @@ -200,14 +192,14 @@ TEE_Result crypto_aes_gcm_update_payload(void *c, TEE_OperationMode m,
!ptr_is_block_aligned(d) || l < TEE_AES_BLOCK_SIZE) {
n = MIN(TEE_AES_BLOCK_SIZE - ctx->buf_pos, l);

if (!ctx->buf_pos && m == TEE_MODE_DECRYPT) {
if (!ctx->buf_pos && mode == TEE_MODE_DECRYPT) {
crypto_aes_gcm_encrypt_block(ctx, ctx->ctr,
ctx->buf_cryp);
}

xor_buf(ctx->buf_cryp + ctx->buf_pos, s, n);
memcpy(d, ctx->buf_cryp + ctx->buf_pos, n);
if (m == TEE_MODE_ENCRYPT)
if (mode == TEE_MODE_ENCRYPT)
memcpy(ctx->buf_hash + ctx->buf_pos,
ctx->buf_cryp + ctx->buf_pos, n);
else
Expand All @@ -224,14 +216,14 @@ TEE_Result crypto_aes_gcm_update_payload(void *c, TEE_OperationMode m,
s += n;
l -= n;

if (m == TEE_MODE_ENCRYPT)
if (mode == TEE_MODE_ENCRYPT)
crypto_aes_gcm_encrypt_block(ctx, ctx->ctr,
ctx->buf_cryp);
crypto_aes_gcm_inc_ctr(ctx);
} else {
n = l / TEE_AES_BLOCK_SIZE;
crypto_aes_gcm_update_payload_block_aligned(ctx, m, s,
n, d);
crypto_aes_gcm_update_payload_block_aligned(ctx, mode,
s, n, d);
s += n * TEE_AES_BLOCK_SIZE;
d += n * TEE_AES_BLOCK_SIZE;
l -= n * TEE_AES_BLOCK_SIZE;
Expand Down Expand Up @@ -264,10 +256,10 @@ static TEE_Result operation_final(struct crypto_aes_gcm_ctx *ctx,
return TEE_SUCCESS;
}

TEE_Result crypto_aes_gcm_enc_final(void *c, const uint8_t *src, size_t len,
uint8_t *dst, uint8_t *tag, size_t *tag_len)
TEE_Result crypto_aes_gcm_enc_final(struct crypto_aes_gcm_ctx *ctx,
const void *src, size_t len, void *dst,
void *tag, size_t *tag_len)
{
struct crypto_aes_gcm_ctx *ctx = c;
TEE_Result res;

if (*tag_len < ctx->tag_len)
Expand All @@ -283,11 +275,10 @@ TEE_Result crypto_aes_gcm_enc_final(void *c, const uint8_t *src, size_t len,
return TEE_SUCCESS;
}

TEE_Result crypto_aes_gcm_dec_final(void *c, const uint8_t *src, size_t len,
uint8_t *dst, const uint8_t *tag,
size_t tag_len)
TEE_Result crypto_aes_gcm_dec_final(struct crypto_aes_gcm_ctx *ctx,
const void *src, size_t len, void *dst,
const void *tag, size_t tag_len)
{
struct crypto_aes_gcm_ctx *ctx = c;
TEE_Result res;

if (tag_len != ctx->tag_len)
Expand Down Expand Up @@ -315,6 +306,6 @@ void crypto_aes_gcm_inc_ctr(struct crypto_aes_gcm_ctx *ctx)
}
}

void crypto_aes_gcm_final(void *c __unused)
void crypto_aes_gcm_final(struct crypto_aes_gcm_ctx *ctx __unused)
{
}
84 changes: 67 additions & 17 deletions core/include/crypto/aes-gcm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,73 @@
#define __CRYPTO_AES_GCM_H

#include <tee_api_types.h>
#include <tee_api_types.h>
#include <utee_defines.h>
#include <tomcrypt.h>

struct crypto_aes_gcm_ctx {
uint64_t ctr[2];

uint8_t hash_subkey[TEE_AES_BLOCK_SIZE];
uint8_t hash_state[TEE_AES_BLOCK_SIZE];

uint8_t buf_tag[TEE_AES_BLOCK_SIZE];
uint8_t buf_hash[TEE_AES_BLOCK_SIZE];
uint8_t buf_cryp[TEE_AES_BLOCK_SIZE];

symmetric_key skey;

unsigned int tag_len;
unsigned int aad_bytes;
unsigned int payload_bytes;
unsigned int buf_pos;
};

static inline size_t crypto_aes_gcm_get_ctx_size(void)
{
return sizeof(struct crypto_aes_gcm_ctx);
}

TEE_Result crypto_aes_gcm_init(struct crypto_aes_gcm_ctx *ctx,
TEE_OperationMode mode, const void *key,
size_t key_len, const void *nonce,
size_t nonce_len, size_t tag_len);
TEE_Result crypto_aes_gcm_update_aad(struct crypto_aes_gcm_ctx *ctx,
const void *data, size_t len);
TEE_Result crypto_aes_gcm_update_payload(struct crypto_aes_gcm_ctx *ctx,
TEE_OperationMode mode,
const void *src, size_t len,
void *dst);
TEE_Result crypto_aes_gcm_enc_final(struct crypto_aes_gcm_ctx *ctx,
const void *src, size_t len, void *dst,
void *tag, size_t *tag_len);
TEE_Result crypto_aes_gcm_dec_final(struct crypto_aes_gcm_ctx *ctx,
const void *src, size_t len, void *dst,
const void *tag, size_t tag_len);
void crypto_aes_gcm_final(struct crypto_aes_gcm_ctx *ctx);

void crypto_aes_gcm_inc_ctr(struct crypto_aes_gcm_ctx *ctx);

/*
* Internal weak functions that can be overridden with hardware specific
* implementations.
*/
void crypto_aes_gcm_next_ctr(struct crypto_aes_gcm_ctx *ctx);

void crypto_aes_gcm_encrypt_block(struct crypto_aes_gcm_ctx *ctx,
const void *src, void *dst);

TEE_Result crypto_aes_gcm_set_key(struct crypto_aes_gcm_ctx *ctx,
const void *key, size_t key_len);

void crypto_aes_gcm_ghash_update(struct crypto_aes_gcm_ctx *ctx,
const void *head, const void *data,
size_t num_blocks);

void crypto_aes_gcm_update_payload_block_aligned(struct crypto_aes_gcm_ctx *ctx,
TEE_OperationMode m,
const void *src,
size_t num_blocks, void *dst);

size_t crypto_aes_gcm_get_ctx_size(void);
TEE_Result crypto_aes_gcm_init(void *ctx, TEE_OperationMode mode,
const uint8_t *key, size_t key_len,
const uint8_t *nonce, size_t nonce_len,
size_t tag_len);
TEE_Result crypto_aes_gcm_update_aad(void *ctx, const uint8_t *data,
size_t len);
TEE_Result crypto_aes_gcm_update_payload(void *ctx, TEE_OperationMode mode,
const uint8_t *src_data,
size_t len, uint8_t *dst_data);
TEE_Result crypto_aes_gcm_enc_final(void *ctx, const uint8_t *src_data,
size_t len, uint8_t *dst_data,
uint8_t *dst_tag, size_t *dst_tag_len);
TEE_Result crypto_aes_gcm_dec_final(void *ctx, const uint8_t *src_data,
size_t len, uint8_t *dst_data,
const uint8_t *tag, size_t tag_len);
void crypto_aes_gcm_final(void *ctx);

#endif /*__CRYPTO_AES_GCM_H*/
56 changes: 0 additions & 56 deletions core/include/crypto/aes-gcm_ext.h
View file

This file was deleted.

0 comments on commit b1538e9

Please sign in to comment.