commit ed551cddf7130a43d992f386e26071e9ee6f105a
author Dr. Stephen Henson <steve@openssl.org> Wed Nov 12 17:28:18 2008 +0000
committer Dr. Stephen Henson <steve@openssl.org> Wed Nov 12 17:28:18 2008 +0000
tree 58cb5d24e5cfd04d97d5c4efa7344097a8cefb5a
parent 5aca224ecd7fcbcb39b3e302106708cd2f6f0fb9

Update from stable branch.

apps/apps.c

diff --git a/apps/apps.c b/apps/apps.c
index 7038ac1..455bf28 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -137,7 +137,9 @@
 #include <openssl/rsa.h>
 #endif
 #include <openssl/bn.h>
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
 #include <openssl/jpake.h>
+#endif
 
 #define NON_MAIN
 #include "apps.h"
@@ -2379,6 +2381,8 @@
 		BIO_free(out);
 	}
 
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
+
 static JPAKE_CTX *jpake_init(const char *us, const char *them,
 							 const char *secret)
 	{
@@ -2591,6 +2595,8 @@
 	BIO_free(bconn);
 	}
 
+#endif
+
 /*
  * Platform-specific sections
  */