Update NO_* macros.

[openssl.git] / apps / progs.pl

diff --git a/apps/progs.pl b/apps/progs.pl
index cd05fe6a785b2db6dbdcc4b2533c51c0b09b51a4..7a69fc7b18dc54690293a4f3435b0ad9de9726f2 100644 (file)
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -1,23 +1,15 @@
 #!/usr/local/bin/perl
 
-$mkprog='mklinks';
-$rmprog='rmlinks';
-
-print "#ifndef NOPROTO\n";
+print "/* This file was generated by progs.pl. */\n\n";
 
 grep(s/^asn1pars$/asn1parse/,@ARGV);
 
 foreach (@ARGV)
        { printf "extern int %s_main(int argc,char *argv[]);\n",$_; }
-print "#else\n";
-foreach (@ARGV)
-       { printf "extern int %s_main();\n",$_; }
-print "#endif\n";
-
 
 print <<'EOF';
 
-#ifdef SSLEAY_SRC
+#ifdef SSLEAY_SRC  /* Defined only in openssl.c. */
 
 #define FUNC_TYPE_GENERAL      1
 #define FUNC_TYPE_MD           2
@@ -38,8 +30,7 @@ foreach (@ARGV)
        $str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n";
        if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/))
                { print "#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(O_SSL3))\n${str}#endif\n"; } 
-       elsif ( ($_ =~ /^rsa$/) || ($_ =~ /^genrsa$/) ||
-               ($_ =~ /^req$/) || ($_ =~ /^ca$/) || ($_ =~ /^x509$/))
+       elsif ( ($_ =~ /^rsa$/) || ($_ =~ /^genrsa$/) ) 
                { print "#ifndef NO_RSA\n${str}#endif\n";  }
        elsif ( ($_ =~ /^dsa$/) || ($_ =~ /^gendsa$/) || ($_ =~ /^dsaparam$/))
                { print "#ifndef NO_DSA\n${str}#endif\n"; }
@@ -49,7 +40,7 @@ foreach (@ARGV)
                { print $str; }
        }
 
-foreach ("md2","md5","sha","sha1","mdc2")
+foreach ("md2","md5","sha","sha1","mdc2","rmd160")
        {
        push(@files,$_);
        printf "\t{FUNC_TYPE_MD,\"%s\",dgst_main},\n",$_;
@@ -75,7 +66,7 @@ foreach (
        elsif ($_ =~ /idea/) { $t="#ifndef NO_IDEA\n${t}#endif\n"; }
        elsif ($_ =~ /rc4/)  { $t="#ifndef NO_RC4\n${t}#endif\n"; }
        elsif ($_ =~ /rc2/)  { $t="#ifndef NO_RC2\n${t}#endif\n"; }
-       elsif ($_ =~ /bf/)   { $t="#ifndef NO_BLOWFISH\n${t}#endif\n"; }
+       elsif ($_ =~ /bf/)   { $t="#ifndef NO_BF\n${t}#endif\n"; }
        elsif ($_ =~ /cast/) { $t="#ifndef NO_CAST\n${t}#endif\n"; }
        elsif ($_ =~ /rc5/)  { $t="#ifndef NO_RC5\n${t}#endif\n"; }
        print $t;
@@ -84,31 +75,3 @@ foreach (
 print "\t{0,NULL,NULL}\n\t};\n";
 print "#endif\n\n";
 
-open(OUT,">$mkprog") || die "unable to open '$prog':$!\n";
-print OUT "#!/bin/sh\nfor i in ";
-foreach (@files)
-       { print OUT $_." "; }
-print OUT <<'EOF';
-
-do
-echo making symlink for $i
-/bin/rm -f $i
-ln -s ssleay $i
-done
-EOF
-close(OUT);
-chmod(0755,$mkprog);
-
-open(OUT,">$rmprog") || die "unable to open '$prog':$!\n";
-print OUT "#!/bin/sh\nfor i in ";
-foreach (@files)
-       { print OUT $_." "; }
-print OUT <<'EOF';
-
-do
-echo removing $i
-/bin/rm -f $i
-done
-EOF
-close(OUT);
-chmod(0755,$rmprog);