diff options
author | Richard Levitte <levitte@openssl.org> | 2019-06-02 08:51:58 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-08-15 22:12:25 +0200 |
commit | 4657693d9e53ea45cbb903969370ddf9d331dafd (patch) | |
tree | 938a1aef4bc8dfa6e77b2a7a7f553a75f5a0f766 /crypto/siphash | |
parent | e23cda000ef2e54e83da61e102ce6d22ed56721a (diff) | |
download | openssl-4657693d9e53ea45cbb903969370ddf9d331dafd.zip openssl-4657693d9e53ea45cbb903969370ddf9d331dafd.tar.gz openssl-4657693d9e53ea45cbb903969370ddf9d331dafd.tar.bz2 |
Move SipHash to providers
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8877)
Diffstat (limited to 'crypto/siphash')
-rw-r--r-- | crypto/siphash/build.info | 1 | ||||
-rw-r--r-- | crypto/siphash/siphash_meth.c | 146 |
2 files changed, 0 insertions, 147 deletions
diff --git a/crypto/siphash/build.info b/crypto/siphash/build.info index b56563f..2dc7101 100644 --- a/crypto/siphash/build.info +++ b/crypto/siphash/build.info @@ -1,5 +1,4 @@ LIBS=../../libcrypto SOURCE[../../libcrypto]=\ siphash.c \ - siphash_meth.c \ siphash_ameth.c diff --git a/crypto/siphash/siphash_meth.c b/crypto/siphash/siphash_meth.c deleted file mode 100644 index 5fcff2d..0000000 --- a/crypto/siphash/siphash_meth.c +++ /dev/null @@ -1,146 +0,0 @@ -/* - * 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 <stdarg.h> -#include <string.h> -#include <openssl/evp.h> -#include <openssl/err.h> -#include "internal/siphash.h" -#include "siphash_local.h" -#include "internal/evp_int.h" - -/* local SIPHASH structure is actually a SIPHASH */ - -struct evp_mac_impl_st { - SIPHASH ctx; -}; - -static EVP_MAC_IMPL *siphash_new(void) -{ - return OPENSSL_zalloc(sizeof(EVP_MAC_IMPL)); -} - -static void siphash_free(EVP_MAC_IMPL *sctx) -{ - OPENSSL_free(sctx); -} - -static EVP_MAC_IMPL *siphash_dup(const EVP_MAC_IMPL *ssrc) -{ - EVP_MAC_IMPL *sdst; - - sdst = siphash_new(); - if (sdst == NULL) - return NULL; - - *sdst = *ssrc; - - return sdst; -} - -static size_t siphash_size(EVP_MAC_IMPL *sctx) -{ - return SipHash_hash_size(&sctx->ctx); -} - -static int siphash_init(EVP_MAC_IMPL *sctx) -{ - /* Not much to do here, actual initialization happens through controls */ - return 1; -} - -static int siphash_update(EVP_MAC_IMPL *sctx, const unsigned char *data, - size_t datalen) -{ - SipHash_Update(&sctx->ctx, data, datalen); - return 1; -} - -static int siphash_final(EVP_MAC_IMPL *sctx, unsigned char *out) -{ - size_t hlen = siphash_size(sctx); - - return SipHash_Final(&sctx->ctx, out, hlen); -} - -static int siphash_ctrl(EVP_MAC_IMPL *sctx, int cmd, va_list args) -{ - switch (cmd) { - case EVP_MAC_CTRL_SET_SIZE: - { - size_t size = va_arg(args, size_t); - - return SipHash_set_hash_size(&sctx->ctx, size); - } - break; - case EVP_MAC_CTRL_SET_KEY: - { - const unsigned char *key = va_arg(args, const unsigned char *); - size_t keylen = va_arg(args, size_t); - - if (key == NULL || keylen != SIPHASH_KEY_SIZE) - return 0; - - return SipHash_Init(&sctx->ctx, key, 0, 0); - } - break; - default: - return -2; - } - return 1; -} - -static int siphash_ctrl_int(EVP_MAC_IMPL *sctx, int cmd, ...) -{ - int rv; - va_list args; - - va_start(args, cmd); - rv = siphash_ctrl(sctx, cmd, args); - va_end(args); - - return rv; -} - -static int siphash_ctrl_str_cb(void *ctx, int cmd, void *buf, size_t buflen) -{ - return siphash_ctrl_int(ctx, cmd, buf, buflen); -} - -static int siphash_ctrl_str(EVP_MAC_IMPL *ctx, - const char *type, const char *value) -{ - if (value == NULL) - return 0; - if (strcmp(type, "digestsize") == 0) { - size_t hash_size = atoi(value); - - return siphash_ctrl_int(ctx, EVP_MAC_CTRL_SET_SIZE, hash_size); - } - if (strcmp(type, "key") == 0) - return EVP_str2ctrl(siphash_ctrl_str_cb, ctx, EVP_MAC_CTRL_SET_KEY, - value); - if (strcmp(type, "hexkey") == 0) - return EVP_hex2ctrl(siphash_ctrl_str_cb, ctx, EVP_MAC_CTRL_SET_KEY, - value); - return -2; -} - -const EVP_MAC siphash_meth = { - EVP_MAC_SIPHASH, - siphash_new, - siphash_dup, - siphash_free, - siphash_size, - siphash_init, - siphash_update, - siphash_final, - siphash_ctrl, - siphash_ctrl_str -}; |