Commit aa74c2ec authored by Rich Salz's avatar Rich Salz
Browse files

Reformat progs.pl; add ARIA support 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/3726)
parent bff951ee

apps/progs.pl

+78 −68
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 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 $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
@@ -68,15 +68,13 @@ EOF 
foreach (@ARGV) {

    printf "extern int %s_main(int argc, char *argv[]);\n", $_;

}



print "\n";



foreach (@ARGV) {

    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",
@@ -88,6 +86,9 @@ my %cmd_disabler = ( 
    ecparam  => "ec",

    pkcs12   => "des",

);



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_/) {
@@ -111,7 +112,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}) {
@@ -130,6 +131,15 @@ foreach my $cmd ( 
    "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",