aboutsummaryrefslogtreecommitdiffstats
path: root/apps/apps.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2008-11-12 17:28:18 +0000
committerDr. Stephen Henson <steve@openssl.org>2008-11-12 17:28:18 +0000
commited551cddf7130a43d992f386e26071e9ee6f105a (patch)
tree58cb5d24e5cfd04d97d5c4efa7344097a8cefb5a /apps/apps.c
parent5aca224ecd7fcbcb39b3e302106708cd2f6f0fb9 (diff)
downloadopenssl-ed551cddf7130a43d992f386e26071e9ee6f105a.tar.gz
Update from stable branch.
Diffstat (limited to 'apps/apps.c')
-rw-r--r--apps/apps.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/apps.c b/apps/apps.c
index 7038ac1e24..455bf28e76 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 @@ void policies_print(BIO *out, X509_STORE_CTX *ctx)
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 @@ void jpake_server_auth(BIO *out, BIO *conn, const char *secret)
BIO_free(bconn);
}
+#endif
+
/*
* Platform-specific sections
*/