summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2021-03-02 17:26:25 +0000
committerjsing <>2021-03-02 17:26:25 +0000
commit832000c4b16d02af0706fc03c94d93715299c9f2 (patch)
tree755512b09240353c54385d3812f39e65169e27b7 /src
parent75547e5fdc809c778649c3ca80af8077cd7cb504 (diff)
downloadopenbsd-832000c4b16d02af0706fc03c94d93715299c9f2.tar.gz
openbsd-832000c4b16d02af0706fc03c94d93715299c9f2.tar.bz2
openbsd-832000c4b16d02af0706fc03c94d93715299c9f2.zip
Separate variable declaration and assignment.
Requested by tb@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/tls12_record_layer.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libssl/tls12_record_layer.c b/src/lib/libssl/tls12_record_layer.c
index 0020b5ee1f..ee8552a9ca 100644
--- a/src/lib/libssl/tls12_record_layer.c
+++ b/src/lib/libssl/tls12_record_layer.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls12_record_layer.c,v 1.22 2021/03/02 17:24:37 jsing Exp $ */ 1/* $OpenBSD: tls12_record_layer.c,v 1.23 2021/03/02 17:26:25 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -368,7 +368,7 @@ tls12_record_layer_ccs_aead(struct tls12_record_layer *rl,
368 size_t mac_key_len, const uint8_t *key, size_t key_len, const uint8_t *iv, 368 size_t mac_key_len, const uint8_t *key, size_t key_len, const uint8_t *iv,
369 size_t iv_len) 369 size_t iv_len)
370{ 370{
371 size_t aead_nonce_len = EVP_AEAD_nonce_length(rl->aead); 371 size_t aead_nonce_len;
372 372
373 if (!tls12_record_protection_unused(rp)) 373 if (!tls12_record_protection_unused(rp))
374 return 0; 374 return 0;
@@ -393,6 +393,8 @@ tls12_record_layer_ccs_aead(struct tls12_record_layer *rl,
393 rp->aead_ctx->tag_len = EVP_AEAD_max_overhead(rl->aead); 393 rp->aead_ctx->tag_len = EVP_AEAD_max_overhead(rl->aead);
394 rp->aead_ctx->variable_nonce_len = 8; 394 rp->aead_ctx->variable_nonce_len = 8;
395 395
396 aead_nonce_len = EVP_AEAD_nonce_length(rl->aead);
397
396 if (rp->aead_ctx->xor_fixed_nonce) { 398 if (rp->aead_ctx->xor_fixed_nonce) {
397 /* Fixed nonce length must match, variable must not exceed. */ 399 /* Fixed nonce length must match, variable must not exceed. */
398 if (rp->aead_ctx->fixed_nonce_len != aead_nonce_len) 400 if (rp->aead_ctx->fixed_nonce_len != aead_nonce_len)