The branch master has been updated via 498e807ed257b0f292ba94aea2971b928efbfd91 (commit) via a61b6b623df1295976d82c177707ac80f2751237 (commit) from 8bf37709a471bb31d2e1f5b4b3796fb3e6dce4df (commit)
- Log ----------------------------------------------------------------- commit 498e807ed257b0f292ba94aea2971b928efbfd91 Author: Dr. David von Oheimb <david.von.ohe...@siemens.com> Date: Fri Jun 5 16:42:39 2020 +0200 Silence gcc false positive warning on refdatalen in test/tls13encryptiontest.c Reviewed-by: Matt Caswell <m...@openssl.org> Reviewed-by: Bernd Edlinger <bernd.edlin...@hotmail.de> Reviewed-by: Tomas Mraz <tm...@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/12042) commit a61b6b623df1295976d82c177707ac80f2751237 Author: Dr. David von Oheimb <david.von.ohe...@siemens.com> Date: Thu Jun 4 12:37:50 2020 +0200 Silence gcc false positive warning on alpn_protos_len in test/handshake_helper.c Reviewed-by: Matt Caswell <m...@openssl.org> Reviewed-by: Bernd Edlinger <bernd.edlin...@hotmail.de> Reviewed-by: Tomas Mraz <tm...@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/12042) ----------------------------------------------------------------------- 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 030073289a..2dfded5c11 100644 --- a/test/handshake_helper.c +++ b/test/handshake_helper.c @@ -641,7 +641,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 84a8557e4e..e8614cfebd 100644 --- a/test/tls13encryptiontest.c +++ b/test/tls13encryptiontest.c @@ -277,7 +277,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);