summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorjsing <>2020-09-15 15:11:58 +0000
committerjsing <>2020-09-15 15:11:58 +0000
commit9b0955f4bd0b0ba9534e309a20b55847c1a4c07b (patch)
treec5d33da27cafa3dc31255813748ec4bc1a9754d8 /src/lib
parentd0a9ef033bde1e5274774ee0e23d611f9462a3a9 (diff)
downloadopenbsd-9b0955f4bd0b0ba9534e309a20b55847c1a4c07b.tar.gz
openbsd-9b0955f4bd0b0ba9534e309a20b55847c1a4c07b.tar.bz2
openbsd-9b0955f4bd0b0ba9534e309a20b55847c1a4c07b.zip
Correct a failure case in tls12_record_layer_seal_record_protected()
This should be a 'goto err' rather than returning.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libssl/tls12_record_layer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/tls12_record_layer.c b/src/lib/libssl/tls12_record_layer.c
index 5e7a3a610c..d1686cb5bd 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.1 2020/08/30 15:40:20 jsing Exp $ */ 1/* $OpenBSD: tls12_record_layer.c,v 1.2 2020/09/15 15:11:58 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -457,7 +457,7 @@ tls12_record_layer_seal_record_protected_cipher(struct tls12_record_layer *rl,
457 /* Add padding to block size, if necessary. */ 457 /* Add padding to block size, if necessary. */
458 block_size = EVP_CIPHER_CTX_block_size(enc); 458 block_size = EVP_CIPHER_CTX_block_size(enc);
459 if (block_size < 0 || block_size > EVP_MAX_BLOCK_LENGTH) 459 if (block_size < 0 || block_size > EVP_MAX_BLOCK_LENGTH)
460 return 0; 460 goto err;
461 if (block_size > 1) { 461 if (block_size > 1) {
462 pad_len = block_size - (plain_len % block_size); 462 pad_len = block_size - (plain_len % block_size);
463 pad_val = pad_len - 1; 463 pad_val = pad_len - 1;