diff options
author | marha <marha@users.sourceforge.net> | 2014-09-02 18:24:12 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-09-02 18:26:00 +0200 |
commit | 04168ae281bfbd714ddf6b90d98eac892508dde8 (patch) | |
tree | c2d7e42dede9c0b9930ce537eb7d804e45459e53 /openssl/ssl/ssl_lib.c | |
parent | e21655632e3fd40b7f6a5cc3c7f3c379d54557c4 (diff) | |
download | vcxsrv-04168ae281bfbd714ddf6b90d98eac892508dde8.tar.gz vcxsrv-04168ae281bfbd714ddf6b90d98eac892508dde8.tar.bz2 vcxsrv-04168ae281bfbd714ddf6b90d98eac892508dde8.zip |
Upgrade openssl to version openssl-1.0.1i
Diffstat (limited to 'openssl/ssl/ssl_lib.c')
-rw-r--r-- | openssl/ssl/ssl_lib.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/openssl/ssl/ssl_lib.c b/openssl/ssl/ssl_lib.c index ef6258ca9..82a2c8012 100644 --- a/openssl/ssl/ssl_lib.c +++ b/openssl/ssl/ssl_lib.c @@ -1406,6 +1406,11 @@ int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p, s->psk_client_callback == NULL) continue; #endif /* OPENSSL_NO_PSK */ +#ifndef OPENSSL_NO_SRP + if (((c->algorithm_mkey & SSL_kSRP) || (c->algorithm_auth & SSL_aSRP)) && + !(s->srp_ctx.srp_Mask & SSL_kSRP)) + continue; +#endif /* OPENSSL_NO_SRP */ j = put_cb ? put_cb(c,p) : ssl_put_cipher_by_char(s,c,p); p+=j; } |