tls: fix compile issues on old-linux CI

Follow-up to 3210101088dfa
Closes #13325

diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
index 16d44c17c02f54efece17c0edf939684f3e958e6..743c774f7aa0cea95b7b461386fe1f4664149d65 100644 (file)
--- a/lib/vtls/gtls.c
+++ b/lib/vtls/gtls.c
@@ -753,7 +753,7 @@ CURLcode Curl_gtls_ctx_init(struct gtls_ctx *gctx,
   /* convert the ALPN string from our arguments to a list of strings
    * that gnutls wants and will convert internally back to this very
    * string for sending to the server. nice. */
-  if(alpn) {
+  if(alpn && alpn_len) {
     gnutls_datum_t alpns[5];
     size_t i, alen = alpn_len;
     unsigned char *s = (unsigned char *)alpn;

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 58395cb68e12a3bc6ca5eb93e272a141bf223849..36a1eb5a41cd8b63afaa5d27b4527eb190a8f975 100644 (file)
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -3552,8 +3552,10 @@ CURLcode Curl_ossl_ctx_init(struct ossl_ctx *octx,
      }
 #ifdef USE_OPENSSL_QUIC
     req_method = OSSL_QUIC_client_method();
-#else
+#elif (OPENSSL_VERSION_NUMBER >= 0x10100000L)
     req_method = TLS_method();
+#else
+    req_method = SSLv23_client_method();
 #endif
     break;
   default:
@@ -3677,7 +3679,7 @@ CURLcode Curl_ossl_ctx_init(struct ossl_ctx *octx,
   SSL_CTX_set_options(octx->ssl_ctx, ctx_options);
 
 #ifdef HAS_ALPN
-  if(alpn) {
+  if(alpn && alpn_len) {
     if(SSL_CTX_set_alpn_protos(octx->ssl_ctx, alpn, (int)alpn_len)) {
       failf(data, "Error setting ALPN");
       return CURLE_SSL_CONNECT_ERROR;
@@ -3914,10 +3916,12 @@ static CURLcode ossl_connect_step1(struct Curl_cfilter *cf,
   SSL_set_bio(octx->ssl, bio, bio);
 #endif
 
+#ifdef HAS_ALPN
   if(connssl->alpn) {
     Curl_alpn_to_proto_str(&proto, connssl->alpn);
     infof(data, VTLS_INFOF_ALPN_OFFER_1STR, proto.data);
   }
+#endif
   connssl->connecting_state = ssl_connect_2;
   return CURLE_OK;
 }
@@ -3952,7 +3956,9 @@ static CURLcode ossl_connect_step2(struct Curl_cfilter *cf,
     /* If key logging is enabled, wait for the handshake to complete and then
      * proceed with logging secrets (for TLS 1.2 or older).
      */
-    ossl_log_tls12_secret(octx->ssl, &octx->keylog_done);
+    bool done = FALSE;
+    ossl_log_tls12_secret(octx->ssl, &done);
+    octx->keylog_done = done;
   }
 #endif