Remove JPAKE

[openssl.git] / Configure

diff --git a/Configure b/Configure
index 0cf893ee7a99392cd246a07a0e182fc59d2d5b2f..bc753633f34a3fb564b088e8a2a362658738aba6 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -226,7 +226,7 @@ $config{sdirs} = [
     "bn", "ec", "rsa", "dsa", "dh", "dso", "engine",
     "buffer", "bio", "stack", "lhash", "rand", "err",
     "evp", "asn1", "pem", "x509", "x509v3", "conf", "txt_db", "pkcs7", "pkcs12", "comp", "ocsp", "ui",
-    "cms", "ts", "jpake", "srp", "cmac", "ct", "async", "kdf"
+    "cms", "ts", "srp", "cmac", "ct", "async", "kdf"
     ];
 
 # Known TLS and DTLS protocols
@@ -274,7 +274,6 @@ my @disablables = (
     "hmac",
     "hw(-.+)?",
     "idea",
-    "jpake",
     "locking",                 # Really???
     "md2",
     "md4",
@@ -327,7 +326,6 @@ foreach my $proto ((@tls, @dtls))
 my %disabled = ( # "what"         => "comment" [or special keyword "experimental"]
                 "ec_nistp_64_gcc_128" => "default",
                 "egd"            => "default",
-                "jpake"          => "experimental",
                 "md2"            => "default",
                 "rc5"            => "default",
                 "sctp"           => "default",
@@ -351,7 +349,6 @@ my @disable_cascades = (
     "rijndael"         => [ "aes" ],
     "des"              => [ "mdc2" ],
     "ec"               => [ "ecdsa", "ecdh" ],
-    "psk"              => [ "jpake" ],
 
     "dgram"            => [ "dtls" ],
     "dtls"             => [ @dtls ],