diff options
| author | Bodo Möller <bodo@openssl.org> | 2006-01-13 09:21:10 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2006-01-13 09:21:10 +0000 |
| commit | 58ece83395dadd910842926f367474bfefcb982a (patch) | |
| tree | 12a44d7ae46481f22f2a14edcf2cc180c836c0de /ssl/s3_clnt.c | |
| parent | c75c096aa8469523f394ed2980efbdde44d17c6f (diff) | |
Further TLS extension improvements
Submitted by: Peter Sylvester
Diffstat (limited to 'ssl/s3_clnt.c')
| -rw-r--r-- | ssl/s3_clnt.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index d50f588b94..995c8298b8 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -255,25 +255,7 @@ int ssl3_connect(SSL *s) case SSL3_ST_CR_SRVR_HELLO_B: ret=ssl3_get_server_hello(s); if (ret <= 0) goto end; -#ifndef OPENSSL_NO_TLSEXT - { - int al; - switch (ssl_check_tlsext(s,&al)) - { - case SSL_TLSEXT_ERR_ALERT_FATAL: - ssl3_send_alert(s,SSL3_AL_FATAL,al); - SSLerr(SSL_F_SSL3_CONNECT,SSL_R_SERVERHELLO_TLS_EXT); - ret = -1; - goto end; - case SSL_TLSEXT_ERR_ALERT_WARNING: - ssl3_send_alert(s,SSL3_AL_WARNING,al); - - default: - ; - } - } -#endif if (s->hit) s->state=SSL3_ST_CR_FINISHED_A; else @@ -822,6 +804,11 @@ int ssl3_get_server_hello(SSL *s) SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_PARSE_TLS_EXT); goto f_err; } + if (ssl_check_tlsext(s,0) <= 0) + { + SSLerr(SSL_F_SSL3_CONNECT,SSL_R_SERVERHELLO_TLS_EXT); + goto err; + } } #endif |