From: Ben Laurie <ben@links.org>
Date: Thu, 31 Dec 2015 16:45:00 +0000 (+0000)
Subject: Disable jpake if psk is disabled.
X-Git-Tag: OpenSSL_1_1_0-pre3~443
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=b427401cb68ff06f56d43a04b998d401945f3628

Disable jpake if psk is disabled.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
---

diff --git a/Configure b/Configure
index 894e5ee721..4f32e4ea55 100755
--- a/Configure
+++ b/Configure
@@ -319,6 +319,7 @@ my @disable_cascades = (
     "ec"		=> [ "ecdsa", "ecdh", "gost" ],
     "dsa"		=> [ "gost" ],
     "dh"		=> [ "gost" ],
+    "psk"		=> [ "jpake" ],
 
     "dgram"		=> [ "dtls" ],
     "dtls"		=> [ @dtls ],