[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  a9ea8d431f1a0057bcdfe8fe7297e8ce271eec8b (commit)
      from  35db366cf453427c855bea8ca097618a8a8d7ff0 (commit)


- Log -----------------------------------------------------------------
commit a9ea8d431f1a0057bcdfe8fe7297e8ce271eec8b
Author: Paul Yang <yang.yang at baishancloud.com>
Date:   Mon Sep 10 13:42:00 2018 +0800

    Add a sentence in CHANGES to note SM2 support
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7160)

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

Summary of changes:
 CHANGES | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index e2e61bb..be44954 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,9 @@
 
  Changes between 1.1.0i and 1.1.1 [xx XXX xxxx]
 
+  *) Add SM2 base algorithm support.
+     [Jack Lloyd]
+
   *) s390x assembly pack: add (improved) hardware-support for the following
      cryptographic primitives: sha3, shake, aes-gcm, aes-ccm, aes-ctr, aes-ofb,
      aes-cfb/cfb8, aes-ecb.