2016-03-17 14:14:30 +00:00
|
|
|
/*
|
2018-03-20 13:00:17 +00:00
|
|
|
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
|
2016-03-17 14:14:30 +00:00
|
|
|
*
|
2018-12-06 12:05:25 +00:00
|
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
2016-05-17 18:20:24 +00:00
|
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
|
|
|
* in the file LICENSE in the source distribution or at
|
2016-03-17 14:14:30 +00:00
|
|
|
* https://www.openssl.org/source/license.html
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifndef HEADER_HANDSHAKE_HELPER_H
|
|
|
|
|
#define HEADER_HANDSHAKE_HELPER_H
|
|
|
|
|
|
|
|
|
|
#include "ssl_test_ctx.h"
|
|
|
|
|
|
|
|
|
|
typedef struct handshake_result {
|
|
|
|
|
ssl_test_result_t result;
|
|
|
|
|
/* These alerts are in the 2-byte format returned by the info_callback. */
|
2016-08-12 12:29:24 +00:00
|
|
|
/* (Latest) alert sent by the client; 0 if no alert. */
|
2016-03-17 14:14:30 +00:00
|
|
|
int client_alert_sent;
|
2016-08-12 12:29:24 +00:00
|
|
|
/* Number of fatal or close_notify alerts sent. */
|
|
|
|
|
int client_num_fatal_alerts_sent;
|
|
|
|
|
/* (Latest) alert received by the server; 0 if no alert. */
|
2016-03-17 14:14:30 +00:00
|
|
|
int client_alert_received;
|
2016-08-12 12:29:24 +00:00
|
|
|
/* (Latest) alert sent by the server; 0 if no alert. */
|
2016-03-17 14:14:30 +00:00
|
|
|
int server_alert_sent;
|
2016-08-12 12:29:24 +00:00
|
|
|
/* Number of fatal or close_notify alerts sent. */
|
|
|
|
|
int server_num_fatal_alerts_sent;
|
|
|
|
|
/* (Latest) alert received by the client; 0 if no alert. */
|
2016-03-17 14:14:30 +00:00
|
|
|
int server_alert_received;
|
|
|
|
|
/* Negotiated protocol. On success, these should always match. */
|
|
|
|
|
int server_protocol;
|
|
|
|
|
int client_protocol;
|
Fix session ticket and SNI
When session tickets are used, it's possible that SNI might swtich the
SSL_CTX on an SSL. Normally, this is not a problem, because the
initial_ctx/session_ctx are used for all session ticket/id processes.
However, when the SNI callback occurs, it's possible that the callback
may update the options in the SSL from the SSL_CTX, and this could
cause SSL_OP_NO_TICKET to be set. If this occurs, then two bad things
can happen:
1. The session ticket TLSEXT may not be written when the ticket expected
flag is set. The state machine transistions to writing the ticket, and
the client responds with an error as its not expecting a ticket.
2. When creating the session ticket, if the ticket key cb returns 0
the crypto/hmac contexts are not initialized, and the code crashes when
trying to encrypt the session ticket.
To fix 1, if the ticket TLSEXT is not written out, clear the expected
ticket flag.
To fix 2, consider a return of 0 from the ticket key cb a recoverable
error, and write a 0 length ticket and continue. The client-side code
can explicitly handle this case.
Fix these two cases, and add unit test code to validate ticket behavior.
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1098)
2016-05-12 22:16:52 +00:00
|
|
|
/* Server connection */
|
2016-06-09 22:39:22 +00:00
|
|
|
ssl_servername_t servername;
|
Fix session ticket and SNI
When session tickets are used, it's possible that SNI might swtich the
SSL_CTX on an SSL. Normally, this is not a problem, because the
initial_ctx/session_ctx are used for all session ticket/id processes.
However, when the SNI callback occurs, it's possible that the callback
may update the options in the SSL from the SSL_CTX, and this could
cause SSL_OP_NO_TICKET to be set. If this occurs, then two bad things
can happen:
1. The session ticket TLSEXT may not be written when the ticket expected
flag is set. The state machine transistions to writing the ticket, and
the client responds with an error as its not expecting a ticket.
2. When creating the session ticket, if the ticket key cb returns 0
the crypto/hmac contexts are not initialized, and the code crashes when
trying to encrypt the session ticket.
To fix 1, if the ticket TLSEXT is not written out, clear the expected
ticket flag.
To fix 2, consider a return of 0 from the ticket key cb a recoverable
error, and write a 0 length ticket and continue. The client-side code
can explicitly handle this case.
Fix these two cases, and add unit test code to validate ticket behavior.
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1098)
2016-05-12 22:16:52 +00:00
|
|
|
/* Session ticket status */
|
2016-06-09 22:39:22 +00:00
|
|
|
ssl_session_ticket_t session_ticket;
|
2017-03-02 13:41:10 +00:00
|
|
|
int compression;
|
Fix session ticket and SNI
When session tickets are used, it's possible that SNI might swtich the
SSL_CTX on an SSL. Normally, this is not a problem, because the
initial_ctx/session_ctx are used for all session ticket/id processes.
However, when the SNI callback occurs, it's possible that the callback
may update the options in the SSL from the SSL_CTX, and this could
cause SSL_OP_NO_TICKET to be set. If this occurs, then two bad things
can happen:
1. The session ticket TLSEXT may not be written when the ticket expected
flag is set. The state machine transistions to writing the ticket, and
the client responds with an error as its not expecting a ticket.
2. When creating the session ticket, if the ticket key cb returns 0
the crypto/hmac contexts are not initialized, and the code crashes when
trying to encrypt the session ticket.
To fix 1, if the ticket TLSEXT is not written out, clear the expected
ticket flag.
To fix 2, consider a return of 0 from the ticket key cb a recoverable
error, and write a 0 length ticket and continue. The client-side code
can explicitly handle this case.
Fix these two cases, and add unit test code to validate ticket behavior.
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1098)
2016-05-12 22:16:52 +00:00
|
|
|
/* Was this called on the second context? */
|
|
|
|
|
int session_ticket_do_not_call;
|
2016-07-04 18:16:14 +00:00
|
|
|
char *client_npn_negotiated;
|
|
|
|
|
char *server_npn_negotiated;
|
|
|
|
|
char *client_alpn_negotiated;
|
|
|
|
|
char *server_alpn_negotiated;
|
2016-07-05 17:06:23 +00:00
|
|
|
/* Was the handshake resumed? */
|
|
|
|
|
int client_resumed;
|
|
|
|
|
int server_resumed;
|
2017-01-08 00:09:08 +00:00
|
|
|
/* Temporary key type */
|
|
|
|
|
int tmp_key_type;
|
2017-01-08 19:30:41 +00:00
|
|
|
/* server certificate key type */
|
|
|
|
|
int server_cert_type;
|
2017-01-13 15:20:42 +00:00
|
|
|
/* server signing hash */
|
|
|
|
|
int server_sign_hash;
|
2017-01-27 15:06:16 +00:00
|
|
|
/* server signature type */
|
|
|
|
|
int server_sign_type;
|
2017-03-31 21:35:28 +00:00
|
|
|
/* server CA names */
|
|
|
|
|
STACK_OF(X509_NAME) *server_ca_names;
|
2017-01-08 19:30:41 +00:00
|
|
|
/* client certificate key type */
|
|
|
|
|
int client_cert_type;
|
2017-01-13 15:20:42 +00:00
|
|
|
/* client signing hash */
|
|
|
|
|
int client_sign_hash;
|
2017-01-27 15:06:16 +00:00
|
|
|
/* client signature type */
|
|
|
|
|
int client_sign_type;
|
2017-03-15 16:07:07 +00:00
|
|
|
/* Client CA names */
|
|
|
|
|
STACK_OF(X509_NAME) *client_ca_names;
|
Session resume broken switching contexts
When an SSL's context is swtiched from a ticket-enabled context to
a ticket-disabled context in the servername callback, no session-id
is generated, so the session can't be resumed.
If a servername callback changes the SSL_OP_NO_TICKET option, check
to see if it's changed to disable, and whether a session ticket is
expected (i.e. the client indicated ticket support and the SSL had
tickets enabled at the time), and whether we already have a previous
session (i.e. s->hit is set).
In this case, clear the ticket-expected flag, remove any ticket data
and generate a session-id in the session.
If the SSL hit (resumed) and switched to a ticket-disabled context,
assume that the resumption was via session-id, and don't bother to
update the session.
Before this fix, the updated unit-tests in 06-sni-ticket.conf would
fail test #4 (server1 = SNI, server2 = no SNI).
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/1529)
2016-09-01 12:40:54 +00:00
|
|
|
/* Session id status */
|
|
|
|
|
ssl_session_id_t session_id;
|
2015-12-21 20:19:29 +00:00
|
|
|
char *cipher;
|
2017-03-15 17:25:55 +00:00
|
|
|
/* session ticket application data */
|
|
|
|
|
char *result_session_ticket_app_data;
|
2016-03-17 14:14:30 +00:00
|
|
|
} HANDSHAKE_RESULT;
|
|
|
|
|
|
2016-07-04 18:16:14 +00:00
|
|
|
HANDSHAKE_RESULT *HANDSHAKE_RESULT_new(void);
|
|
|
|
|
void HANDSHAKE_RESULT_free(HANDSHAKE_RESULT *result);
|
|
|
|
|
|
2016-03-17 14:14:30 +00:00
|
|
|
/* Do a handshake and report some information about the result. */
|
2016-07-04 18:16:14 +00:00
|
|
|
HANDSHAKE_RESULT *do_handshake(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
|
2016-07-05 17:06:23 +00:00
|
|
|
SSL_CTX *client_ctx, SSL_CTX *resume_server_ctx,
|
2016-07-21 12:04:00 +00:00
|
|
|
SSL_CTX *resume_client_ctx,
|
2016-07-05 17:06:23 +00:00
|
|
|
const SSL_TEST_CTX *test_ctx);
|
Fix session ticket and SNI
When session tickets are used, it's possible that SNI might swtich the
SSL_CTX on an SSL. Normally, this is not a problem, because the
initial_ctx/session_ctx are used for all session ticket/id processes.
However, when the SNI callback occurs, it's possible that the callback
may update the options in the SSL from the SSL_CTX, and this could
cause SSL_OP_NO_TICKET to be set. If this occurs, then two bad things
can happen:
1. The session ticket TLSEXT may not be written when the ticket expected
flag is set. The state machine transistions to writing the ticket, and
the client responds with an error as its not expecting a ticket.
2. When creating the session ticket, if the ticket key cb returns 0
the crypto/hmac contexts are not initialized, and the code crashes when
trying to encrypt the session ticket.
To fix 1, if the ticket TLSEXT is not written out, clear the expected
ticket flag.
To fix 2, consider a return of 0 from the ticket key cb a recoverable
error, and write a 0 length ticket and continue. The client-side code
can explicitly handle this case.
Fix these two cases, and add unit test code to validate ticket behavior.
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1098)
2016-05-12 22:16:52 +00:00
|
|
|
|
2016-03-17 14:14:30 +00:00
|
|
|
#endif /* HEADER_HANDSHAKE_HELPER_H */
|