generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dr. Stephen Henson
2008-11-12 18:27:17 +00:00
parent 81dde5e8fe
commit a1bb2d6c2f
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/jpake/jpaketest.c
View File

@@ -1,6 +1,14 @@
#include <openssl/jpake.h> #include <openssl/jpake.h>
#include <openssl/err.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) static void showbn(const char *name, const BIGNUM *bn)
{ {
fputs(name, stdout); fputs(name, stdout);
@@ -174,3 +182,5 @@ int main(int argc, char **argv)
return 0; return 0;
} }
#endif

5
util/mk1mf.pl
View File

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