diff options
| author | Richard Levitte <levitte@openssl.org> | 2001-10-10 07:55:02 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2001-10-10 07:55:02 +0000 |
| commit | 116daf4c2f20b43a7ea349fcff407a4c85943d65 (patch) | |
| tree | 0f7630e6be3525823bca8c5587f52cd99f156696 /ssl | |
| parent | cb40bdaf579a64dfb527471b7a159968e482ad15 (diff) | |
To avoid commit wars over dependencies, let's make it so things that
depend on the environment, like the presence of the OpenBSD crypto
device or of Kerberos, do not change the dependencies within OpenSSL.
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/kssl.c | 4 | ||||
| -rw-r--r-- | ssl/kssl.h | 2 | ||||
| -rw-r--r-- | ssl/kssl_lcl.h | 4 | ||||
| -rw-r--r-- | ssl/s3_clnt.c | 2 | ||||
| -rw-r--r-- | ssl/s3_srvr.c | 2 | ||||
| -rw-r--r-- | ssl/ssl.h | 2 |
6 files changed, 7 insertions, 9 deletions
diff --git a/ssl/kssl.c b/ssl/kssl.c index f1733048ed..e61b698062 100644 --- a/ssl/kssl.c +++ b/ssl/kssl.c @@ -67,7 +67,7 @@ */ #include <openssl/opensslconf.h> -#ifndef OPENSSL_NO_KRB5 + #define _XOPEN_SOURCE /* glibc2 needs this to declare strptime() */ #include <time.h> #include <string.h> @@ -77,6 +77,8 @@ #include <openssl/objects.h> #include <openssl/krb5_asn.h> +#ifndef OPENSSL_NO_KRB5 + /* * When OpenSSL is built on Windows, we do not want to require that * the Kerberos DLLs be available in order for the OpenSSL DLLs to diff --git a/ssl/kssl.h b/ssl/kssl.h index 50480f6a31..cf7ebdd168 100644 --- a/ssl/kssl.h +++ b/ssl/kssl.h @@ -63,6 +63,8 @@ #ifndef KSSL_H #define KSSL_H +#include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_KRB5 #include <stdio.h> diff --git a/ssl/kssl_lcl.h b/ssl/kssl_lcl.h index 37c2157d88..4cd8dd2d7f 100644 --- a/ssl/kssl_lcl.h +++ b/ssl/kssl_lcl.h @@ -59,10 +59,10 @@ #ifndef KSSL_LCL_H #define KSSL_LCL_H -#ifndef OPENSSL_NO_KRB5 - #include <openssl/kssl.h> +#ifndef OPENSSL_NO_KRB5 + #ifdef __cplusplus extern "C" { #endif diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 36068780e7..67dc5b05d5 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -62,9 +62,7 @@ #include <openssl/objects.h> #include <openssl/evp.h> #include "ssl_locl.h" -#ifndef OPENSSL_NO_KRB5 #include "kssl_lcl.h" -#endif #include <openssl/md5.h> static SSL_METHOD *ssl3_get_client_method(int ver); diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 304f217b04..8b55f835ed 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -121,9 +121,7 @@ #include <openssl/x509.h> #include <openssl/krb5_asn.h> #include "ssl_locl.h" -#ifndef OPENSSL_NO_KRB5 #include "kssl_lcl.h" -#endif /* OPENSSL_NO_KRB5 */ #include <openssl/md5.h> static SSL_METHOD *ssl3_get_server_method(int ver); @@ -70,9 +70,7 @@ #ifndef OPENSSL_NO_X509 #include <openssl/x509.h> #endif -#ifndef OPENSSL_NO_KRB5 #include <openssl/kssl.h> -#endif #include <openssl/safestack.h> #include <openssl/symhacks.h> |