diff options
| author | Ben Laurie <ben@openssl.org> | 2009-11-08 12:14:55 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2009-11-08 12:14:55 +0000 |
| commit | d99a35f275be593de4f89cc94ac968f49dd66654 (patch) | |
| tree | 8c70ba23bff785a5080b1771aeb310cfba88b35a /ssl/s3_clnt.c | |
| parent | 949fbf073ad23fc0a25aa12011a0325901416180 (diff) | |
Revert renegotiation-breaking change.
Diffstat (limited to 'ssl/s3_clnt.c')
| -rw-r--r-- | ssl/s3_clnt.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 9929d0c92c..a76162646e 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -1744,28 +1744,7 @@ int ssl3_get_new_session_ticket(SSL *s) } memcpy(s->session->tlsext_tick, p, ticklen); s->session->tlsext_ticklen = ticklen; - /* There are two ways to detect a resumed ticket sesion. - * One is to set an appropriate session ID and then the server - * must return a match in ServerHello. This allows the normal - * client session ID matching to work and we know much - * earlier that the ticket has been accepted. - * - * The other way is to set zero length session ID when the - * ticket is presented and rely on the handshake to determine - * session resumption. - * - * We choose the former approach because this fits in with - * assumptions elsewhere in OpenSSL. The session ID is set - * to the SHA256 (or SHA1 is SHA256 is disabled) hash of the - * ticket. - */ - EVP_Digest(p, ticklen, - s->session->session_id, &s->session->session_id_length, -#ifndef OPENSSL_NO_SHA256 - EVP_sha256(), NULL); -#else - EVP_sha1(), NULL); -#endif + ret=1; return(ret); f_err: |