Commit 52f99db2 authored by Niels Möller's avatar Niels Möller

Move nonce from poly1305_ctx to poly1305_aes_ctx.

parent 0164c997
2014-01-17 Niels Möller <nisse@lysator.liu.se>
* poly1305.h (struct poly1305_ctx): Moved nonce field from here...
(struct poly1305_aes_ctx): ... to here.
* poly1305-aes.c (poly1305_aes_set_nonce, poly1305_aes_digest):
Updated for above.
* poly1305.c (poly1305_set_nonce): Deleted function.
* asm.m4: Delete nonce also from the assembly definition of struct
poly1305_ctx.
2014-01-16 Niels Möller <nisse@lysator.liu.se>
* poly1305-aes.c: Include poly1305.c. Rewrite functions without
......
......@@ -85,7 +85,6 @@ STRUCTURE(P1305)
STRUCT(H2, 4)
STRUCT(H0, 8)
STRUCT(H1, 8)
STRUCT(NONCE, 16)
STRUCT(BLOCK, 16)
STRUCT(INDEX, 4)
......
......@@ -40,7 +40,7 @@ void
poly1305_aes_set_nonce (struct poly1305_aes_ctx *ctx,
const uint8_t * nonce)
{
poly1305_set_nonce(&ctx->pctx, nonce);
memcpy (ctx->nonce, nonce, POLY1305_AES_NONCE_SIZE);
}
void
......@@ -48,8 +48,8 @@ poly1305_aes_digest (struct poly1305_aes_ctx *ctx,
size_t length, uint8_t * digest)
{
uint8_t s[POLY1305_BLOCK_SIZE];
aes128_encrypt(&ctx->aes, POLY1305_BLOCK_SIZE, s, ctx->pctx.nonce);
aes128_encrypt(&ctx->aes, POLY1305_BLOCK_SIZE, s, ctx->nonce);
poly1305_digest (&ctx->pctx, length, digest, s);
INCREMENT (16, (ctx)->pctx.nonce);
(ctx)->pctx.index = 0;
INCREMENT (16, ctx->nonce);
ctx->pctx.index = 0;
}
......@@ -28,12 +28,6 @@
#include "macros.h"
void
poly1305_set_nonce (struct poly1305_ctx *ctx, const uint8_t * nonce)
{
memcpy (ctx->nonce, nonce, 16);
}
void
poly1305_update (struct poly1305_ctx *ctx, size_t length, const uint8_t *data)
{
......
......@@ -35,7 +35,6 @@ extern "C" {
/* Name mangling */
#define poly1305_set_key nettle_poly1305_set_key
#define poly1305_set_nonce nettle_poly1305_set_nonce
#define poly1305_update nettle_poly1305_update
#define poly1305_block nettle_poly1305_block
#define poly1305_digest nettle_poly1305_digest
......@@ -68,13 +67,11 @@ struct poly1305_ctx {
uint64_t h64[2];
} h;
uint8_t nonce[POLY1305_BLOCK_SIZE];
uint8_t block[POLY1305_BLOCK_SIZE];
unsigned index;
};
void poly1305_set_key(struct poly1305_ctx *ctx, const uint8_t key[POLY1305_KEY_SIZE]);
void poly1305_set_nonce (struct poly1305_ctx *ctx, const uint8_t * nonce);
void poly1305_block (struct poly1305_ctx *ctx, const uint8_t m[POLY1305_BLOCK_SIZE]);
void poly1305_update (struct poly1305_ctx *ctx, size_t size, const uint8_t *data);
void poly1305_digest (struct poly1305_ctx *ctx,
......@@ -84,11 +81,13 @@ void poly1305_digest (struct poly1305_ctx *ctx,
#define POLY1305_AES_KEY_SIZE 32
#define POLY1305_AES_DIGEST_SIZE 16
#define POLY1305_AES_NONCE_SIZE 16
struct poly1305_aes_ctx
{
/* Must be first element, for the poly1305_aes_update cast to work. */
struct poly1305_ctx pctx;
uint8_t nonce[POLY1305_BLOCK_SIZE];
struct aes128_ctx aes;
};
......
Markdown is supported
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