commit 79bd20fd1755d0d8a6d1d758b2f8858643621923
author Dr. Stephen Henson <steve@openssl.org> Mon Nov 24 17:27:08 2008 +0000
committer Dr. Stephen Henson <steve@openssl.org> Mon Nov 24 17:27:08 2008 +0000
tree 06725a9fe6fee39c9d637a410dab64043d16b862
parent d0c36288341ca75328eeb4cc33bce6a7d3f65c51

Update from stable-branch.

apps/apps.c

diff --git a/apps/apps.c b/apps/apps.c
index 6a65f94..56e87ec 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 @@
 		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)