Fixes for "make depend". Features which need a #define to be set to

enable them, like FIPS and JPAKE need to have these set when building
dependencies.

diff --git a/crypto/jpake/jpake.h b/crypto/jpake/jpake.h
index f5f95e89a02f66846dc63d918edcc58093ea6126..0457a5c9a6a8389aa3d1e7fba0f3e07cf8f19b36 100644 (file)
--- a/crypto/jpake/jpake.h
+++ b/crypto/jpake/jpake.h
@@ -11,6 +11,8 @@
 #include <openssl/opensslconf.h>
 
 #ifndef OPENSSL_EXPERIMENTAL_JPAKE
+#error JPAKE is disabled
+#endif
 
 #ifdef  __cplusplus
 extern "C" {
@@ -125,4 +127,3 @@ void ERR_load_JPAKE_strings(void);
 }
 #endif
 #endif
-#endif

diff --git a/crypto/jpake/jpaketest.c b/crypto/jpake/jpaketest.c
index 1c77f6cda4559ac1e90d67a1e101c0130eea6e43..5f26b12289248498b93327237b7bb8a4eea578e9 100644 (file)
--- a/crypto/jpake/jpaketest.c
+++ b/crypto/jpake/jpaketest.c
@@ -1,4 +1,3 @@
-#include <openssl/jpake.h>
 #include <openssl/err.h>
 
 #ifndef OPENSSL_EXPERIMENTAL_JPAKE
@@ -8,6 +7,7 @@ int main(int argc, char *argv[])
     return(0);
 }
 #else
+#include <openssl/jpake.h>
 
 static void showbn(const char *name, const BIGNUM *bn)
     {

diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in
index cee83acf9898b43b5c5e4fbc9ca0cf76e8fefd48..8db94782b916087657ade0b27bba8bd156550301 100644 (file)
--- a/crypto/opensslconf.h.in
+++ b/crypto/opensslconf.h.in
@@ -1,5 +1,21 @@
 /* crypto/opensslconf.h.in */
 
+#ifdef OPENSSL_DOING_MAKEDEPEND
+
+/* Include any symbols here which have to be explicitly set to enable a
+ * feature. For example OPENSSL_EXPERIMENTAL_FOO
+ */
+
+#ifndef OPENSSL_FIPS
+#define OPENSSL_FIPS
+#endif
+
+#ifndef OPENSSL_EXPERIMENTAL_JPAKE
+#define OPENSSL_EXPERIMENTAL_JPAKE
+#endif
+
+#endif
+
 /* Generate 80386 code? */
 #undef I386_ONLY