Skip to content

Commit 5a148b5

Browse files
committed
mod_ssl: Remove warning over potential uninitialised value
for ssl protocol prior to protocol selection. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1924757 13f79535-47bb-0310-9956-ffa450edef68
1 parent 303ca68 commit 5a148b5

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

changes-entries/ssl_prot.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
*) mod_ssl: Remove warning over potential uninitialised value
3+
for ssl protocol prior to protocol selection.
4+
[Graham Leggett]
5+

modules/ssl/ssl_engine_init.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,12 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
664664
SSLSrvConfigRec *sc = mySrvConfig(s);
665665
#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
666666
(!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x20800000L)
667-
int prot;
667+
/* default is highest supported version, will be overridden below */
668+
#if SSL_HAVE_PROTOCOL_TLSV1_3
669+
int prot = TLS1_3_VERSION;
670+
#else
671+
int prot = TLS1_2_VERSION;
672+
#endif
668673
#endif
669674

670675
/*

0 commit comments

Comments
 (0)