From 79bd20fd1755d0d8a6d1d758b2f8858643621923 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Mon, 24 Nov 2008 17:27:08 +0000
Subject: Update from stable-branch.

---
 crypto/jpake/jpake.h     | 4 ++++
 crypto/jpake/jpaketest.c | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'crypto/jpake')

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>
 
-- 
cgit v1.2.3