generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move masks out of CERT structure

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Dr. Stephen Henson
2015-05-18 23:29:57 +01:00
parent 00d565cfbe
commit 4d69f9e69d
7 changed files with 39 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ssl/s3_lib.c
View File

@@ -3843,11 +3843,9 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
SSL_CIPHER *c, *ret = NULL;
STACK_OF(SSL_CIPHER) *prio, *allow;
int i, ii, ok;
CERT *cert;
unsigned long alg_k, alg_a, mask_k, mask_a, emask_k, emask_a;
/* Let's see which ciphers we can support */
cert = s->cert;
#if 0
/*
@@ -3893,10 +3891,10 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
continue;
ssl_set_masks(s, c);
mask_k = cert->mask_k;
mask_a = cert->mask_a;
emask_k = cert->export_mask_k;
emask_a = cert->export_mask_a;
mask_k = s->s3->tmp.mask_k;
mask_a = s->s3->tmp.mask_a;
emask_k = s->s3->tmp.export_mask_k;
emask_a = s->s3->tmp.export_mask_a;
#ifndef OPENSSL_NO_SRP
if (s->srp_ctx.srp_Mask & SSL_kSRP) {
mask_k |= SSL_kSRP;