diff options
author | beck <> | 2019-01-23 18:24:40 +0000 |
---|---|---|
committer | beck <> | 2019-01-23 18:24:40 +0000 |
commit | 03a77eef903481d4308502d32fca33a961c4bb3a (patch) | |
tree | c7932fb2fd1ea2ff0c3a210ddd7adf1eb94d4186 /src/regress/lib/libssl/tlsext/tlsexttest.c | |
parent | 811354ae1302b7cd68c86866b02f4ab4cf11322b (diff) | |
download | openbsd-03a77eef903481d4308502d32fca33a961c4bb3a.tar.gz openbsd-03a77eef903481d4308502d32fca33a961c4bb3a.tar.bz2 openbsd-03a77eef903481d4308502d32fca33a961c4bb3a.zip |
revert previous, accidentally contained another diff in addition
to the one I intended to commit
Diffstat (limited to 'src/regress/lib/libssl/tlsext/tlsexttest.c')
-rw-r--r-- | src/regress/lib/libssl/tlsext/tlsexttest.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/regress/lib/libssl/tlsext/tlsexttest.c b/src/regress/lib/libssl/tlsext/tlsexttest.c index 3387b86f3f..5689a1c29e 100644 --- a/src/regress/lib/libssl/tlsext/tlsexttest.c +++ b/src/regress/lib/libssl/tlsext/tlsexttest.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tlsexttest.c,v 1.23 2019/01/23 16:46:04 beck Exp $ */ | 1 | /* $OpenBSD: tlsexttest.c,v 1.24 2019/01/23 18:24:40 beck Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> |
4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> | 4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> |
@@ -1505,11 +1505,10 @@ test_tlsext_ri_server(void) | |||
1505 | */ | 1505 | */ |
1506 | 1506 | ||
1507 | static unsigned char tlsext_sigalgs_client[] = { | 1507 | static unsigned char tlsext_sigalgs_client[] = { |
1508 | 0x00, 0x20, 0x08, 0x06, 0x06, 0x01, 0x06, 0x03, | 1508 | 0x00, 0x1a, 0x06, 0x01, 0x06, 0x03, 0xef, 0xef, |
1509 | 0xef, 0xef, 0x08, 0x05, 0x05, 0x01, 0x05, 0x03, | 1509 | 0x05, 0x01, 0x05, 0x03, 0x04, 0x01, 0x04, 0x03, |
1510 | 0x08, 0x04, 0x04, 0x01, 0x04, 0x03, 0xee, 0xee, | 1510 | 0xee, 0xee, 0xed, 0xed, 0x03, 0x01, 0x03, 0x03, |
1511 | 0xed, 0xed, 0x03, 0x01, 0x03, 0x03, 0x02, 0x01, | 1511 | 0x02, 0x01, 0x02, 0x03, |
1512 | 0x02, 0x03, | ||
1513 | }; | 1512 | }; |
1514 | 1513 | ||
1515 | static int | 1514 | static int |
@@ -2733,14 +2732,13 @@ test_tlsext_srtp_server(void) | |||
2733 | #endif /* OPENSSL_NO_SRTP */ | 2732 | #endif /* OPENSSL_NO_SRTP */ |
2734 | 2733 | ||
2735 | unsigned char tlsext_clienthello_default[] = { | 2734 | unsigned char tlsext_clienthello_default[] = { |
2736 | 0x00, 0x3c, 0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, | 2735 | 0x00, 0x36, 0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, |
2737 | 0x00, 0x0a, 0x00, 0x08, 0x00, 0x06, 0x00, 0x1d, | 2736 | 0x00, 0x0a, 0x00, 0x08, 0x00, 0x06, 0x00, 0x1d, |
2738 | 0x00, 0x17, 0x00, 0x18, 0x00, 0x23, 0x00, 0x00, | 2737 | 0x00, 0x17, 0x00, 0x18, 0x00, 0x23, 0x00, 0x00, |
2739 | 0x00, 0x0d, 0x00, 0x22, 0x00, 0x20, 0x08, 0x06, | 2738 | 0x00, 0x0d, 0x00, 0x1c, 0x00, 0x1a, 0x06, 0x01, |
2740 | 0x06, 0x01, 0x06, 0x03, 0xef, 0xef, 0x08, 0x05, | 2739 | 0x06, 0x03, 0xef, 0xef, 0x05, 0x01, 0x05, 0x03, |
2741 | 0x05, 0x01, 0x05, 0x03, 0x08, 0x04, 0x04, 0x01, | 2740 | 0x04, 0x01, 0x04, 0x03, 0xee, 0xee, 0xed, 0xed, |
2742 | 0x04, 0x03, 0xee, 0xee, 0xed, 0xed, 0x03, 0x01, | 2741 | 0x03, 0x01, 0x03, 0x03, 0x02, 0x01, 0x02, 0x03, |
2743 | 0x03, 0x03, 0x02, 0x01, 0x02, 0x03, | ||
2744 | }; | 2742 | }; |
2745 | 2743 | ||
2746 | unsigned char tlsext_clienthello_disabled[] = {}; | 2744 | unsigned char tlsext_clienthello_disabled[] = {}; |