summaryrefslogtreecommitdiffstats
path: root/crypto/jpake
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2008-11-24 17:27:08 +0000
committerDr. Stephen Henson <steve@openssl.org>2008-11-24 17:27:08 +0000
commit79bd20fd1755d0d8a6d1d758b2f8858643621923 (patch)
tree06725a9fe6fee39c9d637a410dab64043d16b862 /crypto/jpake
parentd0c36288341ca75328eeb4cc33bce6a7d3f65c51 (diff)
Update from stable-branch.
Diffstat (limited to 'crypto/jpake')
-rw-r--r--crypto/jpake/jpake.h4
-rw-r--r--crypto/jpake/jpaketest.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/crypto/jpake/jpake.h b/crypto/jpake/jpake.h
index 8beb9a5b30..693ea188cb 100644
--- a/crypto/jpake/jpake.h
+++ b/crypto/jpake/jpake.h
@@ -10,6 +10,10 @@
#include <openssl/opensslconf.h>
+#ifdef OPENSSL_NO_JPAKE
+#error JPAKE is disabled.
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/crypto/jpake/jpaketest.c b/crypto/jpake/jpaketest.c
index 6bf7ee46d9..008756fc95 100644
--- a/crypto/jpake/jpaketest.c
+++ b/crypto/jpake/jpaketest.c
@@ -1,4 +1,6 @@
-#ifndef OPENSSL_EXPERIMENTAL_JPAKE
+
+#include <openssl/opensslconf.h>
+#ifdef OPENSSL_NO_JPAKE
#include <stdio.h>