Fix possible usage of NULL pointers in apps/spkac.c

[openssl.git] / apps / progs.pl

diff --git a/apps/progs.pl b/apps/progs.pl
index 21baf173cff9a4aa12339745320546c830f9c4eb..94a4962415870ae2cd054a872eef1cfa67d9c263 100644 (file)
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -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,7 +102,7 @@ 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}) {
@@ -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";