Revert "Keep the DTLS timer running after the end of the handshake if appropriate"

[openssl.git] / ssl / statem / statem_lib.c

diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index dc2bd20e936d22efbb4f0d2b329d0f57c1c30d98..2f78a3f60251b015ef408b69fde6c51f6ce52572 100644 (file)
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -2,7 +2,7 @@
  * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *

- * Licensed under the OpenSSL license (the "License").  You may not use
+ * Licensed under the Apache License 2.0 (the "License").  You may not use

  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html


@@ -396,7 +396,8 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL *s, PACKET *pkt)
 
 #ifdef SSL_DEBUG
     if (SSL_USE_SIGALGS(s))
 
 #ifdef SSL_DEBUG
     if (SSL_USE_SIGALGS(s))

-        fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md));
+        fprintf(stderr, "USING TLSv1.2 HASH %s\n",
+                md == NULL ? "n/a" : EVP_MD_name(md));

 #endif
 
     /* Check for broken implementations of GOST ciphersuites */
 #endif
 
     /* Check for broken implementations of GOST ciphersuites */


@@ -439,7 +440,8 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL *s, PACKET *pkt)
     }
 
 #ifdef SSL_DEBUG
     }
 
 #ifdef SSL_DEBUG

-    fprintf(stderr, "Using client verify alg %s\n", EVP_MD_name(md));
+    fprintf(stderr, "Using client verify alg %s\n",
+            md == NULL ? "n/a" : EVP_MD_name(md));

 #endif
     if (EVP_DigestVerifyInit(mctx, &pctx, md, NULL, pkey) <= 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_CERT_VERIFY,
 #endif
     if (EVP_DigestVerifyInit(mctx, &pctx, md, NULL, pkey) <= 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_CERT_VERIFY,


@@ -1074,15 +1076,6 @@ WORK_STATE tls_finish_handshake(SSL *s, WORK_STATE wst, int clearbufs, int stop)
             /* N.B. s->ctx may not equal s->session_ctx */
             tsan_counter(&s->ctx->stats.sess_accept_good);
             s->handshake_func = ossl_statem_accept;
             /* N.B. s->ctx may not equal s->session_ctx */
             tsan_counter(&s->ctx->stats.sess_accept_good);
             s->handshake_func = ossl_statem_accept;

-
-            if (SSL_IS_DTLS(s) && !s->hit) {
-                /*
-                 * We are finishing after the client. We start the timer going
-                 * in case there are any retransmits of our final flight
-                 * required.
-                 */
-                dtls1_start_timer(s);
-            }

         } else {
             if (SSL_IS_TLS13(s)) {
                 /*
         } else {
             if (SSL_IS_TLS13(s)) {
                 /*


@@ -1104,15 +1097,6 @@ WORK_STATE tls_finish_handshake(SSL *s, WORK_STATE wst, int clearbufs, int stop)
 
             s->handshake_func = ossl_statem_connect;
             tsan_counter(&s->session_ctx->stats.sess_connect_good);
 
             s->handshake_func = ossl_statem_connect;
             tsan_counter(&s->session_ctx->stats.sess_connect_good);

-
-            if (SSL_IS_DTLS(s) && s->hit) {
-                /*
-                 * We are finishing after the server. We start the timer going
-                 * in case there are any retransmits of our final flight
-                 * required.
-                 */
-                dtls1_start_timer(s);
-            }

         }
 
         if (SSL_IS_DTLS(s)) {
         }
 
         if (SSL_IS_DTLS(s)) {


@@ -1415,7 +1399,7 @@ typedef struct {
     const SSL_METHOD *(*smeth) (void);
 } version_info;
 
     const SSL_METHOD *(*smeth) (void);
 } version_info;
 

-#if TLS_MAX_VERSION != TLS1_3_VERSION
+#if TLS_MAX_VERSION_INTERNAL != TLS1_3_VERSION

 # error Code needs update for TLS_method() support beyond TLS1_3_VERSION.
 #endif
 
 # error Code needs update for TLS_method() support beyond TLS1_3_VERSION.
 #endif
 


@@ -1449,7 +1433,7 @@ static const version_info tls_version_table[] = {
     {0, NULL, NULL},
 };
 
     {0, NULL, NULL},
 };
 

-#if DTLS_MAX_VERSION != DTLS1_2_VERSION
+#if DTLS_MAX_VERSION_INTERNAL != DTLS1_2_VERSION

 # error Code needs update for DTLS_method() support beyond DTLS1_2_VERSION.
 #endif
 
 # error Code needs update for DTLS_method() support beyond DTLS1_2_VERSION.
 #endif
 


@@ -1506,8 +1490,11 @@ static int ssl_method_error(const SSL *s, const SSL_METHOD *method)
  */
 static int is_tls13_capable(const SSL *s)
 {
  */
 static int is_tls13_capable(const SSL *s)
 {

-    int i, curve;
+    int i;
+#ifndef OPENSSL_NO_EC
+    int curve;

     EC_KEY *eckey;
     EC_KEY *eckey;

+#endif

 
 #ifndef OPENSSL_NO_PSK
     if (s->psk_server_callback != NULL)
 
 #ifndef OPENSSL_NO_PSK
     if (s->psk_server_callback != NULL)


@@ -1530,6 +1517,7 @@ static int is_tls13_capable(const SSL *s)
         }
         if (!ssl_has_cert(s, i))
             continue;
         }
         if (!ssl_has_cert(s, i))
             continue;

+#ifndef OPENSSL_NO_EC

         if (i != SSL_PKEY_ECC)
             return 1;
         /*
         if (i != SSL_PKEY_ECC)
             return 1;
         /*


@@ -1543,6 +1531,9 @@ static int is_tls13_capable(const SSL *s)
         curve = EC_GROUP_get_curve_name(EC_KEY_get0_group(eckey));
         if (tls_check_sigalg_curve(s, curve))
             return 1;
         curve = EC_GROUP_get_curve_name(EC_KEY_get0_group(eckey));
         if (tls_check_sigalg_curve(s, curve))
             return 1;

+#else
+        return 1;
+#endif

     }
 
     return 0;
     }
 
     return 0;


@@ -1675,12 +1666,12 @@ int ssl_set_version_bound(int method_version, int version, int *bound)
         return 0;
 
     case TLS_ANY_VERSION:
         return 0;
 
     case TLS_ANY_VERSION:

-        if (version < SSL3_VERSION || version > TLS_MAX_VERSION)
+        if (version < SSL3_VERSION || version > TLS_MAX_VERSION_INTERNAL)

             return 0;
         break;
 
     case DTLS_ANY_VERSION:
             return 0;
         break;
 
     case DTLS_ANY_VERSION:

-        if (DTLS_VERSION_GT(version, DTLS_MAX_VERSION) ||
+        if (DTLS_VERSION_GT(version, DTLS_MAX_VERSION_INTERNAL) ||

             DTLS_VERSION_LT(version, DTLS1_BAD_VER))
             return 0;
         break;
             DTLS_VERSION_LT(version, DTLS1_BAD_VER))
             return 0;
         break;


@@ -1726,7 +1717,7 @@ int ssl_choose_server_version(SSL *s, CLIENTHELLO_MSG *hello, DOWNGRADE *dgrd)
      * With version-flexible methods we have an initial state with:
      *
      *   s->method->version == (D)TLS_ANY_VERSION,
      * With version-flexible methods we have an initial state with:
      *
      *   s->method->version == (D)TLS_ANY_VERSION,

-     *   s->version == (D)TLS_MAX_VERSION.
+     *   s->version == (D)TLS_MAX_VERSION_INTERNAL.

      *
      * So we detect version-flexible methods via the method version, not the
      * handle version.
      *
      * So we detect version-flexible methods via the method version, not the
      * handle version.


@@ -2287,10 +2278,24 @@ int parse_ca_names(SSL *s, PACKET *pkt)
     return 0;
 }
 
     return 0;
 }
 

-int construct_ca_names(SSL *s, WPACKET *pkt)
+const STACK_OF(X509_NAME) *get_ca_names(SSL *s)

 {
 {

-    const STACK_OF(X509_NAME) *ca_sk = SSL_get0_CA_list(s);
+    const STACK_OF(X509_NAME) *ca_sk = NULL;;

 
 

+    if (s->server) {
+        ca_sk = SSL_get_client_CA_list(s);
+        if (ca_sk != NULL && sk_X509_NAME_num(ca_sk) == 0)
+            ca_sk = NULL;
+    }
+
+    if (ca_sk == NULL)
+        ca_sk = SSL_get0_CA_list(s);
+
+    return ca_sk;
+}
+
+int construct_ca_names(SSL *s, const STACK_OF(X509_NAME) *ca_sk, WPACKET *pkt)
+{

     /* Start sub-packet for client CA list */
     if (!WPACKET_start_sub_packet_u16(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_CONSTRUCT_CA_NAMES,
     /* Start sub-packet for client CA list */
     if (!WPACKET_start_sub_packet_u16(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_CONSTRUCT_CA_NAMES,