summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2018-06-02 16:35:02 +0000
committerjsing <>2018-06-02 16:35:02 +0000
commitf6c1331fa2e89997363ab59225590a4adc2e8407 (patch)
tree070c868bd78890961301f73abdde431362ee0e06
parentcd126e741290f084546caeabdc425a5878244043 (diff)
downloadopenbsd-f6c1331fa2e89997363ab59225590a4adc2e8407.tar.gz
openbsd-f6c1331fa2e89997363ab59225590a4adc2e8407.tar.bz2
openbsd-f6c1331fa2e89997363ab59225590a4adc2e8407.zip
Update regress for DES cipher suite removal.
Diffstat
-rw-r--r--src/regress/lib/libssl/client/clienttest.c86
-rw-r--r--src/regress/lib/libssl/unit/cipher_list.c4
2 files changed, 41 insertions, 49 deletions
diff --git a/src/regress/lib/libssl/client/clienttest.c b/src/regress/lib/libssl/client/clienttest.c
index d5effe3ffc..cb45dc583c 100644
--- a/src/regress/lib/libssl/client/clienttest.c
+++ b/src/regress/lib/libssl/client/clienttest.c
@@ -36,26 +36,24 @@ static unsigned char cipher_list_dtls1[] = {
36 0x00, 0x88, 0x00, 0x81, 0x00, 0x35, 0x00, 0x84, 36 0x00, 0x88, 0x00, 0x81, 0x00, 0x35, 0x00, 0x84,
37 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45, 37 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45,
38 0x00, 0x2f, 0x00, 0x41, 0xc0, 0x12, 0xc0, 0x08, 38 0x00, 0x2f, 0x00, 0x41, 0xc0, 0x12, 0xc0, 0x08,
39 0x00, 0x16, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x09, 39 0x00, 0x16, 0x00, 0x0a, 0x00, 0xff,
40 0x00, 0xff,
41}; 40};
42 41
43static unsigned char client_hello_dtls1[] = { 42static unsigned char client_hello_dtls1[] = {
44 0x16, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 43 0x16, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
45 0x00, 0x00, 0x00, 0x00, 0x64, 0x01, 0x00, 0x00, 44 0x00, 0x00, 0x00, 0x00, 0x60, 0x01, 0x00, 0x00,
46 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 45 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
47 0x58, 0xfe, 0xff, 0xc3, 0xd6, 0x19, 0xf8, 0x5d, 46 0x54, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
48 0x6a, 0xe3, 0x6d, 0x16, 0x4a, 0xf7, 0x8f, 0x8e, 47 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
49 0x4a, 0x12, 0x87, 0xcf, 0x07, 0x99, 0xa7, 0x92, 48 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
50 0x40, 0xbd, 0x06, 0x9f, 0xe9, 0xd2, 0x68, 0x84, 49 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
51 0xff, 0x6f, 0xe8, 0x00, 0x00, 0x00, 0x2a, 0xc0, 50 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0xc0,
52 0x14, 0xc0, 0x0a, 0x00, 0x39, 0xff, 0x85, 0x00, 51 0x14, 0xc0, 0x0a, 0x00, 0x39, 0xff, 0x85, 0x00,
53 0x88, 0x00, 0x81, 0x00, 0x35, 0x00, 0x84, 0xc0, 52 0x88, 0x00, 0x81, 0x00, 0x35, 0x00, 0x84, 0xc0,
54 0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45, 0x00, 53 0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45, 0x00,
55 0x2f, 0x00, 0x41, 0xc0, 0x12, 0xc0, 0x08, 0x00, 54 0x2f, 0x00, 0x41, 0xc0, 0x12, 0xc0, 0x08, 0x00,
56 0x16, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x09, 0x00, 55 0x16, 0x00, 0x0a, 0x00, 0xff, 0x01, 0x00, 0x00,
57 0xff, 0x01, 0x00, 0x00, 0x04, 0x00, 0x23, 0x00, 56 0x04, 0x00, 0x23, 0x00, 0x00,
58 0x00,
59}; 57};
60 58
61static unsigned char cipher_list_tls10[] = { 59static unsigned char cipher_list_tls10[] = {
@@ -64,27 +62,25 @@ static unsigned char cipher_list_tls10[] = {
64 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45, 62 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45,
65 0x00, 0x2f, 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 63 0x00, 0x2f, 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07,
66 0x00, 0x05, 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 64 0x00, 0x05, 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08,
67 0x00, 0x16, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x09, 65 0x00, 0x16, 0x00, 0x0a, 0x00, 0xff,
68 0x00, 0xff,
69}; 66};
70 67
71static unsigned char client_hello_tls10[] = { 68static unsigned char client_hello_tls10[] = {
72 0x16, 0x03, 0x01, 0x00, 0x75, 0x01, 0x00, 0x00, 69 0x16, 0x03, 0x01, 0x00, 0x71, 0x01, 0x00, 0x00,
73 0x71, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 70 0x6d, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
74 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 71 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
75 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 72 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
76 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 73 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
77 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0xc0, 0x14, 74 0x00, 0x00, 0x00, 0x00, 0x00, 0x2e, 0xc0, 0x14,
78 0xc0, 0x0a, 0x00, 0x39, 0xff, 0x85, 0x00, 0x88, 75 0xc0, 0x0a, 0x00, 0x39, 0xff, 0x85, 0x00, 0x88,
79 0x00, 0x81, 0x00, 0x35, 0x00, 0x84, 0xc0, 0x13, 76 0x00, 0x81, 0x00, 0x35, 0x00, 0x84, 0xc0, 0x13,
80 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45, 0x00, 0x2f, 77 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45, 0x00, 0x2f,
81 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 78 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05,
82 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 79 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
83 0x00, 0x0a, 0x00, 0x15, 0x00, 0x09, 0x00, 0xff, 80 0x00, 0x0a, 0x00, 0xff, 0x01, 0x00, 0x00, 0x16,
84 0x01, 0x00, 0x00, 0x16, 0x00, 0x0b, 0x00, 0x02, 81 0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, 0x00, 0x0a,
85 0x01, 0x00, 0x00, 0x0a, 0x00, 0x08, 0x00, 0x06, 82 0x00, 0x08, 0x00, 0x06, 0x00, 0x1d, 0x00, 0x17,
86 0x00, 0x1d, 0x00, 0x17, 0x00, 0x18, 0x00, 0x23, 83 0x00, 0x18, 0x00, 0x23, 0x00, 0x00,
87 0x00, 0x00,
88}; 84};
89 85
90static unsigned char cipher_list_tls11[] = { 86static unsigned char cipher_list_tls11[] = {
@@ -93,27 +89,25 @@ static unsigned char cipher_list_tls11[] = {
93 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45, 89 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45,
94 0x00, 0x2f, 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 90 0x00, 0x2f, 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07,
95 0x00, 0x05, 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 91 0x00, 0x05, 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08,
96 0x00, 0x16, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x09, 92 0x00, 0x16, 0x00, 0x0a, 0x00, 0xff,
97 0x00, 0xff,
98}; 93};
99 94
100static unsigned char client_hello_tls11[] = { 95static unsigned char client_hello_tls11[] = {
101 0x16, 0x03, 0x01, 0x00, 0x75, 0x01, 0x00, 0x00, 96 0x16, 0x03, 0x01, 0x00, 0x71, 0x01, 0x00, 0x00,
102 0x71, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 97 0x6d, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
103 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 98 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
104 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 99 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
105 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 100 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
106 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0xc0, 0x14, 101 0x00, 0x00, 0x00, 0x00, 0x00, 0x2e, 0xc0, 0x14,
107 0xc0, 0x0a, 0x00, 0x39, 0xff, 0x85, 0x00, 0x88, 102 0xc0, 0x0a, 0x00, 0x39, 0xff, 0x85, 0x00, 0x88,
108 0x00, 0x81, 0x00, 0x35, 0x00, 0x84, 0xc0, 0x13, 103 0x00, 0x81, 0x00, 0x35, 0x00, 0x84, 0xc0, 0x13,
109 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45, 0x00, 0x2f, 104 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45, 0x00, 0x2f,
110 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 105 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05,
111 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 106 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
112 0x00, 0x0a, 0x00, 0x15, 0x00, 0x09, 0x00, 0xff, 107 0x00, 0x0a, 0x00, 0xff, 0x01, 0x00, 0x00, 0x16,
113 0x01, 0x00, 0x00, 0x16, 0x00, 0x0b, 0x00, 0x02, 108 0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, 0x00, 0x0a,
114 0x01, 0x00, 0x00, 0x0a, 0x00, 0x08, 0x00, 0x06, 109 0x00, 0x08, 0x00, 0x06, 0x00, 0x1d, 0x00, 0x17,
115 0x00, 0x1d, 0x00, 0x17, 0x00, 0x18, 0x00, 0x23, 110 0x00, 0x18, 0x00, 0x23, 0x00, 0x00,
116 0x00, 0x00,
117}; 111};
118 112
119static unsigned char cipher_list_tls12_aes[] = { 113static unsigned char cipher_list_tls12_aes[] = {
@@ -128,7 +122,7 @@ static unsigned char cipher_list_tls12_aes[] = {
128 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, 122 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba,
129 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 123 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05,
130 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 124 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
131 0x00, 0x0a, 0x00, 0x15, 0x00, 0x09, 0x00, 0xff, 125 0x00, 0x0a, 0x00, 0xff,
132}; 126};
133 127
134static unsigned char cipher_list_tls12_chacha[] = { 128static unsigned char cipher_list_tls12_chacha[] = {
@@ -143,16 +137,16 @@ static unsigned char cipher_list_tls12_chacha[] = {
143 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, 137 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba,
144 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 138 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05,
145 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 139 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
146 0x00, 0x0a, 0x00, 0x15, 0x00, 0x09, 0x00, 0xff, 140 0x00, 0x0a, 0x00, 0xff,
147}; 141};
148 142
149static unsigned char client_hello_tls12[] = { 143static unsigned char client_hello_tls12[] = {
150 0x16, 0x03, 0x01, 0x00, 0xc3, 0x01, 0x00, 0x00, 144 0x16, 0x03, 0x01, 0x00, 0xbf, 0x01, 0x00, 0x00,
151 0xbf, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 145 0xbb, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
152 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 146 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
153 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 147 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
154 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 148 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
155 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xcc, 0xa9, 149 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0xcc, 0xa9,
156 0xcc, 0xa8, 0xcc, 0xaa, 0xc0, 0x30, 0xc0, 0x2c, 150 0xcc, 0xa8, 0xcc, 0xaa, 0xc0, 0x30, 0xc0, 0x2c,
157 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, 0xc0, 0x0a, 151 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, 0xc0, 0x0a,
158 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39, 0xff, 0x85, 152 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39, 0xff, 0x85,
@@ -164,14 +158,14 @@ static unsigned char client_hello_tls12[] = {
164 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, 0x00, 0x41, 158 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, 0x00, 0x41,
165 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 0x00, 0x04, 159 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 0x00, 0x04,
166 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 0x00, 0x0a, 160 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 0x00, 0x0a,
167 0x00, 0x15, 0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 161 0x00, 0xff, 0x01, 0x00, 0x00, 0x36, 0x00, 0x0b,
168 0x00, 0x36, 0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, 162 0x00, 0x02, 0x01, 0x00, 0x00, 0x0a, 0x00, 0x08,
169 0x00, 0x0a, 0x00, 0x08, 0x00, 0x06, 0x00, 0x1d, 163 0x00, 0x06, 0x00, 0x1d, 0x00, 0x17, 0x00, 0x18,
170 0x00, 0x17, 0x00, 0x18, 0x00, 0x23, 0x00, 0x00, 164 0x00, 0x23, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x1c,
171 0x00, 0x0d, 0x00, 0x1c, 0x00, 0x1a, 0x06, 0x01, 165 0x00, 0x1a, 0x06, 0x01, 0x06, 0x03, 0xef, 0xef,
172 0x06, 0x03, 0xef, 0xef, 0x05, 0x01, 0x05, 0x03, 166 0x05, 0x01, 0x05, 0x03, 0x04, 0x01, 0x04, 0x03,
173 0x04, 0x01, 0x04, 0x03, 0xee, 0xee, 0xed, 0xed, 167 0xee, 0xee, 0xed, 0xed, 0x03, 0x01, 0x03, 0x03,
174 0x03, 0x01, 0x03, 0x03, 0x02, 0x01, 0x02, 0x03, 168 0x02, 0x01, 0x02, 0x03,
175}; 169};
176 170
177struct client_hello_test { 171struct client_hello_test {
diff --git a/src/regress/lib/libssl/unit/cipher_list.c b/src/regress/lib/libssl/unit/cipher_list.c
index e19acaa3ea..70f547abd6 100644
--- a/src/regress/lib/libssl/unit/cipher_list.c
+++ b/src/regress/lib/libssl/unit/cipher_list.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cipher_list.c,v 1.8 2017/10/11 17:35:53 jsing Exp $ */ 1/* $OpenBSD: cipher_list.c,v 1.9 2018/06/02 16:35:02 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2015 Doug Hogan <doug@openbsd.org> 3 * Copyright (c) 2015 Doug Hogan <doug@openbsd.org>
4 * Copyright (c) 2015 Joel Sing <jsing@openbsd.org> 4 * Copyright (c) 2015 Joel Sing <jsing@openbsd.org>
@@ -49,7 +49,6 @@ static uint8_t cipher_bytes[] = {
49 0xcc, 0xaa, /* DHE-RSA-CHACHA20-POLY1305 */ 49 0xcc, 0xaa, /* DHE-RSA-CHACHA20-POLY1305 */
50 0x00, 0x9c, /* AES128-GCM-SHA256 */ 50 0x00, 0x9c, /* AES128-GCM-SHA256 */
51 0x00, 0x3d, /* AES256-SHA256 */ 51 0x00, 0x3d, /* AES256-SHA256 */
52 0x00, 0x09, /* DES-CBC-SHA */
53}; 52};
54 53
55static uint16_t cipher_values[] = { 54static uint16_t cipher_values[] = {
@@ -58,7 +57,6 @@ static uint16_t cipher_values[] = {
58 0xccaa, /* DHE-RSA-CHACHA20-POLY1305 */ 57 0xccaa, /* DHE-RSA-CHACHA20-POLY1305 */
59 0x009c, /* AES128-GCM-SHA256 */ 58 0x009c, /* AES128-GCM-SHA256 */
60 0x003d, /* AES256-SHA256 */ 59 0x003d, /* AES256-SHA256 */
61 0x0009, /* DES-CBC-SHA */
62}; 60};
63 61
64#define N_CIPHERS (sizeof(cipher_bytes) / 2) 62#define N_CIPHERS (sizeof(cipher_bytes) / 2)
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-20 10:39:32 +0000