diff options
| author | David Benjamin <davidben@chromium.org> | 2014-11-14 02:05:55 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-11-19 01:21:52 +0300 |
| commit | f31e681acf57cf31d6e608266311e968217b1715 (patch) | |
| tree | e1b873b04f4c582d7b92bf475c9f7470cfe0f4b6 /ssl/t1_lib.c | |
| parent | 81257cb2e0cbb80edd8a368a797ee95763a05fc3 (diff) | |
Clean up ssl_set_cert_masks.
It doesn't depend on the cipher now that export ciphers are gone. It need only
be called once. Also remove the valid bit; nothing ever reads it. Its output is
also only used within a function, so make mask_k and mask_a local variables.
So all the configuration-based checks are in one place, change the input
parameter from CERT to SSL and move the PSK and ECDHE checks to the mask
computation. This avoids having to evaluate the temporary EC key for each
cipher.
The remaining uses are on the client which uses them differently (disabled
features rather than enabled ones). Those too may as well be local variables,
so leave a TODO.
Change-Id: Ibcb574341795d4016ea749f0290a793eed798874
Reviewed-on: https://boringssl-review.googlesource.com/2287
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'ssl/t1_lib.c')
| -rw-r--r-- | ssl/t1_lib.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index c31720c5..a3d72283 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -877,7 +877,6 @@ void ssl_set_client_disabled(SSL *s) c->mask_a |= SSL_aPSK; c->mask_k |= SSL_kPSK; } - c->valid = 1; } /* header_len is the length of the ClientHello header written so far, used to |