diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-11-25 00:18:10 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-11-25 00:18:10 +0000 |
| commit | 2c7d978c2d4db664d1c5d164685480eed818d281 (patch) | |
| tree | c61562b448898555f5f964e86cf62d5a0fc6a805 /ssl/s3_clnt.c | |
| parent | 8cd897a42c973ed3a76ef1946f0d9eda1b6b12ec (diff) | |
PR: 1794
Submitted by: Peter Sylvester <peter.sylvester@edelweb.fr>
Reviewed by: steve
Make SRP conformant to rfc 5054.
Changes are:
- removal of the addition state after client hello
- removal of all pre-rfc srp alert ids
- sending a fatal alert when there is no srp extension but when the
server wants SRP
- removal of unnecessary code in the client.
Diffstat (limited to 'ssl/s3_clnt.c')
| -rw-r--r-- | ssl/s3_clnt.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 26673cfdee..d1110e02c3 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -280,20 +280,6 @@ int ssl3_connect(SSL *s) case SSL3_ST_CR_SRVR_HELLO_A: case SSL3_ST_CR_SRVR_HELLO_B: ret=ssl3_get_server_hello(s); -#ifndef OPENSSL_NO_SRP - if (ret == 0 && s->s3->warn_alert == SSL_AD_MISSING_SRP_USERNAME) - { - if (!SRP_have_to_put_srp_username(s)) - { - SSLerr(SSL_F_SSL3_CONNECT,SSL_R_MISSING_SRP_USERNAME); - ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_USER_CANCELLED); - goto end; - } - s->state=SSL3_ST_CW_CLNT_HELLO_A; - if (!ssl_init_wbio_buffer(s,0)) { ret= -1; goto end; } - break; - } -#endif if (ret <= 0) goto end; if (s->hit) |