[openssl-commits] [openssl] master update

[Ben Laurie]

The branch master has been updated
       via  b427401cb68ff06f56d43a04b998d401945f3628 (commit)
      from  7d130f68fc429609df9fd2ddec3218306d66206e (commit)


- Log -----------------------------------------------------------------
commit b427401cb68ff06f56d43a04b998d401945f3628
Author: Ben Laurie <ben at links.org>
Date:   Thu Dec 31 16:45:00 2015 +0000

    Disable jpake if psk is disabled.
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Configure b/Configure
index 894e5ee..4f32e4e 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 ],