diff options
| author | Ben Laurie <ben@openssl.org> | 2012-10-05 12:50:24 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2012-10-05 12:50:24 +0000 |
| commit | 48bcdad0d564c3514a7473fa9e9e360780ee807a (patch) | |
| tree | 27220a4b82188c7d467636c3519c5d44383ed52c /ssl/s3_srvr.c | |
| parent | f7d2402cabbb453c878a4ddf18828b1b220ac909 (diff) | |
Backport OCSP fix.
Diffstat (limited to 'ssl/s3_srvr.c')
| -rw-r--r-- | ssl/s3_srvr.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 5ada1f1550..e49fc959c4 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -1005,7 +1005,7 @@ int ssl3_get_client_hello(SSL *s) goto f_err; } } - if (ssl_check_clienthello_tlsext(s) <= 0) { + if (ssl_check_clienthello_tlsext_early(s) <= 0) { SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT); goto err; } @@ -1131,6 +1131,16 @@ int ssl3_get_client_hello(SSL *s) * s->tmp.new_cipher - the new cipher to use. */ + /* Handles TLS extensions that we couldn't check earlier */ + if (s->version >= SSL3_VERSION) + { + if (ssl_check_clienthello_tlsext_late(s) <= 0) + { + SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT); + goto err; + } + } + if (ret < 0) ret=1; if (0) { |