From: Richard Levitte <levitte@openssl.org>
Date: Sat, 8 Sep 2018 21:19:06 +0000 (+0200)
Subject: SipHash: make it possible to control the hash size through string controls
X-Git-Tag: OpenSSL_1_1_1~17
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d0123525cd82be320f6b8b91ca287a2e572341cc;p=oweals%2Fopenssl.git

SipHash: make it possible to control the hash size through string controls

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7154)
---

diff --git a/crypto/siphash/siphash_pmeth.c b/crypto/siphash/siphash_pmeth.c
index a635260253..5c981bdb0b 100644
--- a/crypto/siphash/siphash_pmeth.c
+++ b/crypto/siphash/siphash_pmeth.c
@@ -167,6 +167,12 @@ static int pkey_siphash_ctrl_str(EVP_PKEY_CTX *ctx,
 {
     if (value == NULL)
         return 0;
+    if (strcmp(type, "digestsize") == 0) {
+        size_t hash_size = atoi(value);
+
+        return pkey_siphash_ctrl(ctx, EVP_PKEY_CTRL_SET_DIGEST_SIZE, hash_size,
+                                 NULL);
+    }
     if (strcmp(type, "key") == 0)
         return EVP_PKEY_CTX_str2ctrl(ctx, EVP_PKEY_CTRL_SET_MAC_KEY, value);
     if (strcmp(type, "hexkey") == 0)