diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-05-18 23:29:57 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-05-19 14:05:29 +0100 |
| commit | 4d69f9e69d2f5069ab37da68f4b93a6f337fb13e (patch) | |
| tree | 0965207983caf836e56722f30bef899ada5334be /ssl/s3_lib.c | |
| parent | 00d565cfbe90fab3b157e644caca4eb4a2ebec79 (diff) | |
| download | openssl-4d69f9e69d2f5069ab37da68f4b93a6f337fb13e.zip openssl-4d69f9e69d2f5069ab37da68f4b93a6f337fb13e.tar.gz openssl-4d69f9e69d2f5069ab37da68f4b93a6f337fb13e.tar.bz2 | |
move masks out of CERT structure
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index c28c447..78e95fc 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -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; |