Commit 6df34091 authored by Ronald Tse's avatar Ronald Tse
Browse files

Add SM3/SM4 to openssl command-line tool 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4773)
parent f106f406

apps/progs.pl

+9 −7
Original line number Diff line number Diff line 
#! /usr/bin/env perl

# Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

# Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

#

# Licensed under the OpenSSL license (the "License").  You may not use

# this file except in compliance with the License.  You can obtain a copy
@@ -41,7 +41,7 @@ print <<'EOF'; 
 * WARNING: do not edit!

 * Generated by apps/progs.pl

 *

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -110,7 +110,8 @@ foreach my $cmd ( 
    "md2", "md4", "md5",

    "gost",

    "sha1", "sha224", "sha256", "sha384", "sha512",

	"mdc2", "rmd160", "blake2b512", "blake2s256"

    "mdc2", "rmd160", "blake2b512", "blake2s256",

    "sm3"

) {

    my $str = "    {FT_md, \"$cmd\", dgst_main},\n";

    if (grep { $cmd eq $_ } @disablables) {
@@ -155,7 +156,8 @@ foreach my $cmd ( 
    "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"

    "cast-cbc", "rc5-cbc", "rc5-ecb", "rc5-cfb", "rc5-ofb",

    "sm4-cbc", "sm4-ecb", "sm4-cfb", "sm4-ofb", "sm4-ctr"

) {

    my $str = "    {FT_cipher, \"$cmd\", enc_main, enc_options},\n";

    (my $algo = $cmd) =~ s/-.*//g;