#define NUM_EXTRA_CERTS 40
+/*
+ * This structure is used to validate that the correct number of log messages
+ * of various types are emitted when emitting secret logs.
+ */
+struct sslapitest_log_counts {
+ unsigned int rsa_key_exchange_count;
+ unsigned int master_secret_count;
+ unsigned int client_handshake_secret_count;
+ unsigned int server_handshake_secret_count;
+ unsigned int client_application_secret_count;
+ unsigned int server_application_secret_count;
+};
+
static void client_keylog_callback(const SSL *ssl, const char *line) {
int line_length = strlen(line);
}
static int test_keylog_output(char *buffer, const SSL *ssl,
- const SSL_SESSION *session) {
- int saw_client_random = 0;
+ const SSL_SESSION *session,
+ struct sslapitest_log_counts *expected) {
char *token = NULL;
unsigned char actual_client_random[SSL3_RANDOM_SIZE] = {0};
size_t client_random_size = SSL3_RANDOM_SIZE;
unsigned char actual_master_key[SSL_MAX_MASTER_KEY_LENGTH] = {0};
size_t master_key_size = SSL_MAX_MASTER_KEY_LENGTH;
+ unsigned int rsa_key_exchange_count = 0;
+ unsigned int master_secret_count = 0;
+ unsigned int client_handshake_secret_count = 0;
+ unsigned int server_handshake_secret_count = 0;
+ unsigned int client_application_secret_count = 0;
+ unsigned int server_application_secret_count = 0;
token = strtok(buffer, " \n");
while (token) {
if (strcmp(token, "RSA") == 0) {
- /* Premaster secret. Tokens should be: 16 ASCII bytes of
+ /*
+ * Premaster secret. Tokens should be: 16 ASCII bytes of
* hex-encoded encrypted secret, then the hex-encoded pre-master
* secret.
*/
token = strtok(NULL, " \n");
if (!token) {
printf("Unexpectedly short premaster secret log.\n");
- return -1;
+ return 0;
}
if (strlen(token) != 16) {
printf("Bad value for encrypted secret: %s\n", token);
- return -1;
+ return 0;
}
token = strtok(NULL, " \n");
if (!token) {
printf("Unexpectedly short premaster secret log.\n");
- return -1;
+ return 0;
}
- /* TODO: Can I check this sensibly? */
+ /*
+ * We can't sensibly check the log because the premaster secret is
+ * transient, and OpenSSL doesn't keep hold of it once the master
+ * secret is generated.
+ */
+ rsa_key_exchange_count++;
} else if (strcmp(token, "CLIENT_RANDOM") == 0) {
- /* Master secret. Tokens should be: 64 ASCII bytes of hex-encoded
+ /*
+ * Master secret. Tokens should be: 64 ASCII bytes of hex-encoded
* client random, then the hex-encoded master secret.
*/
client_random_size = SSL_get_client_random(ssl,
SSL3_RANDOM_SIZE);
if (client_random_size != SSL3_RANDOM_SIZE) {
printf("Unexpected short client random.\n");
- return -1;
+ return 0;
}
token = strtok(NULL, " \n");
if (!token) {
printf("Unexpected short master secret log.\n");
- return -1;
+ return 0;
}
if (strlen(token) != 64) {
printf("Bad value for client random: %s\n", token);
- return -1;
+ return 0;
}
if (compare_hex_encoded_buffer(token, 64, actual_client_random,
client_random_size)) {
printf("Bad value for client random: %s\n", token);
- return -1;
+ return 0;
}
token = strtok(NULL, " \n");
if (!token) {
printf("Unexpectedly short master secret log.\n");
- return -1;
+ return 0;
}
master_key_size = SSL_SESSION_get_master_key(session,
master_key_size);
if (!master_key_size) {
printf("Error getting master key to compare.\n");
- return -1;
+ return 0;
}
if (compare_hex_encoded_buffer(token, strlen(token),
actual_master_key,
master_key_size)) {
printf("Bad value for master key: %s\n", token);
- return -1;
+ return 0;
+ }
+
+ master_secret_count++;
+ } else if ((strcmp(token, "CLIENT_HANDSHAKE_TRAFFIC_SECRET") == 0) ||
+ (strcmp(token, "SERVER_HANDSHAKE_TRAFFIC_SECRET") == 0) ||
+ (strcmp(token, "CLIENT_TRAFFIC_SECRET_0") == 0) ||
+ (strcmp(token, "SERVER_TRAFFIC_SECRET_0") == 0)) {
+ /*
+ * TLSv1.3 secret. Tokens should be: 64 ASCII bytes of hex-encoded
+ * client random, and then the hex-encoded secret. In this case,
+ * we treat all of these secrets identically and then just
+ * distinguish between them when counting what we saw.
+ */
+ if (strcmp(token, "CLIENT_HANDSHAKE_TRAFFIC_SECRET") == 0)
+ client_handshake_secret_count++;
+ else if (strcmp(token, "SERVER_HANDSHAKE_TRAFFIC_SECRET") == 0)
+ server_handshake_secret_count++;
+ else if (strcmp(token, "CLIENT_TRAFFIC_SECRET_0") == 0)
+ client_application_secret_count++;
+ else if (strcmp(token, "SERVER_TRAFFIC_SECRET_0") == 0)
+ server_application_secret_count++;
+
+ client_random_size = SSL_get_client_random(ssl,
+ actual_client_random,
+ SSL3_RANDOM_SIZE);
+ if (client_random_size != SSL3_RANDOM_SIZE) {
+ printf("Unexpected short client random.\n");
+ return 0;
+ }
+
+ token = strtok(NULL, " \n");
+ if (!token) {
+ printf("Unexpected short client handshake secret log.\n");
+ return 0;
+ }
+ if (strlen(token) != 64) {
+ printf("Bad value for client random: %s\n", token);
+ return 0;
+ }
+ if (compare_hex_encoded_buffer(token, 64, actual_client_random,
+ client_random_size)) {
+ printf("Bad value for client random: %s\n", token);
+ return 0;
}
- saw_client_random = 1;
+ token = strtok(NULL, " \n");
+ if (!token) {
+ printf("Unexpectedly short master secret log.\n");
+ return 0;
+ }
+
+ /*
+ * TODO(TLS1.3): test that application traffic secrets are what
+ * we expect */
} else {
printf("Unexpected token in buffer: %s\n", token);
- return -1;
+ return 0;
}
token = strtok(NULL, " \n");
}
- return saw_client_random;
+ /* Return whether we got what we expected. */
+ return ((rsa_key_exchange_count == expected->rsa_key_exchange_count) &&
+ (master_secret_count == expected->master_secret_count) &&
+ (client_handshake_secret_count == expected->client_handshake_secret_count) &&
+ (server_handshake_secret_count == expected->server_handshake_secret_count) &&
+ (client_application_secret_count == expected->client_application_secret_count) &&
+ (server_application_secret_count == expected->server_application_secret_count));
}
static int test_keylog(void) {
SSL *clientssl = NULL, *serverssl = NULL;
int testresult = 0;
int rc;
+ struct sslapitest_log_counts expected = {0};
/* Clean up logging space */
memset(client_log_buffer, 0, LOG_BUFFER_SIZE + 1);
goto end;
}
- if (!create_ssl_connection(serverssl, clientssl)) {
+ if (!create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)) {
printf("Unable to create SSL connection\n");
goto end;
}
goto end;
}
- /* Now we want to test that our output data was vaguely sensible. We
+ /*
+ * Now we want to test that our output data was vaguely sensible. We
* do that by using strtok and confirming that we have more or less the
- * data we expect.
+ * data we expect. For both client and server, we expect to see one master
+ * secret. The client should also see a RSA key exchange.
*/
- if (test_keylog_output(client_log_buffer, clientssl,
- SSL_get_session(clientssl)) != 1) {
+ expected.rsa_key_exchange_count = 1;
+ expected.master_secret_count = 1;
+ if (!test_keylog_output(client_log_buffer, clientssl,
+ SSL_get_session(clientssl), &expected)) {
printf("Error encountered in client log buffer\n");
goto end;
}
- if (test_keylog_output(server_log_buffer, serverssl,
- SSL_get_session(serverssl)) != 1) {
+
+ expected.rsa_key_exchange_count = 0;
+ if (!test_keylog_output(server_log_buffer, serverssl,
+ SSL_get_session(serverssl), &expected)) {
printf("Error encountered in server log buffer\n");
goto end;
}
SSL_CTX *cctx = NULL, *sctx = NULL;
SSL *clientssl = NULL, *serverssl = NULL;
int testresult = 0;
+ struct sslapitest_log_counts expected = {0};
/* Clean up logging space */
memset(client_log_buffer, 0, LOG_BUFFER_SIZE + 1);
goto end;
}
- if (!create_ssl_connection(serverssl, clientssl)) {
+ if (!create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)) {
printf("Unable to create SSL connection\n");
goto end;
}
goto end;
}
- /* Now we want to test that our output data was vaguely sensible. For this
- * test, we expect no CLIENT_RANDOM entry.
+ /*
+ * Now we want to test that our output data was vaguely sensible. For this
+ * test, we expect no CLIENT_RANDOM entry becuase it doesn't make sense for
+ * TLSv1.3, but we do expect both client and server to emit keys.
*/
- if (test_keylog_output(client_log_buffer, clientssl,
- SSL_get_session(clientssl)) != 0) {
+ expected.client_handshake_secret_count = 1;
+ expected.server_handshake_secret_count = 1;
+ expected.client_application_secret_count = 1;
+ expected.server_application_secret_count = 1;
+ if (!test_keylog_output(client_log_buffer, clientssl,
+ SSL_get_session(clientssl), &expected)) {
printf("Error encountered in client log buffer\n");
goto end;
}
- if (test_keylog_output(server_log_buffer, serverssl,
- SSL_get_session(serverssl)) != 0) {
+ if (!test_keylog_output(server_log_buffer, serverssl,
+ SSL_get_session(serverssl), &expected)) {
printf("Error encountered in server log buffer\n");
goto end;
}
}
#endif
+#ifndef OPENSSL_NO_TLS1_2
+static int full_early_callback(SSL *s, int *al, void *arg)
+{
+ int *ctr = arg;
+ const unsigned char *p;
+ /* We only configure two ciphers, but the SCSV is added automatically. */
+#ifdef OPENSSL_NO_EC
+ const unsigned char expected_ciphers[] = {0x00, 0x9d, 0x00, 0xff};
+#else
+ const unsigned char expected_ciphers[] = {0x00, 0x9d, 0xc0,
+ 0x2c, 0x00, 0xff};
+#endif
+ size_t len;
+
+ /* Make sure we can defer processing and get called back. */
+ if ((*ctr)++ == 0)
+ return -1;
+
+ len = SSL_early_get0_ciphers(s, &p);
+ if (len != sizeof(expected_ciphers) ||
+ memcmp(p, expected_ciphers, len) != 0) {
+ printf("Early callback expected ciphers mismatch\n");
+ return 0;
+ }
+ len = SSL_early_get0_compression_methods(s, &p);
+ if (len != 1 || *p != 0) {
+ printf("Early callback expected comperssion methods mismatch\n");
+ return 0;
+ }
+ return 1;
+}
+
+static int test_early_cb(void) {
+ SSL_CTX *cctx = NULL, *sctx = NULL;
+ SSL *clientssl = NULL, *serverssl = NULL;
+ int testctr = 0, testresult = 0;
+
+ if (!create_ssl_ctx_pair(TLS_server_method(), TLS_client_method(), &sctx,
+ &cctx, cert, privkey)) {
+ printf("Unable to create SSL_CTX pair\n");
+ goto end;
+ }
+
+ SSL_CTX_set_early_cb(sctx, full_early_callback, &testctr);
+ /* The gimpy cipher list we configure can't do TLS 1.3. */
+ SSL_CTX_set_max_proto_version(cctx, TLS1_2_VERSION);
+ if (!SSL_CTX_set_cipher_list(cctx,
+ "AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384")) {
+ printf("Failed to set cipher list\n");
+ goto end;
+ }
+
+ if (!create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL, NULL)) {
+ printf("Unable to create SSL objects\n");
+ goto end;
+ }
+
+ if (create_ssl_connection(serverssl, clientssl, SSL_ERROR_WANT_EARLY)) {
+ printf("Creating SSL connection succeeded with async early return\n");
+ goto end;
+ }
+
+ /* Passing a -1 literal is a hack since the real value was lost. */
+ if (SSL_get_error(serverssl, -1) != SSL_ERROR_WANT_EARLY) {
+ printf("Early callback failed to make state SSL_ERROR_WANT_EARLY\n");
+ goto end;
+ }
+
+ if (!create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)) {
+ printf("Restarting SSL connection failed\n");
+ goto end;
+ }
+
+ testresult = 1;
+
+end:
+ SSL_free(serverssl);
+ SSL_free(clientssl);
+ SSL_CTX_free(sctx);
+ SSL_CTX_free(cctx);
+
+ return testresult;
+}
+#endif
+
static int execute_test_large_message(const SSL_METHOD *smeth,
const SSL_METHOD *cmeth, int read_ahead)
{
goto end;
}
- if (!create_ssl_connection(serverssl, clientssl)) {
+ if (!create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)) {
printf("Unable to create SSL connection\n");
goto end;
}
goto end;
}
- if (!create_ssl_connection(serverssl, clientssl)) {
+ if (!create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)) {
printf("Unable to create SSL connection\n");
goto end;
}
}
/* This should fail because the callback will fail */
- if (create_ssl_connection(serverssl, clientssl)) {
+ if (create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)) {
printf("Unexpected success creating the connection\n");
goto end;
}
BIO_free(certbio);
certbio = NULL;
- if (!create_ssl_connection(serverssl, clientssl)) {
+ if (!create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)) {
printf("Unable to create SSL connection\n");
goto end;
}
SSL_CTX_set_min_proto_version(cctx, TLS1_2_VERSION);
#endif
- /*
- * TODO(TLS1.3): Test temporarily disabled for TLS1.3 until we've
- * implemented session resumption.
- */
- SSL_CTX_set_max_proto_version(cctx, TLS1_2_VERSION);
-
/* Set up session cache */
if (fix.use_ext_cache) {
SSL_CTX_sess_set_new_cb(cctx, new_session_cb);
goto end;
}
- if (!create_ssl_connection(serverssl1, clientssl1)) {
+ if (!create_ssl_connection(serverssl1, clientssl1, SSL_ERROR_NONE)) {
printf("Unable to create SSL connection\n");
goto end;
}
goto end;
}
- if (!create_ssl_connection(serverssl2, clientssl2)) {
+ if (!create_ssl_connection(serverssl2, clientssl2, SSL_ERROR_NONE)) {
printf("Unable to create second SSL connection\n");
goto end;
}
}
/* This should fail because of the mismatched protocol versions */
- if (create_ssl_connection(serverssl3, clientssl3)) {
+ if (create_ssl_connection(serverssl3, clientssl3, SSL_ERROR_NONE)) {
printf("Unable to create third SSL connection\n");
goto end;
}
}
}
- if (curr->connsuccess != create_ssl_connection(serverssl, clientssl)) {
+ if (curr->connsuccess != create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)) {
printf("Unexpected return value creating SSL connection (%d)\n", idx);
goto end;
}
return testresult;
}
+#ifndef OPENSSL_NO_TLS1_3
+
+#define MSG1 "Hello"
+#define MSG2 "World."
+#define MSG3 "This"
+#define MSG4 "is"
+#define MSG5 "a"
+#define MSG6 "test."
+
+/*
+ * Helper method to setup objects for early data test. Caller frees objects on
+ * error.
+ */
+static int setupearly_data_test(SSL_CTX **cctx, SSL_CTX **sctx, SSL **clientssl,
+ SSL **serverssl, SSL_SESSION **sess)
+{
+ if (!create_ssl_ctx_pair(TLS_server_method(), TLS_client_method(), sctx,
+ cctx, cert, privkey)) {
+ printf("Unable to create SSL_CTX pair\n");
+ return 0;
+ }
+
+ if (!create_ssl_objects(*sctx, *cctx, serverssl, clientssl, NULL, NULL)) {
+ printf("Unable to create SSL objects\n");
+ return 0;
+ }
+
+ if (!create_ssl_connection(*serverssl, *clientssl, SSL_ERROR_NONE)) {
+ printf("Unable to create SSL connection\n");
+ return 0;
+ }
+
+ *sess = SSL_get1_session(*clientssl);
+
+ SSL_shutdown(*clientssl);
+ SSL_shutdown(*serverssl);
+
+ SSL_free(*serverssl);
+ SSL_free(*clientssl);
+ *serverssl = *clientssl = NULL;
+
+ if (!create_ssl_objects(*sctx, *cctx, serverssl, clientssl, NULL, NULL)) {
+ printf("Unable to create SSL objects (2)\n");
+ return 0;
+ }
+
+ if (!SSL_set_session(*clientssl, *sess)) {
+ printf("Failed setting session\n");
+ return 0;
+ }
+
+ return 1;
+}
+
+static int test_early_data_read_write(void)
+{
+ SSL_CTX *cctx = NULL, *sctx = NULL;
+ SSL *clientssl = NULL, *serverssl = NULL;
+ int testresult = 0;
+ SSL_SESSION *sess = NULL;
+ unsigned char buf[20];
+ size_t readbytes, written;
+
+ if (!setupearly_data_test(&cctx, &sctx, &clientssl, &serverssl, &sess))
+ goto end;
+
+ /* Write and read some early data */
+ if (!SSL_write_early_data(clientssl, MSG1, strlen(MSG1), &written)
+ || written != strlen(MSG1)) {
+ printf("Failed writing early data message 1\n");
+ goto end;
+ }
+
+ if (SSL_read_early_data(serverssl, buf, sizeof(buf), &readbytes)
+ != SSL_READ_EARLY_DATA_SUCCESS
+ || readbytes != strlen(MSG1)
+ || memcmp(MSG1, buf, strlen(MSG1))) {
+ printf("Failed reading early data message 1\n");
+ goto end;
+ }
+
+ if (SSL_get_early_data_status(serverssl) != SSL_EARLY_DATA_ACCEPTED) {
+ printf("Unexpected early data status\n");
+ goto end;
+ }
+
+ /*
+ * Server should be able to write data, and client should be able to
+ * read it.
+ */
+ if (!SSL_write_early_data(serverssl, MSG2, strlen(MSG2), &written)
+ || written != strlen(MSG2)) {
+ printf("Failed writing message 2\n");
+ goto end;
+ }
+
+ if (!SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes)
+ || readbytes != strlen(MSG2)
+ || memcmp(MSG2, buf, strlen(MSG2))) {
+ printf("Failed reading message 2\n");
+ goto end;
+ }
+
+ /* Even after reading normal data, client should be able write early data */
+ if (!SSL_write_early_data(clientssl, MSG3, strlen(MSG3), &written)
+ || written != strlen(MSG3)) {
+ printf("Failed writing early data message 3\n");
+ goto end;
+ }
+
+ /* Server should still be able read early data after writing data */
+ if (SSL_read_early_data(serverssl, buf, sizeof(buf), &readbytes)
+ != SSL_READ_EARLY_DATA_SUCCESS
+ || readbytes != strlen(MSG3)
+ || memcmp(MSG3, buf, strlen(MSG3))) {
+ printf("Failed reading early data message 3\n");
+ goto end;
+ }
+
+ /* Write more data from server and read it from client */
+ if (!SSL_write_early_data(serverssl, MSG4, strlen(MSG4), &written)
+ || written != strlen(MSG4)) {
+ printf("Failed writing message 4\n");
+ goto end;
+ }
+
+ if (!SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes)
+ || readbytes != strlen(MSG4)
+ || memcmp(MSG4, buf, strlen(MSG4))) {
+ printf("Failed reading message 4\n");
+ goto end;
+ }
+
+ /*
+ * If client writes normal data it should mean writing early data is no
+ * longer possible.
+ */
+ if (!SSL_write_ex(clientssl, MSG5, strlen(MSG5), &written)
+ || written != strlen(MSG5)) {
+ printf("Failed writing message 5\n");
+ goto end;
+ }
+
+ if (SSL_get_early_data_status(clientssl) != SSL_EARLY_DATA_ACCEPTED) {
+ printf("Unexpected early data status(2)\n");
+ goto end;
+ }
+
+ /* Server should be told that there is no more early data */
+ if (SSL_read_early_data(serverssl, buf, sizeof(buf), &readbytes)
+ != SSL_READ_EARLY_DATA_FINISH
+ || readbytes != 0) {
+ printf("Failed finishing read of early data\n");
+ goto end;
+ }
+
+ /* Server should be able to read normal data */
+ if (!SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes)
+ || readbytes != strlen(MSG5)) {
+ printf("Failed reading message 5\n");
+ goto end;
+ }
+
+ /* Client and server should not be able to write/read early data now */
+ if (SSL_write_early_data(clientssl, MSG6, strlen(MSG6), &written)) {
+ printf("Unexpected success writing early data\n");
+ goto end;
+ }
+ ERR_clear_error();
+
+ if (SSL_read_early_data(serverssl, buf, sizeof(buf), &readbytes)
+ != SSL_READ_EARLY_DATA_ERROR) {
+ printf("Unexpected success reading early data\n");
+ goto end;
+ }
+ ERR_clear_error();
+
+ /*
+ * Make sure we process the NewSessionTicket. This arrives post-handshake
+ * so we must make sure we attempt a read - even though we don't expect to
+ * actually get any application data.
+ */
+ if (SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes)) {
+ printf("Unexpected success doing final client read\n");
+ goto end;
+ }
+
+ SSL_SESSION_free(sess);
+ sess = SSL_get1_session(clientssl);
+
+ SSL_shutdown(clientssl);
+ SSL_shutdown(serverssl);
+
+ SSL_free(serverssl);
+ SSL_free(clientssl);
+ serverssl = clientssl = NULL;
+
+ if (!create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL, NULL)) {
+ printf("Unable to create SSL objects (3)\n");
+ goto end;
+ }
+
+ if (!SSL_set_session(clientssl, sess)) {
+ printf("Failed setting session (2)\n");
+ goto end;
+ }
+
+ /* Write and read some early data */
+ if (!SSL_write_early_data(clientssl, MSG1, strlen(MSG1), &written)
+ || written != strlen(MSG1)) {
+ printf("Failed writing early data message 1\n");
+ goto end;
+ }
+
+ if (SSL_read_early_data(serverssl, buf, sizeof(buf), &readbytes)
+ != SSL_READ_EARLY_DATA_SUCCESS
+ || readbytes != strlen(MSG1)
+ || memcmp(MSG1, buf, strlen(MSG1))) {
+ printf("Failed reading early data message 1\n");
+ goto end;
+ }
+
+ if (SSL_connect(clientssl) <= 0) {
+ printf("Unable to complete client handshake\n");
+ goto end;
+ }
+
+ if (SSL_accept(serverssl) <= 0) {
+ printf("Unable to complete server handshake\n");
+ goto end;
+ }
+
+ /* Client and server should not be able to write/read early data now */
+ if (SSL_write_early_data(clientssl, MSG6, strlen(MSG6), &written)) {
+ printf("Unexpected success writing early data (2)\n");
+ goto end;
+ }
+ ERR_clear_error();
+
+ if (SSL_read_early_data(serverssl, buf, sizeof(buf), &readbytes)
+ != SSL_READ_EARLY_DATA_ERROR) {
+ printf("Unexpected success reading early data (2)\n");
+ goto end;
+ }
+ ERR_clear_error();
+
+ /* Client and server should be able to write/read normal data */
+ if (!SSL_write_ex(clientssl, MSG5, strlen(MSG5), &written)
+ || written != strlen(MSG5)) {
+ printf("Failed writing message 5 (2)\n");
+ goto end;
+ }
+
+ if (!SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes)
+ || readbytes != strlen(MSG5)) {
+ printf("Failed reading message 5 (2)\n");
+ goto end;
+ }
+
+ testresult = 1;
+
+ end:
+ if(!testresult)
+ ERR_print_errors_fp(stdout);
+ SSL_SESSION_free(sess);
+ SSL_free(serverssl);
+ SSL_free(clientssl);
+ SSL_CTX_free(sctx);
+ SSL_CTX_free(cctx);
+
+ return testresult;
+}
+
+static int test_early_data_skip(void)
+{
+ SSL_CTX *cctx = NULL, *sctx = NULL;
+ SSL *clientssl = NULL, *serverssl = NULL;
+ int testresult = 0;
+ SSL_SESSION *sess;
+ unsigned char buf[20];
+ size_t readbytes, written;
+
+ /*
+ * Test that a server attempting to read early data can handle a connection
+ * from a client where the early data is not acceptable.
+ */
+
+ if (!setupearly_data_test(&cctx, &sctx, &clientssl, &serverssl, &sess))
+ goto end;
+
+ /*
+ * Deliberately corrupt the creation time. We take 20 seconds off the time.
+ * It could be any value as long as it is not within tolerance. This should
+ * mean the ticket is rejected.
+ */
+ if (!SSL_SESSION_set_time(sess, time(NULL) - 20)) {
+ printf("Unexpected failure setting session creation time\n");
+ goto end;
+ }
+
+ /* Write some early data */
+ if (!SSL_write_early_data(clientssl, MSG1, strlen(MSG1), &written)
+ || written != strlen(MSG1)) {
+ printf("Failed writing early data message 1\n");
+ goto end;
+ }
+
+ /* Server should reject the early data and skip over it */
+ if (SSL_read_early_data(serverssl, buf, sizeof(buf), &readbytes)
+ != SSL_READ_EARLY_DATA_FINISH
+ || readbytes != 0) {
+ printf("Failed reading early data\n");
+ goto end;
+ }
+
+ if (SSL_get_early_data_status(serverssl) != SSL_EARLY_DATA_REJECTED) {
+ printf("Unexpected early data status\n");
+ goto end;
+ }
+
+ /*
+ * We should be able to send normal data despite rejection of early data
+ */
+ if (!SSL_write_ex(clientssl, MSG2, strlen(MSG2), &written)
+ || written != strlen(MSG2)) {
+ printf("Failed writing message 2\n");
+ goto end;
+ }
+
+ if (SSL_get_early_data_status(clientssl) != SSL_EARLY_DATA_REJECTED) {
+ printf("Unexpected early data status (2)\n");
+ goto end;
+ }
+
+ if (!SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes)
+ || readbytes != strlen(MSG2)
+ || memcmp(MSG2, buf, strlen(MSG2))) {
+ printf("Failed reading message 2\n");
+ goto end;
+ }
+
+ testresult = 1;
+
+ end:
+ if(!testresult)
+ ERR_print_errors_fp(stdout);
+ SSL_SESSION_free(sess);
+ SSL_free(serverssl);
+ SSL_free(clientssl);
+ SSL_CTX_free(sctx);
+ SSL_CTX_free(cctx);
+
+ return testresult;
+}
+
+static int test_early_data_not_sent(void)
+{
+ SSL_CTX *cctx = NULL, *sctx = NULL;
+ SSL *clientssl = NULL, *serverssl = NULL;
+ int testresult = 0;
+ SSL_SESSION *sess;
+ unsigned char buf[20];
+ size_t readbytes, written;
+
+ /*
+ * Test that a server attempting to read early data can handle a connection
+ * from a client that doesn't send any.
+ */
+
+ if (!setupearly_data_test(&cctx, &sctx, &clientssl, &serverssl, &sess))
+ goto end;
+
+ /* Write some data - should block due to handshake with server */
+ SSL_set_connect_state(clientssl);
+ if (SSL_write_ex(clientssl, MSG1, strlen(MSG1), &written)) {
+ printf("Unexpected success writing message 1\n");
+ goto end;
+ }
+
+ /* Server should detect that early data has not been sent */
+ if (SSL_read_early_data(serverssl, buf, sizeof(buf), &readbytes)
+ != SSL_READ_EARLY_DATA_FINISH
+ || readbytes != 0) {
+ printf("Failed reading early data\n");
+ goto end;
+ }
+
+ if (SSL_get_early_data_status(serverssl) != SSL_EARLY_DATA_NOT_SENT) {
+ printf("Unexpected early data status\n");
+ goto end;
+ }
+
+ if (SSL_get_early_data_status(clientssl) != SSL_EARLY_DATA_NOT_SENT) {
+ printf("Unexpected early data status (2)\n");
+ goto end;
+ }
+
+ /* Continue writing the message we started earlier */
+ if (!SSL_write_ex(clientssl, MSG1, strlen(MSG1), &written)
+ || written != strlen(MSG1)) {
+ printf("Failed writing message 1\n");
+ goto end;
+ }
+
+ if (!SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes)
+ || readbytes != strlen(MSG1)
+ || memcmp(MSG1, buf, strlen(MSG1))) {
+ printf("Failed reading message 1\n");
+ goto end;
+ }
+
+ if (!SSL_write_ex(serverssl, MSG2, strlen(MSG2), &written)
+ || written != strlen(MSG2)) {
+ printf("Failed writing message 2\n");
+ goto end;
+ }
+
+ /* Should block due to the NewSessionTicket arrival */
+ if (SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes)) {
+ printf("Unexpected success reading message 2\n");
+ goto end;
+ }
+
+ if (!SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes)
+ || readbytes != strlen(MSG2)
+ || memcmp(MSG2, buf, strlen(MSG2))) {
+ printf("Failed reading message 2\n");
+ goto end;
+ }
+
+ testresult = 1;
+
+ end:
+ if(!testresult)
+ ERR_print_errors_fp(stdout);
+ SSL_SESSION_free(sess);
+ SSL_free(serverssl);
+ SSL_free(clientssl);
+ SSL_CTX_free(sctx);
+ SSL_CTX_free(cctx);
+
+ return testresult;
+}
+
+static int test_early_data_not_expected(void)
+{
+ SSL_CTX *cctx = NULL, *sctx = NULL;
+ SSL *clientssl = NULL, *serverssl = NULL;
+ int testresult = 0;
+ SSL_SESSION *sess;
+ unsigned char buf[20];
+ size_t readbytes, written;
+
+ /*
+ * Test that a server that doesn't try to read early data can handle a
+ * client sending some.
+ */
+
+ if (!setupearly_data_test(&cctx, &sctx, &clientssl, &serverssl, &sess))
+ goto end;
+
+ /* Write some early data */
+ if (!SSL_write_early_data(clientssl, MSG1, strlen(MSG1), &written)) {
+ printf("Unexpected failure writing message 1\n");
+ goto end;
+ }
+
+ /*
+ * Server should skip over early data and then block waiting for client to
+ * continue handshake
+ */
+ if (SSL_accept(serverssl) > 0) {
+ printf("Unexpected success setting up server connection\n");
+ goto end;
+ }
+
+ if (SSL_connect(clientssl) <= 0) {
+ printf("Failed setting up client connection\n");
+ goto end;
+ }
+
+ if (SSL_get_early_data_status(serverssl) != SSL_EARLY_DATA_REJECTED) {
+ printf("Unexpected early data status\n");
+ goto end;
+ }
+
+ if (SSL_accept(serverssl) <= 0) {
+ printf("Failed setting up server connection\n");
+ goto end;
+ }
+
+ if (SSL_get_early_data_status(clientssl) != SSL_EARLY_DATA_REJECTED) {
+ printf("Unexpected early data status (2)\n");
+ goto end;
+ }
+
+ /* Send some normal data from client to server */
+ if (!SSL_write_ex(clientssl, MSG2, strlen(MSG2), &written)
+ || written != strlen(MSG2)) {
+ printf("Failed writing message 2\n");
+ goto end;
+ }
+
+ if (!SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes)
+ || readbytes != strlen(MSG2)
+ || memcmp(MSG2, buf, strlen(MSG2))) {
+ printf("Failed reading message 2\n");
+ goto end;
+ }
+
+ testresult = 1;
+
+ end:
+ if(!testresult)
+ ERR_print_errors_fp(stdout);
+ SSL_SESSION_free(sess);
+ SSL_free(serverssl);
+ SSL_free(clientssl);
+ SSL_CTX_free(sctx);
+ SSL_CTX_free(cctx);
+
+ return testresult;
+}
+
+
+# ifndef OPENSSL_NO_TLS1_2
+static int test_early_data_tls1_2(void)
+{
+ SSL_CTX *cctx = NULL, *sctx = NULL;
+ SSL *clientssl = NULL, *serverssl = NULL;
+ int testresult = 0;
+ unsigned char buf[20];
+ size_t readbytes, written;
+
+ /*
+ * Test that a server attempting to read early data can handle a connection
+ * from a TLSv1.2 client.
+ */
+
+ if (!create_ssl_ctx_pair(TLS_server_method(), TLS_client_method(), &sctx,
+ &cctx, cert, privkey)) {
+ printf("Unable to create SSL_CTX pair\n");
+ goto end;
+ }
+
+ if (!create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL, NULL)) {
+ printf("Unable to create SSL objects\n");
+ goto end;
+ }
+
+ /* Write some data - should block due to handshake with server */
+ SSL_set_max_proto_version(clientssl, TLS1_2_VERSION);
+ SSL_set_connect_state(clientssl);
+ if (SSL_write_ex(clientssl, MSG1, strlen(MSG1), &written)) {
+ printf("Unexpected success writing message 1\n");
+ goto end;
+ }
+
+ /*
+ * Server should do TLSv1.2 handshake. First it will block waiting for more
+ * messages from client after ServerDone. Then SSL_read_early_data should
+ * finish and detect that early data has not been sent
+ */
+ if (SSL_read_early_data(serverssl, buf, sizeof(buf), &readbytes)
+ != SSL_READ_EARLY_DATA_ERROR) {
+ printf("Unexpected success reading early data\n");
+ goto end;
+ }
+
+ /*
+ * Continue writing the message we started earlier. Will still block waiting
+ * for the CCS/Finished from server
+ */
+ if (SSL_write_ex(clientssl, MSG1, strlen(MSG1), &written)) {
+ printf("Unexpected success writing message 1\n");
+ goto end;
+ }
+
+ if (SSL_read_early_data(serverssl, buf, sizeof(buf), &readbytes)
+ != SSL_READ_EARLY_DATA_FINISH
+ || readbytes != 0) {
+ printf("Failed reading early data\n");
+ goto end;
+ }
+
+ if (SSL_get_early_data_status(serverssl) != SSL_EARLY_DATA_NOT_SENT) {
+ printf("Unexpected early data status\n");
+ goto end;
+ }
+
+ /* Continue writing the message we started earlier */
+ if (!SSL_write_ex(clientssl, MSG1, strlen(MSG1), &written)
+ || written != strlen(MSG1)) {
+ printf("Failed writing message 1\n");
+ goto end;
+ }
+
+ if (SSL_get_early_data_status(clientssl) != SSL_EARLY_DATA_NOT_SENT) {
+ printf("Unexpected early data status (2)\n");
+ goto end;
+ }
+
+ if (!SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes)
+ || readbytes != strlen(MSG1)
+ || memcmp(MSG1, buf, strlen(MSG1))) {
+ printf("Failed reading message 1\n");
+ goto end;
+ }
+
+ if (!SSL_write_ex(serverssl, MSG2, strlen(MSG2), &written)
+ || written != strlen(MSG2)) {
+ printf("Failed writing message 2\n");
+ goto end;
+ }
+
+ if (!SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes)
+ || readbytes != strlen(MSG2)
+ || memcmp(MSG2, buf, strlen(MSG2))) {
+ printf("Failed reading message 2\n");
+ goto end;
+ }
+
+ testresult = 1;
+
+ end:
+ if(!testresult)
+ ERR_print_errors_fp(stdout);
+ SSL_free(serverssl);
+ SSL_free(clientssl);
+ SSL_CTX_free(sctx);
+ SSL_CTX_free(cctx);
+
+ return testresult;
+}
+# endif
+#endif
+
int test_main(int argc, char *argv[])
{
int testresult = 1;
ADD_TEST(test_keylog);
#ifndef OPENSSL_NO_TLS1_3
ADD_TEST(test_keylog_no_master_key);
+#endif
+#ifndef OPENSSL_NO_TLS1_2
+ ADD_TEST(test_early_cb);
+#endif
+#ifndef OPENSSL_NO_TLS1_3
+ ADD_TEST(test_early_data_read_write);
+ ADD_TEST(test_early_data_skip);
+ ADD_TEST(test_early_data_not_sent);
+ ADD_TEST(test_early_data_not_expected);
+# ifndef OPENSSL_NO_TLS1_2
+ ADD_TEST(test_early_data_tls1_2);
+# endif
#endif
testresult = run_tests(argv[0]);
projects / openssl.git / blobdiff