diff options
| author | jkim <jkim@FreeBSD.org> | 2014-08-07 21:04:42 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-08-07 21:04:42 +0000 |
| commit | 2bfd7007417a2cd7c442bf1162e609303f217744 (patch) | |
| tree | 2ead8295addf0f92cbe4bf28f39105c909a6702f /crypto/openssl/ssl/ssl_lib.c | |
| parent | 95576e5070819ac5bc80e16b237dc5a0061ed9a4 (diff) | |
| download | FreeBSD-src-2bfd7007417a2cd7c442bf1162e609303f217744.zip FreeBSD-src-2bfd7007417a2cd7c442bf1162e609303f217744.tar.gz | |
MFC: r269682
Merge OpenSSL 1.0.1i.
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 ef6258c..82a2c80 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; } |
