Fix some SSL_export_keying_material() issues

[openssl.git] / test / ssl_test_ctx.h

diff --git a/test/ssl_test_ctx.h b/test/ssl_test_ctx.h
index 54cefb6368dc1689c39e2113e8c365d2797f6e57..86d227d86550cf0764838b9899d655147c8706af 100644 (file)
--- a/test/ssl_test_ctx.h
+++ b/test/ssl_test_ctx.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.

  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy


@@ -39,9 +39,9 @@ typedef enum {
     SSL_TEST_SERVERNAME_CB_NONE = 0,  /* Default */
     SSL_TEST_SERVERNAME_IGNORE_MISMATCH,
     SSL_TEST_SERVERNAME_REJECT_MISMATCH,
     SSL_TEST_SERVERNAME_CB_NONE = 0,  /* Default */
     SSL_TEST_SERVERNAME_IGNORE_MISMATCH,
     SSL_TEST_SERVERNAME_REJECT_MISMATCH,

-    SSL_TEST_SERVERNAME_EARLY_IGNORE_MISMATCH,
-    SSL_TEST_SERVERNAME_EARLY_REJECT_MISMATCH,
-    SSL_TEST_SERVERNAME_EARLY_NO_V12
+    SSL_TEST_SERVERNAME_CLIENT_HELLO_IGNORE_MISMATCH,
+    SSL_TEST_SERVERNAME_CLIENT_HELLO_REJECT_MISMATCH,
+    SSL_TEST_SERVERNAME_CLIENT_HELLO_NO_V12

 } ssl_servername_callback_t;
 
 typedef enum {
 } ssl_servername_callback_t;
 
 typedef enum {


@@ -56,6 +56,12 @@ typedef enum {
     SSL_TEST_COMPRESSION_YES
 } ssl_compression_t;
 
     SSL_TEST_COMPRESSION_YES
 } ssl_compression_t;
 

+typedef enum {
+    SSL_TEST_SESSION_ID_IGNORE = 0, /* Default */
+    SSL_TEST_SESSION_ID_YES,
+    SSL_TEST_SESSION_ID_NO
+} ssl_session_id_t;
+

 typedef enum {
     SSL_TEST_METHOD_TLS = 0, /* Default */
     SSL_TEST_METHOD_DTLS
 typedef enum {
     SSL_TEST_METHOD_TLS = 0, /* Default */
     SSL_TEST_METHOD_DTLS


@@ -67,7 +73,8 @@ typedef enum {
     SSL_TEST_HANDSHAKE_RENEG_SERVER,
     SSL_TEST_HANDSHAKE_RENEG_CLIENT,
     SSL_TEST_HANDSHAKE_KEY_UPDATE_SERVER,
     SSL_TEST_HANDSHAKE_RENEG_SERVER,
     SSL_TEST_HANDSHAKE_RENEG_CLIENT,
     SSL_TEST_HANDSHAKE_KEY_UPDATE_SERVER,

-    SSL_TEST_HANDSHAKE_KEY_UPDATE_CLIENT
+    SSL_TEST_HANDSHAKE_KEY_UPDATE_CLIENT,
+    SSL_TEST_HANDSHAKE_POST_HANDSHAKE_AUTH

 } ssl_handshake_mode_t;
 
 typedef enum {
 } ssl_handshake_mode_t;
 
 typedef enum {


@@ -91,6 +98,8 @@ typedef struct {
     ssl_verify_callback_t verify_callback;
     /* One of a number of predefined server names use by the client */
     ssl_servername_t servername;
     ssl_verify_callback_t verify_callback;
     /* One of a number of predefined server names use by the client */
     ssl_servername_t servername;

+    /* Maximum Fragment Length extension mode */
+    int max_fragment_len_mode;

     /* Supported NPN and ALPN protocols. A comma-separated list. */
     char *npn_protocols;
     char *alpn_protocols;
     /* Supported NPN and ALPN protocols. A comma-separated list. */
     char *npn_protocols;
     char *alpn_protocols;


@@ -99,6 +108,8 @@ typedef struct {
     char *reneg_ciphers;
     char *srp_user;
     char *srp_password;
     char *reneg_ciphers;
     char *srp_user;
     char *srp_password;

+    /* PHA enabled */
+    int enable_pha;

 } SSL_TEST_CLIENT_CONF;
 
 typedef struct {
 } SSL_TEST_CLIENT_CONF;
 
 typedef struct {


@@ -114,6 +125,9 @@ typedef struct {
     /* An SRP user known to the server. */
     char *srp_user;
     char *srp_password;
     /* An SRP user known to the server. */
     char *srp_user;
     char *srp_password;

+    /* Forced PHA */
+    int force_pha;
+    char *session_ticket_app_data;

 } SSL_TEST_SERVER_CONF;
 
 typedef struct {
 } SSL_TEST_SERVER_CONF;
 
 typedef struct {


@@ -198,6 +212,13 @@ typedef struct {
     int expected_client_sign_type;
     /* Expected CA names for client auth */
     STACK_OF(X509_NAME) *expected_client_ca_names;
     int expected_client_sign_type;
     /* Expected CA names for client auth */
     STACK_OF(X509_NAME) *expected_client_ca_names;

+    /* Whether to use SCTP for the transport */
+    int use_sctp;
+    /* Whether to expect a session id from the server */
+    ssl_session_id_t session_id_expected;
+    char *expected_cipher;
+    /* Expected Session Ticket Application Data */
+    char *expected_session_ticket_app_data;

 } SSL_TEST_CTX;
 
 const char *ssl_test_result_name(ssl_test_result_t result);
 } SSL_TEST_CTX;
 
 const char *ssl_test_result_name(ssl_test_result_t result);


@@ -208,10 +229,12 @@ const char *ssl_servername_name(ssl_servername_t server);
 const char *ssl_servername_callback_name(ssl_servername_callback_t
                                          servername_callback);
 const char *ssl_session_ticket_name(ssl_session_ticket_t server);
 const char *ssl_servername_callback_name(ssl_servername_callback_t
                                          servername_callback);
 const char *ssl_session_ticket_name(ssl_session_ticket_t server);

+const char *ssl_session_id_name(ssl_session_id_t server);

 const char *ssl_test_method_name(ssl_test_method_t method);
 const char *ssl_handshake_mode_name(ssl_handshake_mode_t mode);
 const char *ssl_ct_validation_name(ssl_ct_validation_t mode);
 const char *ssl_certstatus_name(ssl_cert_status_t cert_status);
 const char *ssl_test_method_name(ssl_test_method_t method);
 const char *ssl_handshake_mode_name(ssl_handshake_mode_t mode);
 const char *ssl_ct_validation_name(ssl_ct_validation_t mode);
 const char *ssl_certstatus_name(ssl_cert_status_t cert_status);

+const char *ssl_max_fragment_len_name(int MFL_mode);

 
 /*
  * Load the test case context from |conf|.
 
 /*
  * Load the test case context from |conf|.