diff options
| author | Bodo Möller <bodo@openssl.org> | 2006-01-09 19:49:05 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2006-01-09 19:49:05 +0000 |
| commit | a13c20f60353d3cd3fdd4f23563819eeb4234528 (patch) | |
| tree | 41093ca4eea2561f146a82410964982868dfb7b9 /ssl/s3_srvr.c | |
| parent | db6251ad54933af46356c6a2e49d6b2fff55d083 (diff) | |
Further TLS extension updates
Submitted by: Peter Sylvester
Diffstat (limited to 'ssl/s3_srvr.c')
| -rw-r--r-- | ssl/s3_srvr.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 954959404a..c83505c0a5 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -283,14 +283,16 @@ int ssl3_accept(SSL *s) if (ret <= 0) goto end; #ifndef OPENSSL_NO_TLSEXT { - int al; - if (ssl_check_tlsext(s,&al) <= 0) - { - ssl3_send_alert(s,SSL3_AL_FATAL,al); /* XXX does this *have* to be fatal? */ + int al,warn; + warn = ssl_check_tlsext(s,&al); + if (warn == 0) + ssl3_send_alert(s,SSL3_AL_WARNING,al); + else if (warn < 0) { + ssl3_send_alert(s,SSL3_AL_FATAL,al); SSLerr(SSL_F_SSL3_ACCEPT,SSL_R_CLIENTHELLO_TLS_EXT); ret = -1; goto end; - } + } } #endif s->new_session = 2; |