projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Always return a value.
[oweals/openssl.git]
/
apps
/
progs.pl
diff --git
a/apps/progs.pl
b/apps/progs.pl
index 2c4d034e4cc88ab63c8bae5d22ebdfebc9723d9d..214025cd2d6916d34984873699b8681ffca7d12c 100644
(file)
--- a/
apps/progs.pl
+++ b/
apps/progs.pl
@@
-1,6
+1,7
@@
#!/usr/local/bin/perl
#!/usr/local/bin/perl
-print "/* This file was generated by progs.pl. */\n\n";
+print "/* apps/progs.h */\n";
+print "/* automatically generated by progs.pl for openssl.c */\n\n";
grep(s/^asn1pars$/asn1parse/,@ARGV);
grep(s/^asn1pars$/asn1parse/,@ARGV);
@@
-9,8
+10,6
@@
foreach (@ARGV)
print <<'EOF';
print <<'EOF';
-#ifdef SSLEAY_SRC /* Defined only in openssl.c. */
-
#define FUNC_TYPE_GENERAL 1
#define FUNC_TYPE_MD 2
#define FUNC_TYPE_CIPHER 3
#define FUNC_TYPE_GENERAL 1
#define FUNC_TYPE_MD 2
#define FUNC_TYPE_CIPHER 3
@@
-30,11
+29,11
@@
foreach (@ARGV)
$str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n";
if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/))
{ print "#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3))\n${str}#endif\n"; }
$str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n";
if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/))
{ print "#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3))\n${str}#endif\n"; }
- elsif ( ($_ =~ /^rsa$/) || ($_ =~ /^genrsa$/) )
+ elsif ( ($_ =~ /^rsa$/) || ($_ =~ /^genrsa$/)
|| ($_ =~ /^rsautl$/)
)
{ print "#ifndef NO_RSA\n${str}#endif\n"; }
elsif ( ($_ =~ /^dsa$/) || ($_ =~ /^gendsa$/) || ($_ =~ /^dsaparam$/))
{ print "#ifndef NO_DSA\n${str}#endif\n"; }
{ print "#ifndef NO_RSA\n${str}#endif\n"; }
elsif ( ($_ =~ /^dsa$/) || ($_ =~ /^gendsa$/) || ($_ =~ /^dsaparam$/))
{ print "#ifndef NO_DSA\n${str}#endif\n"; }
- elsif ( ($_ =~ /^dh$/) || ($_ =~ /^gendh$/))
+ elsif ( ($_ =~ /^dh$/) || ($_ =~ /^gendh$/)
|| ($_ =~ /^dhparam$/)
)
{ print "#ifndef NO_DH\n${str}#endif\n"; }
elsif ( ($_ =~ /^pkcs12$/))
{ print "#if !defined(NO_DES) && !defined(NO_SHA1)\n${str}#endif\n"; }
{ print "#ifndef NO_DH\n${str}#endif\n"; }
elsif ( ($_ =~ /^pkcs12$/))
{ print "#if !defined(NO_DES) && !defined(NO_SHA1)\n${str}#endif\n"; }
@@
-42,7
+41,7
@@
foreach (@ARGV)
{ print $str; }
}
{ print $str; }
}
-foreach ("md2","md5","sha","sha1","mdc2","rmd160")
+foreach ("md2","md
4","md
5","sha","sha1","mdc2","rmd160")
{
push(@files,$_);
printf "\t{FUNC_TYPE_MD,\"%s\",dgst_main},\n",$_;
{
push(@files,$_);
printf "\t{FUNC_TYPE_MD,\"%s\",dgst_main},\n",$_;
@@
-50,7
+49,7
@@
foreach ("md2","md5","sha","sha1","mdc2","rmd160")
foreach (
"base64",
foreach (
"base64",
- "des", "des3", "desx", "idea", "rc4", "rc4-
64", "rc4-
40",
+ "des", "des3", "desx", "idea", "rc4", "rc4-40",
"rc2", "bf", "cast", "rc5",
"des-ecb", "des-ede", "des-ede3",
"des-cbc", "des-ede-cbc","des-ede3-cbc",
"rc2", "bf", "cast", "rc5",
"des-ecb", "des-ede", "des-ede3",
"des-cbc", "des-ede-cbc","des-ede3-cbc",
@@
-76,5
+75,3
@@
foreach (
}
print "\t{0,NULL,NULL}\n\t};\n";
}
print "\t{0,NULL,NULL}\n\t};\n";
-print "#endif\n\n";
-