diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-12-24 00:23:29 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-12-24 00:23:29 +0000 |
| commit | b22d71131aa01d371029908e3c2bce332fd77e70 (patch) | |
| tree | 1c50eccde56c2ae60f4f1ee1a0bfd6d823575155 /ssl/ssl_locl.h | |
| parent | e2b420fdd708e14a0b43a21cd2377cafb0d54c02 (diff) | |
fix no-ec
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl/ssl_locl.h')
| -rw-r--r-- | ssl/ssl_locl.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 4afb0d45ee..4db32a9294 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -1227,11 +1227,8 @@ typedef struct ssl3_state_st { int message_type; /* used to hold the new cipher we are going to use */ const SSL_CIPHER *new_cipher; -# ifndef OPENSSL_NO_DH - DH *dh; -# endif -# ifndef OPENSSL_NO_EC - EVP_PKEY *pkey; /* holds short lived ECDH key */ +# if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH) + EVP_PKEY *pkey; /* holds short lived DH/ECDH key */ # endif /* used for certificate requests */ int cert_req; |