Codebase list openssl / d74f23d
SipHash: add separate setter for the hash size This was originally part of SipHash_Init. However, there are cases where there isn't any key material to initialize from when setting the hash size, and we do allow doing so with a EVP_PKEY control. The solution is to provide a separate hash_size setter and to use it in the corresponding EVP_PKEY_METHOD. Fixes #7143 Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7145) Richard Levitte 5 years ago
4 changed file(s) with 42 addition(s) and 29 deletion(s). Raw diff Collapse all Expand all
+2
-1
crypto/include/internal/siphash.h less more
1717
1818 size_t SipHash_ctx_size(void);
1919 size_t SipHash_hash_size(SIPHASH *ctx);
20 int SipHash_Init(SIPHASH *ctx, const unsigned char *k, int hash_size,
20 int SipHash_set_hash_size(SIPHASH *ctx, size_t hash_size);
21 int SipHash_Init(SIPHASH *ctx, const unsigned char *k,
2122 int crounds, int drounds);
2223 void SipHash_Update(SIPHASH *ctx, const unsigned char *in, size_t inlen);
2324 int SipHash_Final(SIPHASH *ctx, unsigned char *out, size_t outlen);
+21
-7
crypto/siphash/siphash.c less more
7979 return ctx->hash_size;
8080 }
8181
82 static size_t siphash_adjust_hash_size(size_t hash_size)
83 {
84 if (hash_size == 0)
85 hash_size = SIPHASH_MAX_DIGEST_SIZE;
86 return hash_size;
87 }
88
89 int SipHash_set_hash_size(SIPHASH *ctx, size_t hash_size)
90 {
91 hash_size = siphash_adjust_hash_size(hash_size);
92 if (hash_size != SIPHASH_MIN_DIGEST_SIZE
93 && hash_size != SIPHASH_MAX_DIGEST_SIZE)
94 return 0;
95
96 ctx->hash_size = hash_size;
97 return 1;
98 }
99
82100 /* hash_size = crounds = drounds = 0 means SipHash24 with 16-byte output */
83 int SipHash_Init(SIPHASH *ctx, const unsigned char *k, int hash_size, int crounds, int drounds)
101 int SipHash_Init(SIPHASH *ctx, const unsigned char *k, int crounds, int drounds)
84102 {
85103 uint64_t k0 = U8TO64_LE(k);
86104 uint64_t k1 = U8TO64_LE(k + 8);
87105
88 if (hash_size == 0)
89 hash_size = SIPHASH_MAX_DIGEST_SIZE;
90 else if (hash_size != SIPHASH_MIN_DIGEST_SIZE &&
91 hash_size != SIPHASH_MAX_DIGEST_SIZE)
92 return 0;
106 /* If the hash size wasn't set, i.e. is zero */
107 ctx->hash_size = siphash_adjust_hash_size(ctx->hash_size);
93108
94109 if (drounds == 0)
95110 drounds = SIPHASH_D_ROUNDS;
98113
99114 ctx->crounds = crounds;
100115 ctx->drounds = drounds;
101 ctx->hash_size = hash_size;
102116
103117 ctx->len = 0;
104118 ctx->total_inlen = 0;
+4
-13
crypto/siphash/siphash_pmeth.c less more
9494 SIPHASH_PKEY_CTX *pctx = EVP_PKEY_CTX_get_data(ctx);
9595 const unsigned char* key;
9696 size_t len;
97 int hash_size;
9897
9998 key = EVP_PKEY_get0_siphash(EVP_PKEY_CTX_get0_pkey(ctx), &len);
10099 if (key == NULL || len != SIPHASH_KEY_SIZE)
101100 return 0;
102101 EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_NO_INIT);
103102 EVP_MD_CTX_set_update_fn(mctx, int_update);
104 /* use default rounds (2,4) */
105 hash_size = SipHash_hash_size(&pctx->ctx);
106 return SipHash_Init(&pctx->ctx, key, hash_size, 0, 0);
103 return SipHash_Init(&pctx->ctx, key, 0, 0);
107104 }
108105 static int siphash_signctx(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
109106 EVP_MD_CTX *mctx)
121118 SIPHASH_PKEY_CTX *pctx = EVP_PKEY_CTX_get_data(ctx);
122119 const unsigned char *key;
123120 size_t len;
124 int hash_size;
125121
126122 switch (type) {
127123
130126 break;
131127
132128 case EVP_PKEY_CTRL_SET_DIGEST_SIZE:
133 if (p1 != SIPHASH_MIN_DIGEST_SIZE &&
134 p1 != SIPHASH_MAX_DIGEST_SIZE) {
135 return 0;
136 }
137 /* use default rounds (2,4) */
138 return SipHash_Init(&pctx->ctx, ASN1_STRING_get0_data(&pctx->ktmp), p1, 0, 0);
129 return SipHash_set_hash_size(&pctx->ctx, p1);
139130
140131 case EVP_PKEY_CTRL_SET_MAC_KEY:
141132 case EVP_PKEY_CTRL_DIGESTINIT:
151142 !ASN1_OCTET_STRING_set(&pctx->ktmp, key, len))
152143 return 0;
153144 /* use default rounds (2,4) */
154 hash_size = SipHash_hash_size(&pctx->ctx);
155 return SipHash_Init(&pctx->ctx, ASN1_STRING_get0_data(&pctx->ktmp), hash_size, 0, 0);
145 return SipHash_Init(&pctx->ctx, ASN1_STRING_get0_data(&pctx->ktmp),
146 0, 0);
156147
157148 default:
158149 return -2;
+15
-8
test/siphash_internal_test.c less more
195195 for (i = 0; i < inlen; i++)
196196 in[i] = (unsigned char)i;
197197
198 if (!TEST_true(SipHash_Init(&siphash, key, expectedlen, 0, 0)))
198 if (!TEST_true(SipHash_set_hash_size(&siphash, expectedlen))
199 || !TEST_true(SipHash_Init(&siphash, key, 0, 0)))
199200 return 0;
200201 SipHash_Update(&siphash, in, inlen);
201202 if (!TEST_true(SipHash_Final(&siphash, out, expectedlen))
203204 return 0;
204205
205206 if (inlen > 16) {
206 if (!TEST_true(SipHash_Init(&siphash, key, expectedlen, 0, 0)))
207 if (!TEST_true(SipHash_set_hash_size(&siphash, expectedlen))
208 || !TEST_true(SipHash_Init(&siphash, key, 0, 0)))
207209 return 0;
208210 SipHash_Update(&siphash, in, 1);
209211 SipHash_Update(&siphash, in+1, inlen-1);
219221 if (inlen > 32) {
220222 size_t half = inlen / 2;
221223
222 if (!TEST_true(SipHash_Init(&siphash, key, expectedlen, 0, 0)))
224 if (!TEST_true(SipHash_set_hash_size(&siphash, expectedlen))
225 || !TEST_true(SipHash_Init(&siphash, key, 0, 0)))
223226 return 0;
224227 SipHash_Update(&siphash, in, half);
225228 SipHash_Update(&siphash, in+half, inlen-half);
232235 }
233236
234237 for (half = 16; half < inlen; half += 16) {
235 if (!TEST_true(SipHash_Init(&siphash, key, expectedlen, 0, 0)))
238 if (!TEST_true(SipHash_set_hash_size(&siphash, expectedlen))
239 || !TEST_true(SipHash_Init(&siphash, key, 0, 0)))
236240 return 0;
237241 SipHash_Update(&siphash, in, half);
238242 SipHash_Update(&siphash, in+half, inlen-half);
257261 unsigned char output[SIPHASH_MAX_DIGEST_SIZE];
258262
259263 /* Use invalid hash size */
260 return TEST_int_eq(SipHash_Init(&siphash, key, 4, 0, 0), 0)
264 return TEST_int_eq(SipHash_set_hash_size(&siphash, 4), 0)
261265 /* Use hash size = 8 */
262 && TEST_true(SipHash_Init(&siphash, key, 8, 0, 0))
266 && TEST_true(SipHash_set_hash_size(&siphash, 8))
267 && TEST_true(SipHash_Init(&siphash, key, 0, 0))
263268 && TEST_true(SipHash_Final(&siphash, output, 8))
264269 && TEST_int_eq(SipHash_Final(&siphash, output, 16), 0)
265270
266271 /* Use hash size = 16 */
267 && TEST_true(SipHash_Init(&siphash, key, 16, 0, 0))
272 && TEST_true(SipHash_set_hash_size(&siphash, 16))
273 && TEST_true(SipHash_Init(&siphash, key, 0, 0))
268274 && TEST_int_eq(SipHash_Final(&siphash, output, 8), 0)
269275 && TEST_true(SipHash_Final(&siphash, output, 16))
270276
271277 /* Use hash size = 0 (default = 16) */
272 && TEST_true(SipHash_Init(&siphash, key, 0, 0, 0))
278 && TEST_true(SipHash_set_hash_size(&siphash, 0))
279 && TEST_true(SipHash_Init(&siphash, key, 0, 0))
273280 && TEST_int_eq(SipHash_Final(&siphash, output, 8), 0)
274281 && TEST_true(SipHash_Final(&siphash, output, 16));
275282 }