diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-12-08 13:15:38 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-12-08 13:15:38 +0000 |
| commit | 7a014dceb61236803270f5c6022b82a2c656e0a1 (patch) | |
| tree | 9b5ee21cc9be0f68ab0d003aaa42a81244e3340e /ssl/s3_srvr.c | |
| parent | 1ff44a99a40567eec99efbc6059872e7912a89b9 (diff) | |
Add support for magic cipher suite value (MCSV). Make secure renegotiation
work in SSLv3: initial handshake has no extensions but includes MCSV, if
server indicates RI support then renegotiation handshakes include RI.
NB: current MCSV value is bogus for testing only, will be updated when we
have an official value.
Change mismatch alerts to handshake_failure as required by spec.
Also have some debugging fprintfs so we can clearly see what is going on
if OPENSSL_RI_DEBUG is set.
Diffstat (limited to 'ssl/s3_srvr.c')
| -rw-r--r-- | ssl/s3_srvr.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index a685fd5f0b..a3bb3aef1e 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -957,7 +957,7 @@ int ssl3_get_client_hello(SSL *s) #ifndef OPENSSL_NO_TLSEXT /* TLS extensions*/ - if (s->version > SSL3_VERSION && s->version != DTLS1_VERSION && s->version != DTLS1_BAD_VER) + if (s->version >= SSL3_VERSION) { if (!ssl_parse_clienthello_tlsext(s,&p,d,n, &al)) { @@ -970,17 +970,6 @@ int ssl3_get_client_hello(SSL *s) SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT); goto err; } - - /* DTLS extensions */ - if (s->version == DTLS1_VERSION || s->version == DTLS1_BAD_VER) - { - if (!ssl_parse_clienthello_dtlsext(s,&p,d,n, &al)) - { - /* 'al' set by ssl_parse_clienthello_dtlsext */ - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_PARSE_TLSEXT); - goto f_err; - } - } #endif /* Worst case, we will use the NULL compression, but if we have other * options, we will now look for them. We have i-1 compression |