X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=apps%2Fprogs.pl;h=94a4962415870ae2cd054a872eef1cfa67d9c263;hp=e43d436665bc96476fc8223445f0273e54b4bb92;hb=473a954771508f4d488bfba5fc7699fe8b45bdcf;hpb=1e8ead8688f0afb5584264c29907f089cc1f6a8a

diff --git a/apps/progs.pl b/apps/progs.pl
index e43d436665..94a4962415 100644
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -48,7 +48,7 @@ typedef enum FUNC_TYPE {
 typedef struct function_st {
     FUNC_TYPE type;
     const char *name;
-    int (*func)(int argc,char *argv[]);
+    int (*func)(int argc, char *argv[]);
     const OPTIONS *help;
 } FUNCTION;
 
@@ -63,7 +63,7 @@ foreach (@ARGV) {
 print "\n";
 
 foreach (@ARGV) {
-	printf "extern OPTIONS %s_options[];\n", $_;
+	printf "extern const OPTIONS %s_options[];\n", $_;
 }
 
 print "\n#ifdef INCLUDE_FUNCTION_TABLE\n";
@@ -80,7 +80,7 @@ my %cmd_disabler = (
     pkcs12   => "des",
     );
 foreach my $cmd (@ARGV) {
-	my $str="    { FT_general, \"$cmd\", ${cmd}_main, ${cmd}_options },\n";
+	my $str="    {FT_general, \"$cmd\", ${cmd}_main, ${cmd}_options},\n";
 	if ($cmd =~ /^s_/) {
 		print "#ifndef OPENSSL_NO_SOCK\n${str}#endif\n";
 	} elsif (grep { $cmd eq $_ } @disablables) {
@@ -102,13 +102,13 @@ foreach my $cmd (
 	"sha1", "sha224", "sha256", "sha384", "sha512",
 	"mdc2", "rmd160", "blake2b512", "blake2s256"
 ) {
-        my $str = "    { FT_md, \"".$cmd."\", dgst_main},\n";
+        my $str = "    {FT_md, \"".$cmd."\", dgst_main},\n";
         if (grep { $cmd eq $_ } @disablables) {
                 print "#ifndef OPENSSL_NO_".uc($cmd)."\n${str}#endif\n";
         } elsif (my $disabler = $md_disabler{$cmd}) {
                 print "#ifndef OPENSSL_NO_".uc($disabler)."\n${str}#endif\n";
         } else {
-                print "#ifndef OPENSSL_NO_".uc($cmd)."\n${str}#endif\n";
+                print $str;
         }
 }
 
@@ -138,7 +138,7 @@ foreach my $cmd (
 	"cast5-cbc","cast5-ecb", "cast5-cfb","cast5-ofb",
 	"cast-cbc", "rc5-cbc",   "rc5-ecb",  "rc5-cfb",  "rc5-ofb"
 ) {
-	my $str="    { FT_cipher, \"$cmd\", enc_main, enc_options },\n";
+	my $str="    {FT_cipher, \"$cmd\", enc_main, enc_options},\n";
 	(my $algo= $cmd) =~ s/-.*//g;
         if ($cmd eq "zlib") {
                 print "#ifdef ZLIB\n${str}#endif\n";