Commit a1bb2d6c authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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

parent 81dde5e8

crypto/jpake/jpaketest.c

+10 −0
Original line number Diff line number Diff line 
#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

util/mk1mf.pl

+4 −1
Original line number Diff line number Diff line
@@ -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{$_})