X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=test%2Ftls13secretstest.c;h=66a05828870a285a8f6563c0f106d7f222a2bbfd;hp=e052d0bd03441331bb32ae90fcbe066c08029354;hb=f807ad17f327c40d2ed89739f7ed037ea9a80ee5;hpb=a19ae67d8da53a4a5878e34d1070d3aeb1f5963c

diff --git a/test/tls13secretstest.c b/test/tls13secretstest.c
index e052d0bd03..66a0582887 100644
--- a/test/tls13secretstest.c
+++ b/test/tls13secretstest.c
@@ -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
@@ -26,27 +26,21 @@
 #define IVLEN   12
 #define KEYLEN  16
 
-/* The following are self-generated test vectors. This gives us very little
- * confidence that we've got the implementation right, but at least tells us
- * if we accidentally  break something in the future. Until we can get some
- * other source of test vectors this is all we've got.
- * TODO(TLS1.3): As and when official vectors become available we should use
- * those, e.g. see
- * https://www.ietf.org/id/draft-thomson-tls-tls13-vectors-00.txt, however at
- * the time of writing these are not suitable because they are based on
- * draft -16, which works differently to the draft -20 vectors below.
+/*
+ * Based on the test vectors availble in:
+ * https://tools.ietf.org/html/draft-ietf-tls-tls13-vectors-06 
  */
 
 static unsigned char hs_start_hash[] = {
-0xec, 0x14, 0x7a, 0x06, 0xde, 0xa3, 0xc8, 0x84, 0x6c, 0x02, 0xb2, 0x23, 0x8e,
-0x41, 0xbd, 0xdc, 0x9d, 0x89, 0xf9, 0xae, 0xa1, 0x7b, 0x5e, 0xfd, 0x4d, 0x74,
-0x82, 0xaf, 0x75, 0x88, 0x1c, 0x0a
+0xc6, 0xc9, 0x18, 0xad, 0x2f, 0x41, 0x99, 0xd5, 0x59, 0x8e, 0xaf, 0x01, 0x16,
+0xcb, 0x7a, 0x5c, 0x2c, 0x14, 0xcb, 0x54, 0x78, 0x12, 0x18, 0x88, 0x8d, 0xb7,
+0x03, 0x0d, 0xd5, 0x0d, 0x5e, 0x6d
 };
 
 static unsigned char hs_full_hash[] = {
-0x75, 0x1a, 0x3d, 0x4a, 0x14, 0xdf, 0xab, 0xeb, 0x68, 0xe9, 0x2c, 0xa5, 0x91,
-0x8e, 0x24, 0x08, 0xb9, 0xbc, 0xb0, 0x74, 0x89, 0x82, 0xec, 0x9c, 0x32, 0x30,
-0xac, 0x30, 0xbb, 0xeb, 0x23, 0xe2,
+0xf8, 0xc1, 0x9e, 0x8c, 0x77, 0xc0, 0x38, 0x79, 0xbb, 0xc8, 0xeb, 0x6d, 0x56,
+0xe0, 0x0d, 0xd5, 0xd8, 0x6e, 0xf5, 0x59, 0x27, 0xee, 0xfc, 0x08, 0xe1, 0xb0,
+0x02, 0xb6, 0xec, 0xe0, 0x5d, 0xbf
 };
 
 static unsigned char early_secret[] = {
@@ -56,89 +50,89 @@ static unsigned char early_secret[] = {
 };
 
 static unsigned char ecdhe_secret[] = {
-0xe7, 0xb8, 0xfe, 0xf8, 0x90, 0x3b, 0x52, 0x0c, 0xb9, 0xa1, 0x89, 0x71, 0xb6,
-0x9d, 0xd4, 0x5d, 0xca, 0x53, 0xce, 0x2f, 0x12, 0xbf, 0x3b, 0xef, 0x93, 0x15,
-0xe3, 0x12, 0x71, 0xdf, 0x4b, 0x40
+0x81, 0x51, 0xd1, 0x46, 0x4c, 0x1b, 0x55, 0x53, 0x36, 0x23, 0xb9, 0xc2, 0x24,
+0x6a, 0x6a, 0x0e, 0x6e, 0x7e, 0x18, 0x50, 0x63, 0xe1, 0x4a, 0xfd, 0xaf, 0xf0,
+0xb6, 0xe1, 0xc6, 0x1a, 0x86, 0x42
 };
 
 static unsigned char handshake_secret[] = {
-0xf5, 0x51, 0xd0, 0xbd, 0x9e, 0x6a, 0xc0, 0x95, 0x5f, 0x8e, 0xae, 0xb6, 0x28,
-0x2e, 0x8d, 0x9e, 0xf3, 0xd4, 0x08, 0x57, 0x81, 0xbc, 0x9d, 0x80, 0x91, 0x8a,
-0x81, 0x33, 0x86, 0x58, 0x7f, 0x46
+0x5b, 0x4f, 0x96, 0x5d, 0xf0, 0x3c, 0x68, 0x2c, 0x46, 0xe6, 0xee, 0x86, 0xc3,
+0x11, 0x63, 0x66, 0x15, 0xa1, 0xd2, 0xbb, 0xb2, 0x43, 0x45, 0xc2, 0x52, 0x05,
+0x95, 0x3c, 0x87, 0x9e, 0x8d, 0x06
 };
 
 static const char *client_hts_label = "c hs traffic";
 
 static unsigned char client_hts[] = {
-0x61, 0x7b, 0x35, 0x07, 0x6b, 0x9d, 0x0e, 0x08, 0xcf, 0x73, 0x1d, 0x94, 0xa8,
-0x66, 0x14, 0x78, 0x41, 0x09, 0xef, 0x25, 0x55, 0x51, 0x92, 0x1d, 0xd4, 0x6e,
-0x04, 0x01, 0x35, 0xcf, 0x46, 0xab
+0xe2, 0xe2, 0x32, 0x07, 0xbd, 0x93, 0xfb, 0x7f, 0xe4, 0xfc, 0x2e, 0x29, 0x7a,
+0xfe, 0xab, 0x16, 0x0e, 0x52, 0x2b, 0x5a, 0xb7, 0x5d, 0x64, 0xa8, 0x6e, 0x75,
+0xbc, 0xac, 0x3f, 0x3e, 0x51, 0x03
 };
 
 static unsigned char client_hts_key[] = {
-0x62, 0xd0, 0xdd, 0x00, 0xf6, 0x96, 0x19, 0xd3, 0xb8, 0x19, 0x3a, 0xb4, 0xa0,
-0x95, 0x85, 0xa7
+0x26, 0x79, 0xa4, 0x3e, 0x1d, 0x76, 0x78, 0x40, 0x34, 0xea, 0x17, 0x97, 0xd5,
+0xad, 0x26, 0x49
 };
 
 static unsigned char client_hts_iv[] = {
-0xff, 0xf7, 0x5d, 0xf5, 0xad, 0x35, 0xd5, 0xcb, 0x3c, 0x53, 0xf3, 0xa9
+0x54, 0x82, 0x40, 0x52, 0x90, 0xdd, 0x0d, 0x2f, 0x81, 0xc0, 0xd9, 0x42
 };
 
 static const char *server_hts_label = "s hs traffic";
 
 static unsigned char server_hts[] = {
-0xfc, 0xf7, 0xdf, 0xe6, 0x4f, 0xa2, 0xc0, 0x4f, 0x62, 0x35, 0x38, 0x7f, 0x43,
-0x4e, 0x01, 0x42, 0x23, 0x36, 0xd9, 0xc0, 0x39, 0xde, 0x68, 0x47, 0xa0, 0xb9,
-0xdd, 0xcf, 0x29, 0xa8, 0x87, 0x59
+0x3b, 0x7a, 0x83, 0x9c, 0x23, 0x9e, 0xf2, 0xbf, 0x0b, 0x73, 0x05, 0xa0, 0xe0,
+0xc4, 0xe5, 0xa8, 0xc6, 0xc6, 0x93, 0x30, 0xa7, 0x53, 0xb3, 0x08, 0xf5, 0xe3,
+0xa8, 0x3a, 0xa2, 0xef, 0x69, 0x79
 };
 
 static unsigned char server_hts_key[] = {
-0x04, 0x67, 0xf3, 0x16, 0xa8, 0x05, 0xb8, 0xc4, 0x97, 0xee, 0x67, 0x04, 0x7b,
-0xbc, 0xbc, 0x54
+0xc6, 0x6c, 0xb1, 0xae, 0xc5, 0x19, 0xdf, 0x44, 0xc9, 0x1e, 0x10, 0x99, 0x55,
+0x11, 0xac, 0x8b
 };
 
 static unsigned char server_hts_iv[] = {
-0xde, 0x83, 0xa7, 0x3e, 0x9d, 0x81, 0x4b, 0x04, 0xc4, 0x8b, 0x78, 0x09
+0xf7, 0xf6, 0x88, 0x4c, 0x49, 0x81, 0x71, 0x6c, 0x2d, 0x0d, 0x29, 0xa4
 };
 
 static unsigned char master_secret[] = {
-0x34, 0x83, 0x83, 0x84, 0x67, 0x12, 0xe7, 0xff, 0x24, 0xe8, 0x6e, 0x70, 0x56,
-0x95, 0x16, 0x71, 0x43, 0x7f, 0x19, 0xd7, 0x85, 0x06, 0x9d, 0x75, 0x70, 0x49,
-0x6e, 0x6c, 0xa4, 0x81, 0xf0, 0xb8
+0x5c, 0x79, 0xd1, 0x69, 0x42, 0x4e, 0x26, 0x2b, 0x56, 0x32, 0x03, 0x62, 0x7b,
+0xe4, 0xeb, 0x51, 0x03, 0x3f, 0x58, 0x8c, 0x43, 0xc9, 0xce, 0x03, 0x73, 0x37,
+0x2d, 0xbc, 0xbc, 0x01, 0x85, 0xa7
 };
 
 static const char *client_ats_label = "c ap traffic";
 
 static unsigned char client_ats[] = {
-0xc1, 0x4a, 0x6d, 0x79, 0x76, 0xd8, 0x10, 0x2b, 0x5a, 0x0c, 0x99, 0x51, 0x49,
-0x3f, 0xee, 0x87, 0xdc, 0xaf, 0xf8, 0x2c, 0x24, 0xca, 0xb2, 0x14, 0xe8, 0xbe,
-0x71, 0xa8, 0x20, 0x6d, 0xbd, 0xa5
+0xe2, 0xf0, 0xdb, 0x6a, 0x82, 0xe8, 0x82, 0x80, 0xfc, 0x26, 0xf7, 0x3c, 0x89,
+0x85, 0x4e, 0xe8, 0x61, 0x5e, 0x25, 0xdf, 0x28, 0xb2, 0x20, 0x79, 0x62, 0xfa,
+0x78, 0x22, 0x26, 0xb2, 0x36, 0x26
 };
 
 static unsigned char client_ats_key[] = {
-0xcc, 0x9f, 0x5f, 0x98, 0x0b, 0x5f, 0x10, 0x30, 0x6c, 0xba, 0xd7, 0xbe, 0x98,
-0xd7, 0x57, 0x2e
+0x88, 0xb9, 0x6a, 0xd6, 0x86, 0xc8, 0x4b, 0xe5, 0x5a, 0xce, 0x18, 0xa5, 0x9c,
+0xce, 0x5c, 0x87
 };
 
 static unsigned char client_ats_iv[] = {
-0xb8, 0x09, 0x29, 0xe8, 0xd0, 0x2c, 0x70, 0xf6, 0x11, 0x62, 0xed, 0x6b
+0xb9, 0x9d, 0xc5, 0x8c, 0xd5, 0xff, 0x5a, 0xb0, 0x82, 0xfd, 0xad, 0x19
 };
 
 static const char *server_ats_label = "s ap traffic";
 
 static unsigned char server_ats[] = {
-0x2c, 0x90, 0x77, 0x38, 0xd3, 0xf8, 0x37, 0x02, 0xd1, 0xe4, 0x59, 0x8f, 0x48,
-0x48, 0x53, 0x1d, 0x9f, 0x93, 0x65, 0x49, 0x1b, 0x9f, 0x7f, 0x52, 0xc8, 0x22,
-0x29, 0x0d, 0x4c, 0x23, 0x21, 0x92
+0x5b, 0x73, 0xb1, 0x08, 0xd9, 0xac, 0x1b, 0x9b, 0x0c, 0x82, 0x48, 0xca, 0x39,
+0x26, 0xec, 0x6e, 0x7b, 0xc4, 0x7e, 0x41, 0x17, 0x06, 0x96, 0x39, 0x87, 0xec,
+0x11, 0x43, 0x5d, 0x30, 0x57, 0x19
 };
 
 static unsigned char server_ats_key[] = {
-0x0c, 0xb2, 0x95, 0x62, 0xd8, 0xd8, 0x8f, 0x48, 0xb0, 0x2c, 0xbf, 0xbe, 0xd7,
-0xe6, 0x2b, 0xb3
+0xa6, 0x88, 0xeb, 0xb5, 0xac, 0x82, 0x6d, 0x6f, 0x42, 0xd4, 0x5c, 0x0c, 0xc4,
+0x4b, 0x9b, 0x7d
 };
 
 static unsigned char server_ats_iv[] = {
-0x0d, 0xb2, 0x8f, 0x98, 0x85, 0x86, 0xa1, 0xb7, 0xe4, 0xd5, 0xc6, 0x9c
+0xc1, 0xca, 0xd4, 0x42, 0x5a, 0x43, 0x8b, 0x5d, 0xe7, 0x14, 0x83, 0x0a
 };
 
 /* Mocked out implementations of various functions */
@@ -207,6 +201,21 @@ const EVP_MD *ssl_md(int idx)
     return EVP_sha256();
 }
 
+void ossl_statem_fatal(SSL *s, int al, int func, int reason, const char *file,
+                           int line)
+{
+}
+
+int ossl_statem_export_allowed(SSL *s)
+{
+    return 1;
+}
+
+int ossl_statem_export_early_allowed(SSL *s)
+{
+    return 1;
+}
+
 /* End of mocked out code */
 
 static int test_secret(SSL *s, unsigned char *prk,
@@ -227,7 +236,7 @@ static int test_secret(SSL *s, unsigned char *prk,
     }
 
     if (!tls13_hkdf_expand(s, md, prk, label, labellen, hash, hashsize,
-                           gensecret, hashsize)) {
+                           gensecret, hashsize, 1)) {
         TEST_error("Secret generation failed");
         return 0;
     }
@@ -289,7 +298,7 @@ static int test_handshake_secrets(void)
 
     if (!TEST_true(tls13_generate_handshake_secret(s, ecdhe_secret,
                                                    sizeof(ecdhe_secret)))) {
-        TEST_info("Hanshake secret generation failed");
+        TEST_info("Handshake secret generation failed");
         goto err;
     }
 
@@ -384,7 +393,8 @@ static int test_handshake_secrets(void)
     return ret;
 }
 
-void register_tests()
+int setup_tests(void)
 {
     ADD_TEST(test_handshake_secrets);
+    return 1;
 }