diff options
| author | Nils Larsch <nils@openssl.org> | 2005-07-16 11:13:10 +0000 |
|---|---|---|
| committer | Nils Larsch <nils@openssl.org> | 2005-07-16 11:13:10 +0000 |
| commit | 4913b88f704bd6cf2d6b5afa202ea4f9317422eb (patch) | |
| tree | dc890bac74d3ac8c0044cd33a430d5a02f5c11a0 /ssl/s3_clnt.c | |
| parent | 273157153c867940891a028b8b96f562cb65701c (diff) | |
make
./configure no-deprecated [no-dsa] [no-dh] [no-ec] [no-rsa]
make all test
work again (+ make update)
PR: 1159
Diffstat (limited to 'ssl/s3_clnt.c')
| -rw-r--r-- | ssl/s3_clnt.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index d4f7cec712..4f67cda042 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -130,7 +130,9 @@ #include <openssl/objects.h> #include <openssl/evp.h> #include <openssl/md5.h> +#ifndef OPENSSL_NO_DH #include <openssl/dh.h> +#endif #include <openssl/bn.h> static SSL_METHOD *ssl3_get_client_method(int ver); @@ -1608,6 +1610,7 @@ int ssl3_get_server_done(SSL *s) } +#ifndef OPENSSL_NO_ECDH static const int KDF1_SHA1_len = 20; static void *KDF1_SHA1(const void *in, size_t inlen, void *out, size_t *outlen) { @@ -1619,8 +1622,9 @@ static void *KDF1_SHA1(const void *in, size_t inlen, void *out, size_t *outlen) return SHA1(in, inlen, out); #else return NULL; -#endif +#endif /* OPENSSL_NO_SHA */ } +#endif /* OPENSSL_NO_ECDH */ int ssl3_send_client_key_exchange(SSL *s) { @@ -2132,7 +2136,7 @@ int ssl3_send_client_verify(SSL *s) unsigned u=0; #endif unsigned long n; -#ifndef OPENSSL_NO_DSA +#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_ECDSA) int j; #endif |