Commit 88c1fec9 authored by Richard Levitte's avatar Richard Levitte
Browse files

The util scripts need to handled no-hw. 

PR: 327
parent 981469c8

util/mk1mf.pl

+5 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ and [options] can be one of 
	no-krb5					- No KRB5

	no-ec					- No EC

	no-engine				- No engine

	no-hw					- No hw

	nasm 					- Use NASM for x86 asm

	gaswin					- Use GNU as with Mingw32

	no-socks				- No socket code
@@ -234,6 +235,7 @@ $cflags.=" -DOPENSSL_NO_ERR" if $no_err; 
$cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;

$cflags.=" -DOPENSSL_NO_EC"   if $no_ec;

$cflags.=" -DOPENSSL_NO_ENGINE"   if $no_engine;

$cflags.=" -DOPENSSL_NO_HW"   if $no_hw;

#$cflags.=" -DRSAref"  if $rsaref ne "";



## if ($unix)
@@ -651,6 +653,7 @@ sub var_add 
	local(@a,$_,$ret);



	return("") if $no_engine && $dir =~ /\/engine/;

	return("") if $no_hw   && $dir =~ /\/hw/;

	return("") if $no_idea && $dir =~ /\/idea/;

	return("") if $no_aes  && $dir =~ /\/aes/;

	return("") if $no_rc2  && $dir =~ /\/rc2/;
@@ -712,6 +715,7 @@ sub var_add 
	@a=grep(!/_mdc2$/,@a) if $no_mdc2;



	@a=grep(!/^engine$/,@a) if $no_engine;

	@a=grep(!/^hw$/,@a) if $no_hw;

	@a=grep(!/(^rsa$)|(^genrsa$)/,@a) if $no_rsa;

	@a=grep(!/(^dsa$)|(^gendsa$)|(^dsaparam$)/,@a) if $no_dsa;

	@a=grep(!/^gendsa$/,@a) if $no_sha1;
@@ -906,6 +910,7 @@ sub read_options 
	elsif (/^no-krb5$/)	{ $no_krb5=1; }

	elsif (/^no-ec$/)	{ $no_ec=1; }

	elsif (/^no-engine$/)	{ $no_engine=1; }

	elsif (/^no-hw$/)	{ $no_hw=1; }



	elsif (/^just-ssl$/)	{ $no_rc2=$no_idea=$no_des=$no_bf=$no_cast=1;

				  $no_md2=$no_sha=$no_mdc2=$no_dsa=$no_dh=1;

util/mkdef.pl

+4 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", 
			 "BIO", "COMP", "BUFFER", "LHASH", "STACK", "ERR",

			 "LOCKING",

			 # External "algorithms"

			 "FP_API", "STDIO", "SOCK", "KRB5", "ENGINE" );

			 "FP_API", "STDIO", "SOCK", "KRB5", "ENGINE", "HW" );



my $options="";

open(IN,"<Makefile.ssl") || die "unable to open Makefile.ssl!\n";
@@ -107,7 +107,7 @@ my $no_rc2; my $no_rc4; my $no_rc5; my $no_idea; my $no_des; my $no_bf; 
my $no_cast;

my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2;

my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5;

my $no_ec; my $no_engine;

my $no_ec; my $no_engine; my $no_hw;

my $no_fp_api;



foreach (@ARGV, split(/ /, $options))
@@ -177,6 +177,7 @@ foreach (@ARGV, split(/ /, $options)) 
	elsif (/^no-dso$/)	{ $no_dso=1; }

	elsif (/^no-krb5$/)	{ $no_krb5=1; }

	elsif (/^no-engine$/)	{ $no_engine=1; }

	elsif (/^no-hw$/)	{ $no_hw=1; }

	}
@@ -1054,6 +1055,7 @@ sub is_valid 
			if ($keyword eq "DSO" && $no_dso) { return 0; }

			if ($keyword eq "KRB5" && $no_krb5) { return 0; }

			if ($keyword eq "ENGINE" && $no_engine) { return 0; }

			if ($keyword eq "HW" && $no_hw) { return 0; }

			if ($keyword eq "FP_API" && $no_fp_api) { return 0; }



			# Nothing recognise as true