From 4657693d9e53ea45cbb903969370ddf9d331dafd Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sun, 2 Jun 2019 08:51:58 +0200 Subject: Move SipHash to providers Reviewed-by: Matt Caswell Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/8877) --- providers/default/macs/build.info | 2 +- providers/default/macs/siphash_prov.c | 188 ++++++++++++++++++++++++++++++++++ 2 files changed, 189 insertions(+), 1 deletion(-) create mode 100644 providers/default/macs/siphash_prov.c (limited to 'providers/default/macs') diff --git a/providers/default/macs/build.info b/providers/default/macs/build.info index 54fdccb782..edd95695fd 100644 --- a/providers/default/macs/build.info +++ b/providers/default/macs/build.info @@ -1,3 +1,3 @@ LIBS=../../../libcrypto -SOURCE[../../../libcrypto]=blake2b_mac.c blake2s_mac.c +SOURCE[../../../libcrypto]=blake2b_mac.c blake2s_mac.c siphash_prov.c INCLUDE[../../../libcrypto]=. ../../../crypto diff --git a/providers/default/macs/siphash_prov.c b/providers/default/macs/siphash_prov.c new file mode 100644 index 0000000000..f02834f082 --- /dev/null +++ b/providers/default/macs/siphash_prov.c @@ -0,0 +1,188 @@ +/* + * Copyright 2018 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 + */ + +#include +#ifndef OPENSSL_NO_SIPHASH + +# include +# include +# include +# include +# include +# include + +# include "internal/siphash.h" +/* + * TODO(3.0) when siphash has moved entirely to our providers, this + * header should be moved to the provider include directory. For the + * moment, crypto/siphash/siphash_ameth.c has us stuck. + */ +# include "../../../crypto/siphash/siphash_local.h" + +# include "internal/providercommonerr.h" +# include "internal/provider_algs.h" + +/* + * Forward declaration of everything implemented here. This is not strictly + * necessary for the compiler, but provides an assurance that the signatures + * of the functions in the dispatch table are correct. + */ +static OSSL_OP_mac_newctx_fn siphash_new; +static OSSL_OP_mac_dupctx_fn siphash_dup; +static OSSL_OP_mac_freectx_fn siphash_free; +static OSSL_OP_mac_gettable_ctx_params_fn siphash_gettable_ctx_params; +static OSSL_OP_mac_ctx_get_params_fn siphash_ctx_get_params; +static OSSL_OP_mac_settable_ctx_params_fn siphash_settable_params; +static OSSL_OP_mac_ctx_set_params_fn siphash_set_params; +static OSSL_OP_mac_size_fn siphash_size; +static OSSL_OP_mac_init_fn siphash_init; +static OSSL_OP_mac_update_fn siphash_update; +static OSSL_OP_mac_final_fn siphash_final; + +struct siphash_data_st { + void *provctx; + SIPHASH siphash; /* Siphash data */ +}; + +static void *siphash_new(void *provctx) +{ + struct siphash_data_st *ctx = OPENSSL_zalloc(sizeof(*ctx)); + + ctx->provctx = provctx; + return ctx; +} + +static void siphash_free(void *vmacctx) +{ + OPENSSL_free(vmacctx); +} + +static void *siphash_dup(void *vsrc) +{ + struct siphash_data_st *ssrc = vsrc; + struct siphash_data_st *sdst = siphash_new(ssrc->provctx); + + if (sdst == NULL) + return NULL; + + sdst->siphash = ssrc->siphash; + return sdst; +} + +static size_t siphash_size(void *vmacctx) +{ + struct siphash_data_st *ctx = vmacctx; + + return SipHash_hash_size(&ctx->siphash); +} + +static int siphash_init(void *vmacctx) +{ + /* Not much to do here, actual initialization happens through controls */ + return 1; +} + +static int siphash_update(void *vmacctx, const unsigned char *data, + size_t datalen) +{ + struct siphash_data_st *ctx = vmacctx; + + SipHash_Update(&ctx->siphash, data, datalen); + return 1; +} + +static int siphash_final(void *vmacctx, unsigned char *out, size_t *outl, + size_t outsize) +{ + struct siphash_data_st *ctx = vmacctx; + size_t hlen = siphash_size(ctx); + + if (outsize < hlen) + return 0; + + *outl = hlen; + return SipHash_Final(&ctx->siphash, out, hlen); +} + +static const OSSL_PARAM known_gettable_ctx_params[] = { + OSSL_PARAM_size_t(OSSL_MAC_PARAM_OUTLEN, NULL), + OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL), /* Same as "outlen" */ + OSSL_PARAM_size_t(OSSL_MAC_PARAM_DIGESTSIZE, NULL), /* Same as "outlen" */ + OSSL_PARAM_END +}; +static const OSSL_PARAM *siphash_gettable_ctx_params(void) +{ + return known_gettable_ctx_params; +} + +static int siphash_ctx_get_params(void *vmacctx, OSSL_PARAM params[]) +{ + OSSL_PARAM *p; + + if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_OUTLEN)) != NULL + || (p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_SIZE)) != NULL + || (p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_DIGESTSIZE)) != NULL) + return OSSL_PARAM_set_size_t(p, siphash_size(vmacctx)); + + return 1; +} + +static const OSSL_PARAM known_settable_ctx_params[] = { + OSSL_PARAM_size_t(OSSL_MAC_PARAM_OUTLEN, NULL), + OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL), /* Same as "outlen" */ + OSSL_PARAM_size_t(OSSL_MAC_PARAM_DIGESTSIZE, NULL), /* Same as "outlen" */ + OSSL_PARAM_octet_string(OSSL_MAC_PARAM_KEY, NULL, 0), + OSSL_PARAM_END +}; +static const OSSL_PARAM *siphash_settable_params(void) +{ + return known_settable_ctx_params; +} + +static int siphash_set_params(void *vmacctx, const OSSL_PARAM *params) +{ + struct siphash_data_st *ctx = vmacctx; + const OSSL_PARAM *p = NULL; + + if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_OUTLEN)) != NULL + || ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_DIGESTSIZE)) + != NULL) + || ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_SIZE)) + != NULL)) { + size_t size; + + if (!OSSL_PARAM_get_size_t(p, &size) + || !SipHash_set_hash_size(&ctx->siphash, size)) + return 0; + } + if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_KEY)) != NULL) + if (p->data_type != OSSL_PARAM_OCTET_STRING + || p->data_size != SIPHASH_KEY_SIZE + || !SipHash_Init(&ctx->siphash, p->data, 0, 0)) + return 0; + return 1; +} + +const OSSL_DISPATCH siphash_functions[] = { + { OSSL_FUNC_MAC_NEWCTX, (void (*)(void))siphash_new }, + { OSSL_FUNC_MAC_DUPCTX, (void (*)(void))siphash_dup }, + { OSSL_FUNC_MAC_FREECTX, (void (*)(void))siphash_free }, + { OSSL_FUNC_MAC_INIT, (void (*)(void))siphash_init }, + { OSSL_FUNC_MAC_UPDATE, (void (*)(void))siphash_update }, + { OSSL_FUNC_MAC_FINAL, (void (*)(void))siphash_final }, + { OSSL_FUNC_MAC_GETTABLE_CTX_PARAMS, + (void (*)(void))siphash_gettable_ctx_params }, + { OSSL_FUNC_MAC_CTX_GET_PARAMS, (void (*)(void))siphash_ctx_get_params }, + { OSSL_FUNC_MAC_SETTABLE_CTX_PARAMS, + (void (*)(void))siphash_settable_params }, + { OSSL_FUNC_MAC_CTX_SET_PARAMS, (void (*)(void))siphash_set_params }, + { 0, NULL } +}; + +#endif -- cgit v1.2.3