X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=src%2Fopenssl.h;h=053ac7236227e59ae8af90ed7c082bb5b2066986;hb=0f6f5360b6de6ddbe9cf6febeb132372c2e113c4;hp=acc1c69a6f7a8a26de174fda82e06869dfd85747;hpb=fef249060579771eb4f43bfb4cd7ebe827c6a633;p=sxemacs
diff --git a/src/openssl.h b/src/openssl.h
index acc1c69..053ac72 100644
--- a/src/openssl.h
+++ b/src/openssl.h
@@ -24,36 +24,58 @@ along with this program. If not, see . */
#define INCLUDED_openssl_h_ 1
/* this is to determine what has been configured */
+#ifdef HAVE_OPENSSL_OPENSSLCONF_H
#include
+#endif
+#ifdef HAVE_OPENSSL_EVP_H
#include
+#endif
+
+#ifdef HAVE_OPENSSL_RAND_H
#include
+#endif
+
+#ifdef HAVE_OPENSSL_HMAC_H
#include
+#endif
/* special asymmetric crypto systems */
+#ifdef HAVE_OPENSSL_RSA_H
#ifndef OPENSSL_NO_RSA
#include
#endif
+#endif
+#ifdef HAVE_OPENSSL_DSA_H
#ifndef OPENSSL_NO_DSA
#include
#endif
+#endif
+#ifdef HAVE_OPENSSL_EC_H
#ifndef OPENSSL_NO_EC
#include
#endif
+#endif
+#ifdef HAVE_OPENSSL_ECDH_H
#ifndef OPENSSL_NO_ECDH
#include
#endif
+#endif
+#ifdef HAVE_OPENSSL_ECDSA_H
#ifndef OPENSSL_NO_ECDSA
#include
#endif
+#endif
+#ifdef HAVE_OPENSSL_DH
#ifndef OPENSSL_NO_DH
#include
#endif
+#endif
#if defined HAVE_OPENSSL_X509_H
# include
@@ -84,8 +106,6 @@ DECLARE_LRECORD(evp_pkey, Lisp_EVP_PKEY);
#define CHECK_EVPPKEY(x) CHECK_RECORD (x, evp_pkey)
#define wrap_evppkey(p) wrap_object(p)
-
-#if !defined(OPENSSL_NO_SSL2) || !defined(OPENSSL_NO_SSL3)
/* opaque SSL_CONN object structure
* this is just an ssl-ish wrap around the process object
*/
@@ -135,5 +155,4 @@ DECLARE_LRECORD(ssl_conn, Lisp_SSL_CONN);
#define OSSL_DEBUG_FLAG
#endif
-#endif /* !OPENSSL_NO_SSL2 || !OPENSSL_NO_SSL3 */
#endif /* INCLUDED_openssl_h_ */