diff options
| author |   jsing <jsing@openbsd.org> | 2021-03-02 17:26:25 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2021-03-02 17:26:25 +0000 |
| commit | 2261fe7933fa2b529079286fae019b81429382d5 (patch) | |
| tree | af65ea35a7832626c3fec459b4fd0fdcb662ea13 /lib/libssl/tls12_record_layer.c | |
| parent | Replace two handrolled tls12_record_protection_engaged(). (diff) | |
| download | wireguard-openbsd-2261fe7933fa2b529079286fae019b81429382d5.tar.xz wireguard-openbsd-2261fe7933fa2b529079286fae019b81429382d5.zip | |
Separate variable declaration and assignment.
Requested by tb@
Diffstat (limited to 'lib/libssl/tls12_record_layer.c')
| -rw-r--r-- | lib/libssl/tls12_record_layer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/libssl/tls12_record_layer.c b/lib/libssl/tls12_record_layer.c index 0020b5ee1fd..ee8552a9ca1 100644 --- a/lib/libssl/tls12_record_layer.c +++ b/lib/libssl/tls12_record_layer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls12_record_layer.c,v 1.22 2021/03/02 17:24:37 jsing Exp $ */ +/* $OpenBSD: tls12_record_layer.c,v 1.23 2021/03/02 17:26:25 jsing Exp $ */ /* * Copyright (c) 2020 Joel Sing <jsing@openbsd.org> * @@ -368,7 +368,7 @@ tls12_record_layer_ccs_aead(struct tls12_record_layer *rl, size_t mac_key_len, const uint8_t *key, size_t key_len, const uint8_t *iv, size_t iv_len) { - size_t aead_nonce_len = EVP_AEAD_nonce_length(rl->aead); + size_t aead_nonce_len; if (!tls12_record_protection_unused(rp)) return 0; @@ -393,6 +393,8 @@ tls12_record_layer_ccs_aead(struct tls12_record_layer *rl, rp->aead_ctx->tag_len = EVP_AEAD_max_overhead(rl->aead); rp->aead_ctx->variable_nonce_len = 8; + aead_nonce_len = EVP_AEAD_nonce_length(rl->aead); + if (rp->aead_ctx->xor_fixed_nonce) { /* Fixed nonce length must match, variable must not exceed. */ if (rp->aead_ctx->fixed_nonce_len != aead_nonce_len) |