Fix SRP ciphersuites.
Add patch missed from backport of SRP ciphersuite fix. PR#3490 Reviewed-by: Kurt Roeckx <kurt@openssl.org>
This commit is contained in:
parent
30fbe92c78
commit
03ebf85f77
11
ssl/s3_lib.c
11
ssl/s3_lib.c
@ -3822,10 +3822,15 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
|
|||||||
emask_k = cert->export_mask_k;
|
emask_k = cert->export_mask_k;
|
||||||
emask_a = cert->export_mask_a;
|
emask_a = cert->export_mask_a;
|
||||||
#ifndef OPENSSL_NO_SRP
|
#ifndef OPENSSL_NO_SRP
|
||||||
mask_k=cert->mask_k | s->srp_ctx.srp_Mask;
|
if (s->srp_ctx.srp_Mask & SSL_kSRP)
|
||||||
emask_k=cert->export_mask_k | s->srp_ctx.srp_Mask;
|
{
|
||||||
|
mask_k |= SSL_kSRP;
|
||||||
|
emask_k |= SSL_kSRP;
|
||||||
|
mask_a |= SSL_aSRP;
|
||||||
|
emask_a |= SSL_aSRP;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef KSSL_DEBUG
|
#ifdef KSSL_DEBUG
|
||||||
/* printf("ssl3_choose_cipher %d alg= %lx\n", i,c->algorithms);*/
|
/* printf("ssl3_choose_cipher %d alg= %lx\n", i,c->algorithms);*/
|
||||||
#endif /* KSSL_DEBUG */
|
#endif /* KSSL_DEBUG */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user