[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  95aec8641fb6f596f170f97852e1e2839f4ec2fc (commit)
      from  63871d9f810fec1e8a441d82c9ac79c58b19e2ad (commit)


- Log -----------------------------------------------------------------
commit 95aec8641fb6f596f170f97852e1e2839f4ec2fc
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Jun 19 21:41:49 2018 +0100

    Document no-sm2
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6532)

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

Summary of changes:
 INSTALL | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/INSTALL b/INSTALL
index b1a5868..51141ef 100644
--- a/INSTALL
+++ b/INSTALL
@@ -548,9 +548,9 @@
                    Build without support for the specified algorithm, where
                    <alg> is one of: aria, bf, blake2, camellia, cast, chacha,
                    cmac, des, dh, dsa, ecdh, ecdsa, idea, md4, mdc2, ocb,
-                   poly1305, rc2, rc4, rmd160, scrypt, seed, siphash, sm3, sm4
-                   or whirlpool.  The "ripemd" algorithm is deprecated and if
-                   used is synonymous with rmd160.
+                   poly1305, rc2, rc4, rmd160, scrypt, seed, siphash, sm2, sm3,
+                   sm4 or whirlpool.  The "ripemd" algorithm is deprecated and
+                   if used is synonymous with rmd160.
 
   -Dxxx, -Ixxx, -Wp, -lxxx, -Lxxx, -Wl, -rpath, -R, -framework, -static
                    These system specific options will be recognised and