From 1f6359db729fa46364435b4899331296d2b91c65 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 3 May 2017 14:09:05 +0100 Subject: [PATCH] Update tls13secretstest test vectors for TLSv1.3 draft-20 Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/3371) --- test/tls13secretstest.c | 70 ++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/test/tls13secretstest.c b/test/tls13secretstest.c index 2904ba9f16..daccd7c360 100644 --- a/test/tls13secretstest.c +++ b/test/tls13secretstest.c @@ -34,7 +34,7 @@ * 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 -19 vectors below. + * draft -16, which works differently to the draft -20 vectors below. */ static unsigned char hs_start_hash[] = { @@ -62,83 +62,83 @@ static unsigned char ecdhe_secret[] = { }; static unsigned char handshake_secret[] = { -0xa4, 0xc6, 0x2e, 0x1c, 0x3c, 0xb8, 0x0a, 0xae, 0x34, 0x34, 0x0d, 0xb8, 0xfb, -0x0d, 0xd5, 0x0d, 0x2d, 0x2f, 0x08, 0xa4, 0x54, 0x6b, 0xbb, 0x2e, 0x60, 0xc6, -0x53, 0xac, 0xb3, 0xca, 0xf2, 0x87 +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 }; -static const char *client_hts_label = "client handshake traffic secret"; +static const char *client_hts_label = "c hs traffic"; static unsigned char client_hts[] = { -0xd7, 0x58, 0x9f, 0x10, 0xa8, 0x30, 0xf3, 0x85, 0x63, 0x6f, 0xd9, 0xb0, 0x61, -0xd5, 0x20, 0x19, 0xb1, 0x45, 0x96, 0x82, 0x24, 0x8e, 0x36, 0x45, 0xf7, 0x5a, -0xd7, 0x2f, 0x31, 0xec, 0x57, 0xf7 +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 }; static unsigned char client_hts_key[] = { -0xcc, 0x8b, 0xda, 0xbf, 0x83, 0x74, 0x2d, 0xf4, 0x53, 0x44, 0xff, 0xbc, 0xa4, -0x43, 0xc8, 0x2a +0x62, 0xd0, 0xdd, 0x00, 0xf6, 0x96, 0x19, 0xd3, 0xb8, 0x19, 0x3a, 0xb4, 0xa0, +0x95, 0x85, 0xa7 }; static unsigned char client_hts_iv[] = { -0xa4, 0x83, 0x46, 0x11, 0xc2, 0x78, 0xea, 0x0f, 0x94, 0x52, 0x1d, 0xca +0xff, 0xf7, 0x5d, 0xf5, 0xad, 0x35, 0xd5, 0xcb, 0x3c, 0x53, 0xf3, 0xa9 }; -static const char *server_hts_label = "server handshake traffic secret"; +static const char *server_hts_label = "s hs traffic"; static unsigned char server_hts[] = { -0xba, 0x7c, 0x3b, 0x74, 0x0d, 0x1e, 0x84, 0x82, 0xd6, 0x6f, 0x3e, 0x5e, 0x1d, -0x6e, 0x25, 0xdc, 0x87, 0x1f, 0x48, 0x74, 0x2f, 0x65, 0xa4, 0x40, 0x39, 0xda, -0xdc, 0x02, 0x2a, 0x16, 0x19, 0x5c +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 }; static unsigned char server_hts_key[] = { -0x7d, 0x22, 0x2a, 0x3f, 0x72, 0x37, 0x92, 0xd9, 0x95, 0x9a, 0xe1, 0x66, 0x32, -0x6f, 0x0d, 0xc9 +0x04, 0x67, 0xf3, 0x16, 0xa8, 0x05, 0xb8, 0xc4, 0x97, 0xee, 0x67, 0x04, 0x7b, +0xbc, 0xbc, 0x54 }; static unsigned char server_hts_iv[] = { -0xa2, 0x73, 0xcd, 0x4e, 0x20, 0xe7, 0xe1, 0xe3, 0xcb, 0x0e, 0x18, 0x9e +0xde, 0x83, 0xa7, 0x3e, 0x9d, 0x81, 0x4b, 0x04, 0xc4, 0x8b, 0x78, 0x09 }; static unsigned char master_secret[] = { -0x9a, 0x2f, 0x36, 0xdc, 0x68, 0xab, 0x8f, 0x07, 0xef, 0x41, 0xea, 0x63, 0x39, -0xfc, 0x46, 0x6b, 0x11, 0x24, 0xd6, 0xba, 0x6b, 0x8a, 0x92, 0x74, 0x61, 0xd3, -0x64, 0x82, 0xc1, 0xc9, 0xc7, 0x0e +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 }; -static const char *client_ats_label = "client application traffic secret"; +static const char *client_ats_label = "c ap traffic"; static unsigned char client_ats[] = { -0xc3, 0x60, 0x5f, 0xb3, 0xc4, 0x4b, 0xc2, 0x25, 0xd2, 0xaf, 0x36, 0xad, 0x99, -0xa1, 0xcd, 0xcf, 0x71, 0xc4, 0xb9, 0xa2, 0x3d, 0xd2, 0x3e, 0xe6, 0xff, 0xca, -0x2c, 0x71, 0x86, 0x3d, 0x1f, 0x85 +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 }; static unsigned char client_ats_key[] = { -0x3a, 0x25, 0x23, 0x12, 0xde, 0x0f, 0x53, 0xc7, 0xa0, 0xb2, 0xcf, 0x71, 0xb7, -0x1a, 0x0d, 0xc7 +0xcc, 0x9f, 0x5f, 0x98, 0x0b, 0x5f, 0x10, 0x30, 0x6c, 0xba, 0xd7, 0xbe, 0x98, +0xd7, 0x57, 0x2e }; static unsigned char client_ats_iv[] = { -0xbd, 0x0d, 0x3c, 0x26, 0x9d, 0x2d, 0xa6, 0x52, 0x1b, 0x8d, 0x45, 0xef +0xb8, 0x09, 0x29, 0xe8, 0xd0, 0x2c, 0x70, 0xf6, 0x11, 0x62, 0xed, 0x6b }; -static const char *server_ats_label = "server application traffic secret"; +static const char *server_ats_label = "s ap traffic"; static unsigned char server_ats[] = { -0x27, 0x8d, 0x96, 0x76, 0x95, 0x9e, 0x3e, 0x39, 0xa4, 0xa9, 0xfc, 0x46, 0x9c, -0x32, 0x9f, 0xe0, 0x29, 0x50, 0x22, 0x45, 0x39, 0x82, 0xdd, 0x1c, 0xc5, 0xfb, -0xa9, 0x0a, 0x68, 0x29, 0x4e, 0x80 +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 }; static unsigned char server_ats_key[] = { -0x78, 0xbd, 0xd7, 0xc6, 0xb0, 0xf1, 0x50, 0x5e, 0xae, 0x54, 0xff, 0xa5, 0xf2, -0xed, 0x0b, 0x77 +0x0c, 0xb2, 0x95, 0x62, 0xd8, 0xd8, 0x8f, 0x48, 0xb0, 0x2c, 0xbf, 0xbe, 0xd7, +0xe6, 0x2b, 0xb3 }; static unsigned char server_ats_iv[] = { -0xb1, 0x7b, 0x1c, 0xa2, 0xca, 0xbe, 0xe4, 0xac, 0xb5, 0xf3, 0x91, 0x7e +0x0d, 0xb2, 0x8f, 0x98, 0x85, 0x86, 0xa1, 0xb7, 0xe4, 0xd5, 0xc6, 0x9c }; /* Mocked out implementations of various functions */