[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  6df34091bac6f82b7d9553dc857123b2bd478c22 (commit)
      from  f106f40694b6dd22a70c3c86fd7eb790b00cf4a6 (commit)


- Log -----------------------------------------------------------------
commit 6df34091bac6f82b7d9553dc857123b2bd478c22
Author: Ronald Tse <ronald.tse at ribose.com>
Date:   Wed Nov 22 15:23:48 2017 +0800

    Add SM3/SM4 to openssl command-line tool
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4773)

-----------------------------------------------------------------------

Summary of changes:
 apps/progs.pl | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/apps/progs.pl b/apps/progs.pl
index 5923c7f..65e3453 100644
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -1,5 +1,5 @@
 #! /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
@@ -107,10 +107,11 @@ my %md_disabler = (
     blake2s256 => "blake2",
 );
 foreach my $cmd (
-	"md2", "md4", "md5",
-	"gost",
-	"sha1", "sha224", "sha256", "sha384", "sha512",
-	"mdc2", "rmd160", "blake2b512", "blake2s256"
+    "md2", "md4", "md5",
+    "gost",
+    "sha1", "sha224", "sha256", "sha384", "sha512",
+    "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;