diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-10-24 03:36:13 +0200 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-01-02 23:56:54 +0100 |
| commit | 63eab8a620944a990ab3985620966ccd9f48d681 (patch) | |
| tree | 3b937e1e9016a526f6ed21747f99f039477fe86e /ssl/d1_srvr.c | |
| parent | Clear existing extension state. (diff) | |
| download | openssl-63eab8a620944a990ab3985620966ccd9f48d681.tar.xz openssl-63eab8a620944a990ab3985620966ccd9f48d681.zip | |
Remove MS SGC
MS Server gated cryptography is obsolete and dates from the time of export
restrictions on strong encryption and is only used by ancient versions of
MSIE.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl/d1_srvr.c')
| -rw-r--r-- | ssl/d1_srvr.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c index 0cdc51be23..bcadd310fd 100644 --- a/ssl/d1_srvr.c +++ b/ssl/d1_srvr.c @@ -610,24 +610,13 @@ int dtls1_accept(SSL *s) case SSL3_ST_SR_CERT_A: case SSL3_ST_SR_CERT_B: - /* Check for second client hello (MS SGC) */ - ret = ssl3_check_client_hello(s); - if (ret <= 0) - goto end; - if (ret == 2) + if (s->s3->tmp.cert_request) { - dtls1_stop_timer(s); - s->state = SSL3_ST_SR_CLNT_HELLO_C; + ret=ssl3_get_client_certificate(s); + if (ret <= 0) goto end; } - else { - if (s->s3->tmp.cert_request) - { - ret=ssl3_get_client_certificate(s); - if (ret <= 0) goto end; - } - s->init_num=0; - s->state=SSL3_ST_SR_KEY_EXCH_A; - } + s->init_num=0; + s->state=SSL3_ST_SR_KEY_EXCH_A; break; case SSL3_ST_SR_KEY_EXCH_A: |