The branch OpenSSL_1_1_1-stable has been updated
via 0fef6d55d379bc6dacf05713c38f3ec81957ea69 (commit)
via 1349865a5621ce69f09ff4a0991afd74648df72b (commit)
from 7f699cb663741a73cfe95214d4a39a1078c94294 (commit)
- Log -----------------------------------------------------------------
commit 0fef6d55d379bc6dacf05713c38f3ec81957ea69
Author: Dr. David von Oheimb <[email protected]>
Date: Thu Jun 4 12:34:00 2020 +0200
Silence gcc false positive warning on alpn_protos_len in
test/handshake_helper.c
Fixes #12033
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Bernd Edlinger <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/12041)
commit 1349865a5621ce69f09ff4a0991afd74648df72b
Author: Dr. David von Oheimb <[email protected]>
Date: Fri Jun 5 16:34:51 2020 +0200
Silence gcc false positive warning on refdatalen in
test/tls13encryptiontest.c
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Bernd Edlinger <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/12041)
-----------------------------------------------------------------------
Summary of changes:
test/handshake_helper.c | 3 ++-
test/tls13encryptiontest.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/test/handshake_helper.c b/test/handshake_helper.c
index 1742004b5b..347f6b49ed 100644
--- a/test/handshake_helper.c
+++ b/test/handshake_helper.c
@@ -637,7 +637,8 @@ static int configure_handshake_ctx(SSL_CTX *server_ctx,
SSL_CTX *server2_ctx,
}
if (extra->client.alpn_protocols != NULL) {
unsigned char *alpn_protos = NULL;
- size_t alpn_protos_len;
+ size_t alpn_protos_len = 0;
+
if (!TEST_true(parse_protos(extra->client.alpn_protocols,
&alpn_protos, &alpn_protos_len))
/* Reversed return value convention... */
diff --git a/test/tls13encryptiontest.c b/test/tls13encryptiontest.c
index 479ff4105e..dbe80a20fa 100644
--- a/test/tls13encryptiontest.c
+++ b/test/tls13encryptiontest.c
@@ -288,7 +288,7 @@ static int test_record(SSL3_RECORD *rec, RECORD_DATA *recd,
int enc)
{
int ret = 0;
unsigned char *refd;
- size_t refdatalen;
+ size_t refdatalen = 0;
if (enc)
refd = multihexstr2buf(recd->ciphertext, &refdatalen);
