diff options
author | tedu <> | 2014-04-17 21:37:37 +0000 |
---|---|---|
committer | tedu <> | 2014-04-17 21:37:37 +0000 |
commit | 153e0cd77b7a56682f71acec88a0c318e197fcb3 (patch) | |
tree | 08e9b3a8cf6f35c7585646ca19c69f2ba87cc08c /src/lib/libssl/ssl_locl.h | |
parent | 5f4d080a0e8eb89385e3020de8bbbd5243abf8dc (diff) | |
download | openbsd-153e0cd77b7a56682f71acec88a0c318e197fcb3.tar.gz openbsd-153e0cd77b7a56682f71acec88a0c318e197fcb3.tar.bz2 openbsd-153e0cd77b7a56682f71acec88a0c318e197fcb3.zip |
always build in RSA and DSA. ok deraadt miod
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 483723736a..5767c1dd4b 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -159,12 +159,8 @@ | |||
159 | #endif | 159 | #endif |
160 | #include <openssl/bio.h> | 160 | #include <openssl/bio.h> |
161 | #include <openssl/stack.h> | 161 | #include <openssl/stack.h> |
162 | #ifndef OPENSSL_NO_RSA | ||
163 | #include <openssl/rsa.h> | 162 | #include <openssl/rsa.h> |
164 | #endif | ||
165 | #ifndef OPENSSL_NO_DSA | ||
166 | #include <openssl/dsa.h> | 163 | #include <openssl/dsa.h> |
167 | #endif | ||
168 | #include <openssl/err.h> | 164 | #include <openssl/err.h> |
169 | #include <openssl/ssl.h> | 165 | #include <openssl/ssl.h> |
170 | 166 | ||
@@ -500,10 +496,8 @@ typedef struct cert_st { | |||
500 | unsigned long mask_a; | 496 | unsigned long mask_a; |
501 | unsigned long export_mask_k; | 497 | unsigned long export_mask_k; |
502 | unsigned long export_mask_a; | 498 | unsigned long export_mask_a; |
503 | #ifndef OPENSSL_NO_RSA | ||
504 | RSA *rsa_tmp; | 499 | RSA *rsa_tmp; |
505 | RSA *(*rsa_tmp_cb)(SSL *ssl, int is_export, int keysize); | 500 | RSA *(*rsa_tmp_cb)(SSL *ssl, int is_export, int keysize); |
506 | #endif | ||
507 | #ifndef OPENSSL_NO_DH | 501 | #ifndef OPENSSL_NO_DH |
508 | DH *dh_tmp; | 502 | DH *dh_tmp; |
509 | DH *(*dh_tmp_cb)(SSL *ssl, int is_export, int keysize); | 503 | DH *(*dh_tmp_cb)(SSL *ssl, int is_export, int keysize); |
@@ -531,9 +525,7 @@ typedef struct sess_cert_st { | |||
531 | /* Obviously we don't have the private keys of these, | 525 | /* Obviously we don't have the private keys of these, |
532 | * so maybe we shouldn't even use the CERT_PKEY type here. */ | 526 | * so maybe we shouldn't even use the CERT_PKEY type here. */ |
533 | 527 | ||
534 | #ifndef OPENSSL_NO_RSA | ||
535 | RSA *peer_rsa_tmp; /* not used for SSL 2 */ | 528 | RSA *peer_rsa_tmp; /* not used for SSL 2 */ |
536 | #endif | ||
537 | #ifndef OPENSSL_NO_DH | 529 | #ifndef OPENSSL_NO_DH |
538 | DH *peer_dh_tmp; /* not used for SSL 2 */ | 530 | DH *peer_dh_tmp; /* not used for SSL 2 */ |
539 | #endif | 531 | #endif |