diff options
author | miod <> | 2014-07-16 17:38:19 +0000 |
---|---|---|
committer | miod <> | 2014-07-16 17:38:19 +0000 |
commit | 1cfb5285ba49777aca7d73ffbf7e71f49fbb9948 (patch) | |
tree | f0dde257de04a54414fa6c62aca8e1ef91c1e50b | |
parent | 8facaecdb2eae4335d0820015add5b7dc8bcb069 (diff) | |
download | openbsd-1cfb5285ba49777aca7d73ffbf7e71f49fbb9948.tar.gz openbsd-1cfb5285ba49777aca7d73ffbf7e71f49fbb9948.tar.bz2 openbsd-1cfb5285ba49777aca7d73ffbf7e71f49fbb9948.zip |
Fix tlsext_tick_lifetime_hint value in test #2 to make sure the
(tlsext_tick_lifetime_hint > 0) test also passes on 32-bit platforms
(tlsext_tick_lifetime_hint is a long).
-rw-r--r-- | src/regress/lib/libssl/asn1/asn1test.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/src/regress/lib/libssl/asn1/asn1test.c b/src/regress/lib/libssl/asn1/asn1test.c index 135c6ee04a..cdc9b14db3 100644 --- a/src/regress/lib/libssl/asn1/asn1test.c +++ b/src/regress/lib/libssl/asn1/asn1test.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: asn1test.c,v 1.1 2014/07/13 16:03:54 jsing Exp $ */ | 1 | /* $OpenBSD: asn1test.c,v 1.2 2014/07/16 17:38:19 miod Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -115,12 +115,12 @@ struct ssl_asn1_test ssl_asn1_tests[] = { | |||
115 | .timeout = 5, | 115 | .timeout = 5, |
116 | .verify_result = 42, | 116 | .verify_result = 42, |
117 | .tlsext_hostname = "libressl.openbsd.org", | 117 | .tlsext_hostname = "libressl.openbsd.org", |
118 | .tlsext_tick_lifetime_hint = 0xaabbccdd, | 118 | .tlsext_tick_lifetime_hint = 0x7abbccdd, |
119 | .tlsext_tick = tlsext_tick, | 119 | .tlsext_tick = tlsext_tick, |
120 | .tlsext_ticklen = 207, | 120 | .tlsext_ticklen = 207, |
121 | }, | 121 | }, |
122 | { | 122 | { |
123 | 0x30, 0x82, 0x01, 0x59, 0x02, 0x01, 0x01, 0x02, | 123 | 0x30, 0x82, 0x01, 0x58, 0x02, 0x01, 0x01, 0x02, |
124 | 0x02, 0x03, 0x03, 0x04, 0x02, 0x00, 0x01, 0x04, | 124 | 0x02, 0x03, 0x03, 0x04, 0x02, 0x00, 0x01, 0x04, |
125 | 0x0a, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, | 125 | 0x0a, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, |
126 | 0x37, 0x38, 0x39, 0x04, 0x1a, 0x00, 0x00, 0x00, | 126 | 0x37, 0x38, 0x39, 0x04, 0x1a, 0x00, 0x00, 0x00, |
@@ -136,36 +136,36 @@ struct ssl_asn1_test ssl_asn1_tests[] = { | |||
136 | 0x16, 0x04, 0x14, 0x6c, 0x69, 0x62, 0x72, 0x65, | 136 | 0x16, 0x04, 0x14, 0x6c, 0x69, 0x62, 0x72, 0x65, |
137 | 0x73, 0x73, 0x6c, 0x2e, 0x6f, 0x70, 0x65, 0x6e, | 137 | 0x73, 0x73, 0x6c, 0x2e, 0x6f, 0x70, 0x65, 0x6e, |
138 | 0x62, 0x73, 0x64, 0x2e, 0x6f, 0x72, 0x67, 0xa9, | 138 | 0x62, 0x73, 0x64, 0x2e, 0x6f, 0x72, 0x67, 0xa9, |
139 | 0x07, 0x02, 0x05, 0x00, 0xaa, 0xbb, 0xcc, 0xdd, | 139 | 0x06, 0x02, 0x04, 0x7a, 0xbb, 0xcc, 0xdd, 0xaa, |
140 | 0xaa, 0x81, 0xd2, 0x04, 0x81, 0xcf, 0x43, 0x56, | 140 | 0x81, 0xd2, 0x04, 0x81, 0xcf, 0x43, 0x56, 0x45, |
141 | 0x45, 0x2d, 0x32, 0x30, 0x31, 0x34, 0x2d, 0x30, | 141 | 0x2d, 0x32, 0x30, 0x31, 0x34, 0x2d, 0x30, 0x31, |
142 | 0x31, 0x36, 0x30, 0x3a, 0x20, 0x37, 0x74, 0x68, | 142 | 0x36, 0x30, 0x3a, 0x20, 0x37, 0x74, 0x68, 0x20, |
143 | 0x20, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x20, 0x32, | 143 | 0x41, 0x70, 0x72, 0x69, 0x6c, 0x20, 0x32, 0x30, |
144 | 0x30, 0x31, 0x34, 0x0a, 0x43, 0x56, 0x45, 0x2d, | 144 | 0x31, 0x34, 0x0a, 0x43, 0x56, 0x45, 0x2d, 0x32, |
145 | 0x32, 0x30, 0x31, 0x30, 0x2d, 0x35, 0x32, 0x39, | 145 | 0x30, 0x31, 0x30, 0x2d, 0x35, 0x32, 0x39, 0x38, |
146 | 0x38, 0x3a, 0x20, 0x38, 0x74, 0x68, 0x20, 0x41, | 146 | 0x3a, 0x20, 0x38, 0x74, 0x68, 0x20, 0x41, 0x70, |
147 | 0x70, 0x72, 0x69, 0x6c, 0x20, 0x32, 0x30, 0x31, | ||
148 | 0x34, 0x0a, 0x43, 0x56, 0x45, 0x2d, 0x32, 0x30, | ||
149 | 0x31, 0x34, 0x2d, 0x30, 0x31, 0x39, 0x38, 0x3a, | ||
150 | 0x20, 0x32, 0x31, 0x73, 0x74, 0x20, 0x41, 0x70, | ||
151 | 0x72, 0x69, 0x6c, 0x20, 0x32, 0x30, 0x31, 0x34, | 147 | 0x72, 0x69, 0x6c, 0x20, 0x32, 0x30, 0x31, 0x34, |
152 | 0x0a, 0x43, 0x56, 0x45, 0x2d, 0x32, 0x30, 0x31, | 148 | 0x0a, 0x43, 0x56, 0x45, 0x2d, 0x32, 0x30, 0x31, |
153 | 0x34, 0x2d, 0x33, 0x34, 0x37, 0x30, 0x3a, 0x20, | 149 | 0x34, 0x2d, 0x30, 0x31, 0x39, 0x38, 0x3a, 0x20, |
154 | 0x33, 0x30, 0x74, 0x68, 0x20, 0x4d, 0x61, 0x79, | 150 | 0x32, 0x31, 0x73, 0x74, 0x20, 0x41, 0x70, 0x72, |
155 | 0x20, 0x32, 0x30, 0x31, 0x34, 0x0a, 0x43, 0x56, | 151 | 0x69, 0x6c, 0x20, 0x32, 0x30, 0x31, 0x34, 0x0a, |
156 | 0x45, 0x2d, 0x32, 0x30, 0x31, 0x34, 0x2d, 0x30, | ||
157 | 0x31, 0x39, 0x35, 0x3a, 0x20, 0x35, 0x74, 0x68, | ||
158 | 0x20, 0x4a, 0x75, 0x6e, 0x65, 0x20, 0x32, 0x30, | ||
159 | 0x31, 0x34, 0x0a, 0x43, 0x56, 0x45, 0x2d, 0x32, | ||
160 | 0x30, 0x31, 0x34, 0x2d, 0x30, 0x32, 0x32, 0x31, | ||
161 | 0x3a, 0x20, 0x35, 0x74, 0x68, 0x20, 0x4a, 0x75, | ||
162 | 0x6e, 0x65, 0x20, 0x32, 0x30, 0x31, 0x34, 0x0a, | ||
163 | 0x43, 0x56, 0x45, 0x2d, 0x32, 0x30, 0x31, 0x34, | 152 | 0x43, 0x56, 0x45, 0x2d, 0x32, 0x30, 0x31, 0x34, |
164 | 0x2d, 0x30, 0x32, 0x32, 0x34, 0x3a, 0x20, 0x35, | 153 | 0x2d, 0x33, 0x34, 0x37, 0x30, 0x3a, 0x20, 0x33, |
165 | 0x74, 0x68, 0x20, 0x4a, 0x75, 0x6e, 0x65, 0x20, | 154 | 0x30, 0x74, 0x68, 0x20, 0x4d, 0x61, 0x79, 0x20, |
166 | 0x32, 0x30, 0x31, 0x34, 0x0a, | 155 | 0x32, 0x30, 0x31, 0x34, 0x0a, 0x43, 0x56, 0x45, |
156 | 0x2d, 0x32, 0x30, 0x31, 0x34, 0x2d, 0x30, 0x31, | ||
157 | 0x39, 0x35, 0x3a, 0x20, 0x35, 0x74, 0x68, 0x20, | ||
158 | 0x4a, 0x75, 0x6e, 0x65, 0x20, 0x32, 0x30, 0x31, | ||
159 | 0x34, 0x0a, 0x43, 0x56, 0x45, 0x2d, 0x32, 0x30, | ||
160 | 0x31, 0x34, 0x2d, 0x30, 0x32, 0x32, 0x31, 0x3a, | ||
161 | 0x20, 0x35, 0x74, 0x68, 0x20, 0x4a, 0x75, 0x6e, | ||
162 | 0x65, 0x20, 0x32, 0x30, 0x31, 0x34, 0x0a, 0x43, | ||
163 | 0x56, 0x45, 0x2d, 0x32, 0x30, 0x31, 0x34, 0x2d, | ||
164 | 0x30, 0x32, 0x32, 0x34, 0x3a, 0x20, 0x35, 0x74, | ||
165 | 0x68, 0x20, 0x4a, 0x75, 0x6e, 0x65, 0x20, 0x32, | ||
166 | 0x30, 0x31, 0x34, 0x0a, | ||
167 | }, | 167 | }, |
168 | 349, | 168 | 348, |
169 | }, | 169 | }, |
170 | }; | 170 | }; |
171 | 171 | ||