summaryrefslogtreecommitdiffstats
path: root/apps/apps.c
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 /apps/apps.c
parentd0c36288341ca75328eeb4cc33bce6a7d3f65c51 (diff)
Update from stable-branch.
Diffstat (limited to 'apps/apps.c')
-rw-r--r--apps/apps.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/apps.c b/apps/apps.c
index 6a65f94434..56e87ecd3b 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -137,7 +137,7 @@
#include <openssl/rsa.h>
#endif
#include <openssl/bn.h>
-#ifdef OPENSSL_EXPERIMENTAL_JPAKE
+#ifndef OPENSSL_NO_JPAKE
#include <openssl/jpake.h>
#endif
@@ -2381,7 +2381,7 @@ void policies_print(BIO *out, X509_STORE_CTX *ctx)
BIO_free(out);
}
-#if defined(OPENSSL_EXPERIMENTAL_JPAKE) && !defined(OPENSSL_NO_PSK)
+#if !defined(OPENSSL_NO_JPAKE) && !defined(OPENSSL_NO_PSK)
static JPAKE_CTX *jpake_init(const char *us, const char *them,
const char *secret)