Commit ce9c3a8a authored by Richard Levitte's avatar Richard Levitte
Browse files

Fix apps/progs.pl to generate correctly formatted progs.h 



It was still generating EAY style source.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2889)
parent f4675a10

apps/progs.pl

+15 −15
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ EOF 
foreach (@ARGV)

	{

	push(@files,$_);

	$str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n";

	$str="    {FUNC_TYPE_GENERAL, \"$_\", ${_}_main},\n";

	if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/))

		{ print "#if !defined(OPENSSL_NO_SOCK)\n${str}#endif\n"; } 

	elsif ( ($_ =~ /^speed$/))
@@ -60,7 +60,7 @@ foreach (@ARGV) 
foreach ("md2","md4","md5","sha","sha1","mdc2","rmd160")

	{

	push(@files,$_);

	printf "#ifndef OPENSSL_NO_".uc($_)."\n\t{FUNC_TYPE_MD,\"".$_."\",dgst_main},\n#endif\n";

	printf "#ifndef OPENSSL_NO_".uc($_)."\n    {FUNC_TYPE_MD, \"".$_."\", dgst_main},\n#endif\n";

	}



foreach (
@@ -86,7 +86,7 @@ foreach ( 
	{

	push(@files,$_);



	$t=sprintf("\t{FUNC_TYPE_CIPHER,\"%s\",enc_main},\n",$_);

	$t=sprintf("    {FUNC_TYPE_CIPHER, \"%s\", enc_main},\n",$_);

	if    ($_ =~ /des/)  { $t="#ifndef OPENSSL_NO_DES\n${t}#endif\n"; }

	elsif ($_ =~ /aes/)  { $t="#ifndef OPENSSL_NO_AES\n${t}#endif\n"; }

	elsif ($_ =~ /camellia/)  { $t="#ifndef OPENSSL_NO_CAMELLIA\n${t}#endif\n"; }
@@ -101,4 +101,4 @@ foreach ( 
	print $t;

	}



print "\t{0,NULL,NULL}\n\t};\n";
 
print "    {0, NULL, NULL}\n};\n";