[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  e2562bbbe1e1c68ec5a3e02c1f151fd6149ee2ae (commit)
      from  057c676afb2a69b7d2bb9cf6e895e720a2a62b78 (commit)


- Log -----------------------------------------------------------------
commit e2562bbbe1e1c68ec5a3e02c1f151fd6149ee2ae
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Mon Sep 12 22:42:37 2016 +0200

    Update INSTALL about no-md5 removal
    
    no-rsa is no longer an option since 7ec8de1
    
    Fix a typo about poly1305
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1582)

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

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

diff --git a/INSTALL b/INSTALL
index e3f47db..a6e8ea6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -479,10 +479,9 @@
   no-<alg>
                    Build without support for the specified algorithm, where
                    <alg> is one of: bf, blake2, camellia, cast, chacha, cmac,
-                   des, dh, dsa, ecdh, ecdsa, idea, md4, md5, mdc2, ocb,
-                   ploy1305, rc2, rc4, rmd160, scrypt, seed or whirlpool. The
-                   "ripemd" algorithm is deprecated and if used is synonymous
-                   with rmd160.
+                   des, dh, dsa, ecdh, ecdsa, idea, md4, mdc2, ocb, poly1305,
+                   rc2, rc4, rmd160, scrypt, seed or whirlpool. The "ripemd"
+                   algorithm is deprecated and if used is synonymous with rmd160.
 
   -Dxxx, -lxxx, -Lxxx, -fxxx, -mXXX, -Kxxx
                    These system specific options will be passed through to the