Reformat progs.pl; add ARIA support
authorRich Salz <rsalz@openssl.org>
Tue, 20 Jun 2017 18:28:50 +0000 (14:28 -0400)
committerRich Salz <rsalz@openssl.org>
Wed, 21 Jun 2017 12:44:56 +0000 (08:44 -0400)
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/3726)

apps/progs.pl

index 973b62b..033e2e2 100644 (file)
@@ -14,24 +14,24 @@ use warnings;
 use lib '.';
 use configdata qw/@disablables %unified_info/;
 
-my %commands = ();
-my $cmdre = qr/^\s*int\s+([a-z_][a-z0-9_]*)_main\(\s*int\s+argc\s*,/;
-
+my %commands     = ();
+my $cmdre        = qr/^\s*int\s+([a-z_][a-z0-9_]*)_main\(\s*int\s+argc\s*,/;
 my $apps_openssl = shift @ARGV;
+
 # because the program apps/openssl has object files as sources, and
 # they then have the corresponding C files as source, we need to chain
 # the lookups in %unified_info
 my @openssl_source =
     map { @{$unified_info{sources}->{$_}} }
-    @{$unified_info{sources}->{$apps_openssl}};
+        @{$unified_info{sources}->{$apps_openssl}};
 
 foreach my $filename (@openssl_source) {
-       open F, $filename or die "Coudn't open $_: $!\n";
-       foreach (grep /$cmdre/, <F>) {
-               my @foo = /$cmdre/;
-               $commands{$1} = 1;
-       }
-       close F;
+    open F, $filename or die "Coudn't open $_: $!\n";
+    foreach ( grep /$cmdre/, <F> ) {
+        my @foo = /$cmdre/;
+        $commands{$1} = 1;
+    }
+    close F;
 }
 
 @ARGV = sort keys %commands;
@@ -66,17 +66,15 @@ DEFINE_LHASH_OF(FUNCTION);
 EOF
 
 foreach (@ARGV) {
-       printf "extern int %s_main(int argc, char *argv[]);\n", $_;
+    printf "extern int %s_main(int argc, char *argv[]);\n", $_;
 }
-
 print "\n";
 
 foreach (@ARGV) {
-       printf "extern const OPTIONS %s_options[];\n", $_;
+    printf "extern const OPTIONS %s_options[];\n", $_;
 }
+print "\n";
 
-print "\n#ifdef INCLUDE_FUNCTION_TABLE\n";
-print "static FUNCTION functions[] = {\n";
 my %cmd_disabler = (
     ciphers  => "sock",
     genrsa   => "rsa",
@@ -87,78 +85,90 @@ my %cmd_disabler = (
     dhparam  => "dh",
     ecparam  => "ec",
     pkcs12   => "des",
-    );
-foreach my $cmd (@ARGV) {
-       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) {
-               print "#ifndef OPENSSL_NO_".uc($cmd)."\n${str}#endif\n";
-       } elsif (my $disabler = $cmd_disabler{$cmd}) {
-               print "#ifndef OPENSSL_NO_".uc($disabler)."\n${str}#endif\n";
-       } else {
-               print $str;
-       }
+);
+
+print "#ifdef INCLUDE_FUNCTION_TABLE\n";
+print "static FUNCTION functions[] = {\n";
+foreach my $cmd ( @ARGV ) {
+    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) {
+        print "#ifndef OPENSSL_NO_" . uc($cmd) . "\n${str}#endif\n";
+    } elsif (my $disabler = $cmd_disabler{$cmd}) {
+        print "#ifndef OPENSSL_NO_" . uc($disabler) . "\n${str}#endif\n";
+    } else {
+        print $str;
+    }
 }
 
 my %md_disabler = (
     blake2b512 => "blake2",
     blake2s256 => "blake2",
-    );
+);
 foreach my $cmd (
        "md2", "md4", "md5",
        "gost",
        "sha1", "sha224", "sha256", "sha384", "sha512",
        "mdc2", "rmd160", "blake2b512", "blake2s256"
 ) {
-        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 $str;
-        }
+    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 $str;
+    }
 }
 
 my %cipher_disabler = (
     des3  => "des",
     desx  => "des",
     cast5 => "cast",
-    );
+);
 foreach my $cmd (
-       "aes-128-cbc", "aes-128-ecb",
-       "aes-192-cbc", "aes-192-ecb",
-       "aes-256-cbc", "aes-256-ecb",
-       "camellia-128-cbc", "camellia-128-ecb",
-       "camellia-192-cbc", "camellia-192-ecb",
-       "camellia-256-cbc", "camellia-256-ecb",
-       "base64", "zlib",
-       "des", "des3", "desx", "idea", "seed", "rc4", "rc4-40",
-       "rc2", "bf", "cast", "rc5",
-       "des-ecb", "des-ede",    "des-ede3",
-       "des-cbc", "des-ede-cbc","des-ede3-cbc",
-       "des-cfb", "des-ede-cfb","des-ede3-cfb",
-       "des-ofb", "des-ede-ofb","des-ede3-ofb",
-       "idea-cbc","idea-ecb",    "idea-cfb", "idea-ofb",
-       "seed-cbc","seed-ecb",    "seed-cfb", "seed-ofb",
-       "rc2-cbc", "rc2-ecb", "rc2-cfb","rc2-ofb", "rc2-64-cbc", "rc2-40-cbc",
-       "bf-cbc",  "bf-ecb",     "bf-cfb",   "bf-ofb",
-       "cast5-cbc","cast5-ecb", "cast5-cfb","cast5-ofb",
-       "cast-cbc", "rc5-cbc",   "rc5-ecb",  "rc5-cfb",  "rc5-ofb"
+    "aes-128-cbc", "aes-128-ecb",
+    "aes-192-cbc", "aes-192-ecb",
+    "aes-256-cbc", "aes-256-ecb",
+    "aria-128-cbc", "aria-128-cfb",
+    "aria-128-ctr", "aria-128-ecb", "aria-128-ofb",
+    "aria-128-cfb1", "aria-128-cfb8",
+    "aria-192-cbc", "aria-192-cfb",
+    "aria-192-ctr", "aria-192-ecb", "aria-192-ofb",
+    "aria-192-cfb1", "aria-192-cfb8",
+    "aria-256-cbc", "aria-256-cfb",
+    "aria-256-ctr", "aria-256-ecb", "aria-256-ofb",
+    "aria-256-cfb1", "aria-256-cfb8",
+    "camellia-128-cbc", "camellia-128-ecb",
+    "camellia-192-cbc", "camellia-192-ecb",
+    "camellia-256-cbc", "camellia-256-ecb",
+    "base64", "zlib",
+    "des", "des3", "desx", "idea", "seed", "rc4", "rc4-40",
+    "rc2", "bf", "cast", "rc5",
+    "des-ecb", "des-ede", "des-ede3",
+    "des-cbc", "des-ede-cbc","des-ede3-cbc",
+    "des-cfb", "des-ede-cfb","des-ede3-cfb",
+    "des-ofb", "des-ede-ofb","des-ede3-ofb",
+    "idea-cbc","idea-ecb", "idea-cfb", "idea-ofb",
+    "seed-cbc","seed-ecb", "seed-cfb", "seed-ofb",
+    "rc2-cbc", "rc2-ecb", "rc2-cfb","rc2-ofb", "rc2-64-cbc", "rc2-40-cbc",
+    "bf-cbc", "bf-ecb", "bf-cfb", "bf-ofb",
+    "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 $algo= $cmd) =~ s/-.*//g;
-        if ($cmd eq "zlib") {
-                print "#ifdef ZLIB\n${str}#endif\n";
-        } elsif (grep { $algo eq $_ } @disablables) {
-                print "#ifndef OPENSSL_NO_".uc($algo)."\n${str}#endif\n";
-        } elsif (my $disabler = $cipher_disabler{$algo}) {
-                print "#ifndef OPENSSL_NO_".uc($disabler)."\n${str}#endif\n";
-       } else {
-               print $str;
-       }
+    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";
+    } elsif (grep { $algo eq $_ } @disablables) {
+        print "#ifndef OPENSSL_NO_" . uc($algo) . "\n${str}#endif\n";
+    } elsif (my $disabler = $cipher_disabler{$algo}) {
+        print "#ifndef OPENSSL_NO_" . uc($disabler) . "\n${str}#endif\n";
+    } else {
+        print $str;
+    }
 }
 
-print "    { 0, NULL, NULL}\n};\n";
+print "    {0, NULL, NULL}\n};\n";
 print "#endif\n";