handshake: clear server's session ticket indication at rehandshake

While OpenSSL server doesn't indicate a session ticket in the second
handshake of TLS 1.2 rehandshake, GnuTLS client previously waited for
it as it didn't clear the internal flag (session_ticket_renew) thus
the effect remained.  This patch clears the flag properly at the end
of each handshake.

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/.gitignore b/.gitignore
index 1e876c2dc8c452c0eeb75713d86aaa9f382cc3a8..aec0842ac661abdf9daeea3cb00f95528d47def3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -845,6 +845,7 @@ tests/tls12-rehandshake-cert-2
 tests/tls12-rehandshake-cert-3
 tests/tls12-rehandshake-cert-auto
 tests/tls12-rehandshake-set-prio
+tests/tls12-rehandshake-ticket
 tests/tls12-resume-anon
 tests/tls12-resume-psk
 tests/tls12-resume-x509

diff --git a/lib/ext/session_ticket.c b/lib/ext/session_ticket.c
index 87d9069934c57870c6ab28bd4ca2705ee4499d55..2e2627e6183de9bebe1a849a5dc66f34f5de2311 100644 (file)
--- a/lib/ext/session_ticket.c
+++ b/lib/ext/session_ticket.c
@@ -624,6 +624,12 @@ gnutls_session_ticket_enable_server(gnutls_session_t session,
        return 0;
 }
 
+void
+_gnutls_session_ticket_disable_server(gnutls_session_t session)
+{
+       session->internals.flags |= GNUTLS_NO_TICKETS;
+}
+
 /*
  * Return zero if session tickets haven't been enabled.
  */

diff --git a/lib/ext/session_ticket.h b/lib/ext/session_ticket.h
index da804ec2f72968b1ac734c0b692c7271d74a69a7..660c9d3defcbcc025f4a2ddda127e072ec407070 100644 (file)
--- a/lib/ext/session_ticket.h
+++ b/lib/ext/session_ticket.h
@@ -36,5 +36,6 @@ int _gnutls_encrypt_session_ticket(gnutls_session_t session,
 int _gnutls_decrypt_session_ticket(gnutls_session_t session,
                                   const gnutls_datum_t *ticket_data,
                                   gnutls_datum_t *state);
+void _gnutls_session_ticket_disable_server(gnutls_session_t session);
 
 #endif /* GNUTLS_LIB_EXT_SESSION_TICKET_H */

diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 9e869d038f43fbf06cc72ee0cd347e3a41004272..31cbb904894cfa72b16621da28e31ce0649167e3 100644 (file)
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -1512,4 +1512,6 @@ GNUTLS_PRIVATE_3_4 {
        _gnutls_buffer_clear;
        # needed by tests/cipher-alignment
        _gnutls_crypto_register_cipher;
+       # needed by tests/tls12-rehandshake-cert-ticket
+       _gnutls_session_ticket_disable_server;
 } GNUTLS_3_4;

diff --git a/lib/state.c b/lib/state.c
index 347c77b537c698b03f8a946752b669d7fb9d9063..ac6dc81322db7e8acce07dfa30d3f5de08d08148 100644 (file)
--- a/lib/state.c
+++ b/lib/state.c
@@ -545,6 +545,7 @@ void _gnutls_handshake_internal_state_clear(gnutls_session_t session)
        session->internals.tfo.connect_addrlen = 0;
        session->internals.tfo.connect_only = 0;
        session->internals.early_data_received = 0;
+       session->internals.session_ticket_renew = 0;
 }
 
 /**

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9d89a8282a1aec5061722bc16a42b00652e0a8bc..d3bba3d96a2cbd7440c390e25f129394bbf3c439 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -234,7 +234,7 @@ ctests += mini-record-2 simple gnutls_hmac_fast set_pkcs12_cred cert certuniquei
         set_x509_ocsp_multi_cli kdf-api keylog-func handshake-write \
         x509cert-dntypes id-on-xmppAddr tls13-compat-mode ciphersuite-name \
         x509-upnconstraint xts-key-check cipher-padding pkcs7-verify-double-free \
-        fips-rsa-sizes
+        fips-rsa-sizes tls12-rehandshake-ticket
 
 ctests += tls-channel-binding
 

diff --git a/tests/tls12-rehandshake-ticket.c b/tests/tls12-rehandshake-ticket.c
new file mode 100644 (file)
index 0000000..f96e46e
--- /dev/null
+++ b/tests/tls12-rehandshake-ticket.c
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2022 Red Hat, Inc.
+ *
+ * Author: Daiki Ueno
+ *
+ * This file is part of GnuTLS.
+ *
+ * GnuTLS is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuTLS is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gnutls/gnutls.h>
+#include <assert.h>
+#include "cert-common.h"
+
+#include "utils.h"
+#include "eagain-common.h"
+
+const char *side = "";
+
+static void tls_log_func(int level, const char *str)
+{
+       fprintf(stderr, "%s|<%d>| %s", side, level, str);
+}
+
+#define MAX_BUF 1024
+
+void _gnutls_session_ticket_disable_server(gnutls_session_t session);
+
+static void run(void)
+{
+       char buffer[MAX_BUF + 1];
+       /* Server stuff. */
+       gnutls_certificate_credentials_t scred;
+       gnutls_session_t server;
+       gnutls_datum_t session_ticket_key = { NULL, 0 };
+       int sret;
+       /* Client stuff. */
+       gnutls_certificate_credentials_t ccred;
+       gnutls_session_t client;
+       int cret;
+
+       /* General init. */
+       global_init();
+       gnutls_global_set_log_function(tls_log_func);
+       if (debug)
+               gnutls_global_set_log_level(9);
+
+       /* Init server */
+       assert(gnutls_certificate_allocate_credentials(&scred) >= 0);
+       assert(gnutls_certificate_set_x509_key_mem(scred,
+                                                  &server_ca3_localhost_cert,
+                                                  &server_ca3_key,
+                                                  GNUTLS_X509_FMT_PEM) >= 0);
+       assert(gnutls_certificate_set_x509_trust_mem(scred,
+                                                    &ca3_cert,
+                                                    GNUTLS_X509_FMT_PEM) >= 0);
+
+       assert(gnutls_init(&server, GNUTLS_SERVER) >= 0);
+       gnutls_certificate_server_set_request(server, GNUTLS_CERT_REQUEST);
+       assert(gnutls_priority_set_direct(server,
+                                         "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.1:+VERS-TLS1.2",
+                                         NULL) >= 0);
+
+       gnutls_credentials_set(server, GNUTLS_CRD_CERTIFICATE, scred);
+       gnutls_transport_set_push_function(server, server_push);
+       gnutls_transport_set_pull_function(server, server_pull);
+       gnutls_transport_set_ptr(server, server);
+
+       gnutls_session_ticket_key_generate(&session_ticket_key);
+       gnutls_session_ticket_enable_server(server, &session_ticket_key);
+
+       /* Init client */
+       assert(gnutls_certificate_allocate_credentials(&ccred) >= 0);
+       assert(gnutls_certificate_set_x509_key_mem
+              (ccred, &cli_ca3_cert_chain, &cli_ca3_key, GNUTLS_X509_FMT_PEM) >= 0);
+       assert(gnutls_certificate_set_x509_trust_mem
+              (ccred, &ca3_cert, GNUTLS_X509_FMT_PEM) >= 0);
+
+       gnutls_init(&client, GNUTLS_CLIENT);
+       assert(gnutls_priority_set_direct(client,
+                                         "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.1:+VERS-TLS1.2",
+                                         NULL) >= 0);
+
+       assert(gnutls_credentials_set(client, GNUTLS_CRD_CERTIFICATE, ccred) >= 0);
+
+       gnutls_transport_set_push_function(client, client_push);
+       gnutls_transport_set_pull_function(client, client_pull);
+       gnutls_transport_set_ptr(client, client);
+
+       HANDSHAKE(client, server);
+
+       /* Server initiates rehandshake */
+       switch_side("server");
+       sret = gnutls_rehandshake(server);
+       if (sret < 0) {
+               fail("Error sending %d byte packet: %s\n",
+                    (int)sizeof(buffer), gnutls_strerror(sret));
+       } else if (debug)
+               success("server: starting rehandshake\n");
+
+       /* Stop sending session ticket */
+       _gnutls_session_ticket_disable_server(server);
+
+       /* Client gets notified with rehandshake */
+       switch_side("client");
+       do {
+               do {
+                       cret = gnutls_record_recv(client, buffer, MAX_BUF);
+               } while (cret == GNUTLS_E_AGAIN || cret == GNUTLS_E_INTERRUPTED);
+       } while (cret > 0);
+
+       if (cret != GNUTLS_E_REHANDSHAKE) {
+               fail("client: Error receiving rehandshake: %s\n",
+                    gnutls_strerror(cret));
+       }
+
+       HANDSHAKE(client, server);
+
+       gnutls_bye(client, GNUTLS_SHUT_WR);
+       gnutls_bye(server, GNUTLS_SHUT_WR);
+
+       gnutls_deinit(client);
+       gnutls_deinit(server);
+
+       gnutls_certificate_free_credentials(scred);
+       gnutls_certificate_free_credentials(ccred);
+
+       gnutls_free(session_ticket_key.data);
+
+       gnutls_global_deinit();
+       reset_buffers();
+}
+
+void doit(void)
+{
+       run();
+}