diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-08-07 18:56:10 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-08-07 18:56:10 +0000 |
| commit | a93cbc2be851ef88019a97cf7a22ba24e3a88fe1 (patch) | |
| tree | 466b55a31fe1a87db4dfcbef9e5d2f3e8aec65e1 /crypto/openssl/ssl/ssl_lib.c | |
| parent | e68c8d7f2bc3b4412a6f6acdb3fa15887a9dbb61 (diff) | |
| parent | cb6864802ed26a1031701a6a385961592a5cac25 (diff) | |
| download | src-a93cbc2be851ef88019a97cf7a22ba24e3a88fe1.tar.gz src-a93cbc2be851ef88019a97cf7a22ba24e3a88fe1.zip | |
Merge OpenSSL 1.0.1i.
Notes
Notes:
svn path=/head/; revision=269682
Diffstat (limited to 'crypto/openssl/ssl/ssl_lib.c')
| -rw-r--r-- | crypto/openssl/ssl/ssl_lib.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/crypto/openssl/ssl/ssl_lib.c b/crypto/openssl/ssl/ssl_lib.c index ef6258ca9f06..82a2c801292c 100644 --- a/crypto/openssl/ssl/ssl_lib.c +++ b/crypto/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; } |