]>
Commit | Line | Data |
---|---|---|
d4092763 | 1 | This patch adds support for TLS SessionTicket extension (RFC 5077) for |
6fc6879b JM |
2 | the parts used by EAP-FAST (RFC 4851). |
3 | ||
4 | This is based on the patch from Alexey Kobozev <akobozev@cisco.com> | |
5 | (sent to openssl-dev mailing list on Tue, 07 Jun 2005 15:40:58 +0300). | |
6 | ||
7 | ||
8 | ||
d13c05ca | 9 | Index: openssl-SNAP-20081111/ssl/s3_clnt.c |
3d1aa251 | 10 | =================================================================== |
d13c05ca JM |
11 | --- openssl-SNAP-20081111.orig/ssl/s3_clnt.c |
12 | +++ openssl-SNAP-20081111/ssl/s3_clnt.c | |
13 | @@ -788,6 +788,23 @@ int ssl3_get_server_hello(SSL *s) | |
6fc6879b JM |
14 | goto f_err; |
15 | } | |
16 | ||
6fc6879b | 17 | +#ifndef OPENSSL_NO_TLSEXT |
d4092763 | 18 | + /* check if we want to resume the session based on external pre-shared secret */ |
6fc6879b | 19 | + if (s->version >= TLS1_VERSION && s->tls_session_secret_cb) |
d13c05ca | 20 | + { |
6fc6879b JM |
21 | + SSL_CIPHER *pref_cipher=NULL; |
22 | + s->session->master_key_length=sizeof(s->session->master_key); | |
d13c05ca JM |
23 | + if (s->tls_session_secret_cb(s, s->session->master_key, |
24 | + &s->session->master_key_length, | |
25 | + NULL, &pref_cipher, | |
26 | + s->tls_session_secret_cb_arg)) | |
27 | + { | |
28 | + s->session->cipher = pref_cipher ? | |
29 | + pref_cipher : ssl_get_cipher_by_char(s, p+j); | |
30 | + } | |
6fc6879b | 31 | + } |
6fc6879b JM |
32 | +#endif /* OPENSSL_NO_TLSEXT */ |
33 | + | |
d4092763 | 34 | if (j != 0 && j == s->session->session_id_length |
6fc6879b JM |
35 | && memcmp(p,s->session->session_id,j) == 0) |
36 | { | |
d13c05ca | 37 | @@ -2927,11 +2944,8 @@ static int ssl3_check_finished(SSL *s) |
88160457 JM |
38 | { |
39 | int ok; | |
40 | long n; | |
41 | - /* If we have no ticket or session ID is non-zero length (a match of | |
42 | - * a non-zero session length would never reach here) it cannot be a | |
43 | - * resumed session. | |
44 | - */ | |
45 | - if (!s->session->tlsext_tick || s->session->session_id_length) | |
46 | + /* If we have no ticket it cannot be a resumed session. */ | |
47 | + if (!s->session->tlsext_tick) | |
48 | return 1; | |
49 | /* this function is called when we really expect a Certificate | |
50 | * message, so permit appropriate message length */ | |
d13c05ca | 51 | Index: openssl-SNAP-20081111/ssl/s3_srvr.c |
3d1aa251 | 52 | =================================================================== |
d13c05ca JM |
53 | --- openssl-SNAP-20081111.orig/ssl/s3_srvr.c |
54 | +++ openssl-SNAP-20081111/ssl/s3_srvr.c | |
1a647aaa | 55 | @@ -1010,6 +1010,59 @@ int ssl3_get_client_hello(SSL *s) |
6fc6879b JM |
56 | SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT); |
57 | goto err; | |
58 | } | |
59 | + | |
60 | + /* Check if we want to use external pre-shared secret for this | |
61 | + * handshake for not reused session only. We need to generate | |
62 | + * server_random before calling tls_session_secret_cb in order to allow | |
63 | + * SessionTicket processing to use it in key derivation. */ | |
64 | + { | |
65 | + unsigned long Time; | |
66 | + unsigned char *pos; | |
67 | + Time=(unsigned long)time(NULL); /* Time */ | |
68 | + pos=s->s3->server_random; | |
69 | + l2n(Time,pos); | |
70 | + if (RAND_pseudo_bytes(pos,SSL3_RANDOM_SIZE-4) <= 0) | |
d13c05ca | 71 | + { |
6fc6879b JM |
72 | + al=SSL_AD_INTERNAL_ERROR; |
73 | + goto f_err; | |
d13c05ca | 74 | + } |
6fc6879b JM |
75 | + } |
76 | + | |
77 | + if (!s->hit && s->version >= TLS1_VERSION && s->tls_session_secret_cb) | |
d13c05ca | 78 | + { |
6fc6879b JM |
79 | + SSL_CIPHER *pref_cipher=NULL; |
80 | + | |
81 | + s->session->master_key_length=sizeof(s->session->master_key); | |
3d1aa251 | 82 | + if(s->tls_session_secret_cb(s, s->session->master_key, &s->session->master_key_length, |
6fc6879b | 83 | + ciphers, &pref_cipher, s->tls_session_secret_cb_arg)) |
d13c05ca | 84 | + { |
6fc6879b JM |
85 | + s->hit=1; |
86 | + s->session->ciphers=ciphers; | |
87 | + s->session->verify_result=X509_V_OK; | |
3d1aa251 | 88 | + |
6fc6879b | 89 | + ciphers=NULL; |
3d1aa251 | 90 | + |
6fc6879b JM |
91 | + /* check if some cipher was preferred by call back */ |
92 | + pref_cipher=pref_cipher ? pref_cipher : ssl3_choose_cipher(s, s->session->ciphers, SSL_get_ciphers(s)); | |
93 | + if (pref_cipher == NULL) | |
94 | + { | |
95 | + al=SSL_AD_HANDSHAKE_FAILURE; | |
96 | + SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_SHARED_CIPHER); | |
97 | + goto f_err; | |
98 | + } | |
99 | + | |
100 | + s->session->cipher=pref_cipher; | |
101 | + | |
102 | + if (s->cipher_list) | |
103 | + sk_SSL_CIPHER_free(s->cipher_list); | |
104 | + | |
105 | + if (s->cipher_list_by_id) | |
106 | + sk_SSL_CIPHER_free(s->cipher_list_by_id); | |
107 | + | |
108 | + s->cipher_list = sk_SSL_CIPHER_dup(s->session->ciphers); | |
109 | + s->cipher_list_by_id = sk_SSL_CIPHER_dup(s->session->ciphers); | |
d13c05ca | 110 | + } |
6fc6879b | 111 | + } |
6fc6879b JM |
112 | #endif |
113 | ||
114 | /* Worst case, we will use the NULL compression, but if we have other | |
1a647aaa | 115 | @@ -1134,16 +1187,22 @@ int ssl3_send_server_hello(SSL *s) |
6fc6879b JM |
116 | unsigned char *buf; |
117 | unsigned char *p,*d; | |
118 | int i,sl; | |
119 | - unsigned long l,Time; | |
120 | + unsigned long l; | |
121 | +#ifdef OPENSSL_NO_TLSEXT | |
122 | + unsigned long Time; | |
123 | +#endif | |
124 | ||
125 | if (s->state == SSL3_ST_SW_SRVR_HELLO_A) | |
126 | { | |
127 | buf=(unsigned char *)s->init_buf->data; | |
128 | +#ifdef OPENSSL_NO_TLSEXT | |
129 | p=s->s3->server_random; | |
130 | + /* Generate server_random if it was not needed previously */ | |
131 | Time=(unsigned long)time(NULL); /* Time */ | |
132 | l2n(Time,p); | |
133 | if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0) | |
134 | return -1; | |
135 | +#endif | |
136 | /* Do the message type and length last */ | |
137 | d=p= &(buf[4]); | |
138 | ||
d13c05ca | 139 | Index: openssl-SNAP-20081111/ssl/ssl_err.c |
3d1aa251 | 140 | =================================================================== |
d13c05ca JM |
141 | --- openssl-SNAP-20081111.orig/ssl/ssl_err.c |
142 | +++ openssl-SNAP-20081111/ssl/ssl_err.c | |
3d1aa251 JM |
143 | @@ -263,6 +263,7 @@ static ERR_STRING_DATA SSL_str_functs[]= |
144 | {ERR_FUNC(SSL_F_TLS1_PRF), "tls1_prf"}, | |
145 | {ERR_FUNC(SSL_F_TLS1_SETUP_KEY_BLOCK), "TLS1_SETUP_KEY_BLOCK"}, | |
146 | {ERR_FUNC(SSL_F_WRITE_PENDING), "WRITE_PENDING"}, | |
1b554eb0 | 147 | +{ERR_FUNC(SSL_F_SSL_SET_SESSION_TICKET_EXT), "SSL_set_session_ticket_ext"}, |
3d1aa251 JM |
148 | {0,NULL} |
149 | }; | |
150 | ||
d13c05ca | 151 | Index: openssl-SNAP-20081111/ssl/ssl.h |
3d1aa251 | 152 | =================================================================== |
d13c05ca JM |
153 | --- openssl-SNAP-20081111.orig/ssl/ssl.h |
154 | +++ openssl-SNAP-20081111/ssl/ssl.h | |
1a647aaa | 155 | @@ -355,6 +355,7 @@ extern "C" { |
6fc6879b JM |
156 | * 'struct ssl_st *' function parameters used to prototype callbacks |
157 | * in SSL_CTX. */ | |
158 | typedef struct ssl_st *ssl_crock_st; | |
1b554eb0 | 159 | +typedef struct tls_session_ticket_ext_st TLS_SESSION_TICKET_EXT; |
6fc6879b JM |
160 | |
161 | /* used to hold info on the particular ciphers used */ | |
162 | typedef struct ssl_cipher_st | |
1a647aaa | 163 | @@ -378,6 +379,8 @@ typedef struct ssl_cipher_st |
3d1aa251 JM |
164 | |
165 | DECLARE_STACK_OF(SSL_CIPHER) | |
6fc6879b JM |
166 | |
167 | +typedef int (*tls_session_secret_cb_fn)(SSL *s, void *secret, int *secret_len, STACK_OF(SSL_CIPHER) *peer_ciphers, SSL_CIPHER **cipher, void *arg); | |
168 | + | |
169 | /* Used to hold functions for SSLv2 or SSLv3/TLSv1 functions */ | |
170 | typedef struct ssl_method_st | |
171 | { | |
1a647aaa | 172 | @@ -1145,6 +1148,13 @@ struct ssl_st |
6fc6879b JM |
173 | void *tlsext_opaque_prf_input; |
174 | size_t tlsext_opaque_prf_input_len; | |
175 | ||
1b554eb0 JM |
176 | + /* TLS Session Ticket extension override */ |
177 | + TLS_SESSION_TICKET_EXT *tlsext_session_ticket; | |
6fc6879b JM |
178 | + |
179 | + /* TLS pre-shared secret session resumption */ | |
180 | + tls_session_secret_cb_fn tls_session_secret_cb; | |
181 | + void *tls_session_secret_cb_arg; | |
182 | + | |
183 | SSL_CTX * initial_ctx; /* initial ctx, used to store sessions */ | |
184 | #define session_ctx initial_ctx | |
185 | #else | |
1b554eb0 | 186 | @@ -1746,6 +1756,16 @@ void *SSL_COMP_get_compression_methods(v |
6fc6879b JM |
187 | int SSL_COMP_add_compression_method(int id,void *cm); |
188 | #endif | |
189 | ||
1b554eb0 JM |
190 | +/* NOTE: This function will be removed; it is only here for backwards |
191 | + * compatibility for the API during testing. */ | |
6fc6879b JM |
192 | +int SSL_set_hello_extension(SSL *s, int ext_type, void *ext_data, int ext_len); |
193 | + | |
1b554eb0 JM |
194 | +/* TLS extensions functions */ |
195 | +int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len); | |
196 | + | |
6fc6879b JM |
197 | +/* Pre-shared secret session resumption functions */ |
198 | +int SSL_set_session_secret_cb(SSL *s, tls_session_secret_cb_fn tls_session_secret_cb, void *arg); | |
199 | + | |
200 | /* BEGIN ERROR CODES */ | |
201 | /* The following lines are auto generated by the script mkerr.pl. Any changes | |
202 | * made after this point may be overwritten when the script is next run. | |
1b554eb0 | 203 | @@ -1948,6 +1968,7 @@ void ERR_load_SSL_strings(void); |
6fc6879b JM |
204 | #define SSL_F_TLS1_PRF 284 |
205 | #define SSL_F_TLS1_SETUP_KEY_BLOCK 211 | |
206 | #define SSL_F_WRITE_PENDING 212 | |
1b554eb0 | 207 | +#define SSL_F_SSL_SET_SESSION_TICKET_EXT 213 |
6fc6879b JM |
208 | |
209 | /* Reason codes. */ | |
210 | #define SSL_R_APP_DATA_IN_HANDSHAKE 100 | |
d13c05ca | 211 | Index: openssl-SNAP-20081111/ssl/ssl_sess.c |
3d1aa251 | 212 | =================================================================== |
d13c05ca JM |
213 | --- openssl-SNAP-20081111.orig/ssl/ssl_sess.c |
214 | +++ openssl-SNAP-20081111/ssl/ssl_sess.c | |
1b554eb0 | 215 | @@ -834,6 +834,62 @@ long SSL_CTX_get_timeout(const SSL_CTX * |
6fc6879b JM |
216 | return(s->session_timeout); |
217 | } | |
218 | ||
219 | +#ifndef OPENSSL_NO_TLSEXT | |
3d1aa251 | 220 | +int SSL_set_session_secret_cb(SSL *s, int (*tls_session_secret_cb)(SSL *s, void *secret, int *secret_len, |
6fc6879b | 221 | + STACK_OF(SSL_CIPHER) *peer_ciphers, SSL_CIPHER **cipher, void *arg), void *arg) |
d13c05ca | 222 | + { |
6fc6879b JM |
223 | + if (s == NULL) return(0); |
224 | + s->tls_session_secret_cb = tls_session_secret_cb; | |
225 | + s->tls_session_secret_cb_arg = arg; | |
226 | + return(1); | |
d13c05ca | 227 | + } |
6fc6879b | 228 | + |
1b554eb0 | 229 | +int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len) |
6fc6879b | 230 | + { |
d13c05ca | 231 | + if (s->version >= TLS1_VERSION) |
6fc6879b | 232 | + { |
1b554eb0 | 233 | + if (s->tlsext_session_ticket) |
d13c05ca | 234 | + { |
1b554eb0 JM |
235 | + OPENSSL_free(s->tlsext_session_ticket); |
236 | + s->tlsext_session_ticket = NULL; | |
d13c05ca | 237 | + } |
6fc6879b | 238 | + |
1b554eb0 JM |
239 | + s->tlsext_session_ticket = OPENSSL_malloc(sizeof(TLS_SESSION_TICKET_EXT) + ext_len); |
240 | + if (!s->tlsext_session_ticket) | |
d13c05ca | 241 | + { |
1b554eb0 | 242 | + SSLerr(SSL_F_SSL_SET_SESSION_TICKET_EXT, ERR_R_MALLOC_FAILURE); |
6fc6879b | 243 | + return 0; |
d13c05ca | 244 | + } |
6fc6879b | 245 | + |
d13c05ca JM |
246 | + if (ext_data) |
247 | + { | |
1b554eb0 JM |
248 | + s->tlsext_session_ticket->length = ext_len; |
249 | + s->tlsext_session_ticket->data = s->tlsext_session_ticket + 1; | |
250 | + memcpy(s->tlsext_session_ticket->data, ext_data, ext_len); | |
d13c05ca JM |
251 | + } |
252 | + else | |
253 | + { | |
1b554eb0 JM |
254 | + s->tlsext_session_ticket->length = 0; |
255 | + s->tlsext_session_ticket->data = NULL; | |
d13c05ca | 256 | + } |
6fc6879b JM |
257 | + |
258 | + return 1; | |
d13c05ca | 259 | + } |
6fc6879b JM |
260 | + |
261 | + return 0; | |
d13c05ca | 262 | + } |
1b554eb0 JM |
263 | + |
264 | +/* NOTE: This function will be removed; it is only here for backwards | |
265 | + * compatibility for the API during testing. */ | |
266 | +int SSL_set_hello_extension(SSL *s, int ext_type, void *ext_data, int ext_len) | |
267 | + { | |
268 | + if (ext_type != TLSEXT_TYPE_session_ticket) | |
269 | + return 0; | |
270 | + | |
271 | + return SSL_set_session_ticket_ext(s, ext_data, ext_len); | |
272 | + } | |
6fc6879b JM |
273 | +#endif /* OPENSSL_NO_TLSEXT */ |
274 | + | |
275 | typedef struct timeout_param_st | |
276 | { | |
277 | SSL_CTX *ctx; | |
d13c05ca | 278 | Index: openssl-SNAP-20081111/ssl/t1_lib.c |
3d1aa251 | 279 | =================================================================== |
d13c05ca JM |
280 | --- openssl-SNAP-20081111.orig/ssl/t1_lib.c |
281 | +++ openssl-SNAP-20081111/ssl/t1_lib.c | |
6fc6879b JM |
282 | @@ -154,6 +154,12 @@ int tls1_new(SSL *s) |
283 | ||
284 | void tls1_free(SSL *s) | |
285 | { | |
286 | +#ifndef OPENSSL_NO_TLSEXT | |
1b554eb0 | 287 | + if (s->tlsext_session_ticket) |
d13c05ca | 288 | + { |
1b554eb0 | 289 | + OPENSSL_free(s->tlsext_session_ticket); |
d13c05ca JM |
290 | + } |
291 | +#endif /* OPENSSL_NO_TLSEXT */ | |
6fc6879b JM |
292 | ssl3_free(s); |
293 | } | |
294 | ||
1b554eb0 | 295 | @@ -357,8 +363,23 @@ unsigned char *ssl_add_clienthello_tlsex |
6fc6879b JM |
296 | int ticklen; |
297 | if (s->session && s->session->tlsext_tick) | |
298 | ticklen = s->session->tlsext_ticklen; | |
1b554eb0 JM |
299 | + else if (s->session && s->tlsext_session_ticket && |
300 | + s->tlsext_session_ticket->data) | |
d13c05ca | 301 | + { |
1b554eb0 | 302 | + ticklen = s->tlsext_session_ticket->length; |
6fc6879b JM |
303 | + s->session->tlsext_tick = OPENSSL_malloc(ticklen); |
304 | + if (!s->session->tlsext_tick) | |
305 | + return NULL; | |
1b554eb0 JM |
306 | + memcpy(s->session->tlsext_tick, |
307 | + s->tlsext_session_ticket->data, | |
6fc6879b JM |
308 | + ticklen); |
309 | + s->session->tlsext_ticklen = ticklen; | |
d13c05ca | 310 | + } |
6fc6879b JM |
311 | else |
312 | ticklen = 0; | |
1b554eb0 JM |
313 | + if (ticklen == 0 && s->tlsext_session_ticket && |
314 | + s->tlsext_session_ticket->data == NULL) | |
6fc6879b JM |
315 | + goto skip_ext; |
316 | /* Check for enough room 2 for extension type, 2 for len | |
317 | * rest for ticket | |
318 | */ | |
1b554eb0 | 319 | @@ -371,6 +392,7 @@ unsigned char *ssl_add_clienthello_tlsex |
6fc6879b JM |
320 | ret += ticklen; |
321 | } | |
322 | } | |
323 | + skip_ext: | |
324 | ||
325 | #ifdef TLSEXT_TYPE_opaque_prf_input | |
326 | if (s->s3->client_opaque_prf_input != NULL) | |
1b554eb0 | 327 | @@ -1435,6 +1457,15 @@ int tls1_process_ticket(SSL *s, unsigned |
6fc6879b JM |
328 | s->tlsext_ticket_expected = 1; |
329 | return 0; /* Cache miss */ | |
330 | } | |
331 | + if (s->tls_session_secret_cb) | |
3d1aa251 JM |
332 | + { |
333 | + /* Indicate cache miss here and instead of | |
334 | + * generating the session from ticket now, | |
335 | + * trigger abbreviated handshake based on | |
336 | + * external mechanism to calculate the master | |
337 | + * secret later. */ | |
6fc6879b | 338 | + return 0; |
3d1aa251 | 339 | + } |
6fc6879b JM |
340 | return tls_decrypt_ticket(s, p, size, session_id, len, |
341 | ret); | |
342 | } | |
d13c05ca | 343 | Index: openssl-SNAP-20081111/ssl/tls1.h |
3d1aa251 | 344 | =================================================================== |
d13c05ca JM |
345 | --- openssl-SNAP-20081111.orig/ssl/tls1.h |
346 | +++ openssl-SNAP-20081111/ssl/tls1.h | |
1b554eb0 | 347 | @@ -512,6 +512,13 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_T |
6fc6879b JM |
348 | #define TLS_MD_MASTER_SECRET_CONST "\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74" /*master secret*/ |
349 | #endif | |
350 | ||
1b554eb0 JM |
351 | +/* TLS Session Ticket extension struct */ |
352 | +struct tls_session_ticket_ext_st | |
d13c05ca | 353 | + { |
6fc6879b JM |
354 | + unsigned short length; |
355 | + void *data; | |
d13c05ca | 356 | + }; |
6fc6879b JM |
357 | + |
358 | #ifdef __cplusplus | |
359 | } | |
360 | #endif | |
d13c05ca | 361 | Index: openssl-SNAP-20081111/util/ssleay.num |
3d1aa251 | 362 | =================================================================== |
d13c05ca JM |
363 | --- openssl-SNAP-20081111.orig/util/ssleay.num |
364 | +++ openssl-SNAP-20081111/util/ssleay.num | |
3d1aa251 JM |
365 | @@ -254,3 +254,5 @@ PEM_read_bio_SSL_SESSION |
366 | SSL_CTX_set_psk_server_callback 303 EXIST::FUNCTION:PSK | |
367 | SSL_get_psk_identity 304 EXIST::FUNCTION:PSK | |
368 | PEM_write_SSL_SESSION 305 EXIST:!WIN16:FUNCTION: | |
1b554eb0 | 369 | +SSL_set_session_ticket_ext 306 EXIST::FUNCTION:TLSEXT |
3d1aa251 | 370 | +SSL_set_session_secret_cb 307 EXIST::FUNCTION:TLSEXT |