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/ssl_locl.h | |
parent | 00d565cfbe90fab3b157e644caca4eb4a2ebec79 (diff) |
move masks out of CERT structure
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl/ssl_locl.h')
-rw-r--r-- | ssl/ssl_locl.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index d2ee6344ae..04e59085d2 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -1301,6 +1301,17 @@ typedef struct ssl3_state_st { * If zero it can't be used at all. */ int valid_flags[SSL_PKEY_NUM]; + /* + * For servers the following masks are for the key and auth algorithms + * that are supported by the certs below. For clients they are masks of + * *disabled* algorithms based on the current session. + */ + unsigned long mask_k; + unsigned long mask_a; + unsigned long export_mask_k; + unsigned long export_mask_a; + /* Client only */ + unsigned long mask_ssl; } tmp; /* Connection binding to prevent renegotiation attacks */ @@ -1509,18 +1520,6 @@ typedef struct cert_st { * an index, not a pointer. */ CERT_PKEY *key; - /* - * For servers the following masks are for the key and auth algorithms - * that are supported by the certs below. For clients they are masks of - * *disabled* algorithms based on the current session. - */ - int valid; - unsigned long mask_k; - unsigned long mask_a; - unsigned long export_mask_k; - unsigned long export_mask_a; - /* Client only */ - unsigned long mask_ssl; # ifndef OPENSSL_NO_RSA RSA *rsa_tmp; RSA *(*rsa_tmp_cb) (SSL *ssl, int is_export, int keysize); |