Update mk1mf.pl for new JPAKE options. Update jpaketest.c for WIN32.

diff --git a/crypto/jpake/jpaketest.c b/crypto/jpake/jpaketest.c
index c3a83ba3d6a58a240648c925b3d8b4ec0510d461..a7df76a4cfd8efb4f862280a547efac5239185a9 100644 (file)
--- a/crypto/jpake/jpaketest.c
+++ b/crypto/jpake/jpaketest.c
@@ -1,6 +1,14 @@
 #include <openssl/jpake.h>
 #include <openssl/err.h>
 
+#ifndef OPENSSL_EXPERIMENTAL_JPAKE
+int main(int argc, char *argv[])
+{
+    printf("No RSA support\n");
+    return(0);
+}
+#else
+
 static void showbn(const char *name, const BIGNUM *bn)
     {
     fputs(name, stdout);
@@ -174,3 +182,5 @@ int main(int argc, char **argv)
 
     return 0;
     }
+
+#endif

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 2f7a0b34ed6b3d06f9dfb1600da1eca703f4803a..632e617097f615ce94e48db3d5489b89c73050cf 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -242,7 +242,7 @@ $cflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh;
 $cflags.=" -DOPENSSL_NO_ENGINE"   if $no_engine;
 $cflags.=" -DOPENSSL_NO_HW"   if $no_hw;
 $cflags.=" -DOPENSSL_FIPS"    if $fips;
-
+$cflags.=" -DOPENSSL_EXPERIMENTAL_JPAKE"    if $jpake;
 $cflags.= " -DZLIB" if $zlib_opt;
 $cflags.= " -DZLIB_SHARED" if $zlib_opt == 2;
 
@@ -1022,6 +1022,7 @@ sub var_add
        return("") if $no_ec   && $dir =~ /\/ec/;
        return("") if $no_cms  && $dir =~ /\/cms/;
        return("") if !$fips   && $dir =~ /^fips/;
+       return("") if !$jpake  && $dir =~ /\/jpake/;
        if ($no_des && $dir =~ /\/des/)
                {
                if ($val =~ /read_pwd/)
@@ -1319,6 +1320,8 @@ sub read_options
                "fips" => \$fips,
                "fipscanisterbuild" => [\$fips, \$fipscanisterbuild],
                "fipsdso" => [\$fips, \$fipscanisterbuild, \$fipsdso],
+               "no-experimental-jpake" => 0,
+               "enable-experimental-jpake" => \$jpake,
                );
 
        if (exists $valid_options{$_})