[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  42a9f38613e05fc653cfb773518213e5333bf09b (commit)
       via  1e8ead8688f0afb5584264c29907f089cc1f6a8a (commit)
      from  dc3c5067cd90f3f2159e5d53c57b92730c687d7e (commit)


- Log -----------------------------------------------------------------
commit 42a9f38613e05fc653cfb773518213e5333bf09b
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Wed Apr 20 13:51:58 2016 -0500

    Remove the never-functional no-sct
    
    It was added as part of 2df84dd3299ff25fa078ca7ffbdeaac65b361feb
    but has never actually been used for anything; presumably it was
    a typo for one of SCTP or CT.
    
    This removes the last '??' entry from INSTALL.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 1e8ead8688f0afb5584264c29907f089cc1f6a8a
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Wed Apr 20 13:58:25 2016 -0500

    Remove some OPENSSL_NO_SHA that snuck in
    
    Commit d064e6ab52ac8e7b80b2a5d11b31bca583b769c7 removed all the
    OPENSSL_NO_SHA guards, but commit
    a50ad1daaa68c109ea1a14225a7aba8660526101 regenerated some due to the
    sha entries in the %md_disabler table in apps/progs.pl.
    
    Update %md_disabler to reflect that sha is not disableable, and
    remove OPENSSL_NO_SHA for good.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 Configure      |  1 -
 INSTALL        |  3 ---
 apps/openssl.c |  3 ---
 apps/progs.h   | 10 ----------
 apps/progs.pl  |  5 -----
 5 files changed, 22 deletions(-)

diff --git a/Configure b/Configure
index b32cb94..54130e2 100755
--- a/Configure
+++ b/Configure
@@ -307,7 +307,6 @@ my @disablables = (
     "ripemd",
     "rmd160",
     "scrypt",
-    "sct",
     "sctp",
     "seed",
     "shared",
diff --git a/INSTALL b/INSTALL
index 2e06aa7..7d8de32 100644
--- a/INSTALL
+++ b/INSTALL
@@ -234,9 +234,6 @@
                    Don't build support for RFC3779 ("X.509 Extensions for IP
                    Addresses and AS Identifiers")
 
-  no-sct
-                   ??
-
   sctp
                    Build support for SCTP
 
diff --git a/apps/openssl.c b/apps/openssl.c
index f2fb295..7710c3a 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -741,9 +741,6 @@ static void list_disabled(void)
 #ifdef OPENSSL_NO_SCRYPT
     BIO_puts(bio_out, "SCRYPT\n");
 #endif
-#ifdef OPENSSL_NO_SCT
-    BIO_puts(bio_out, "SCT\n");
-#endif
 #ifdef OPENSSL_NO_SCTP
     BIO_puts(bio_out, "SCTP\n");
 #endif
diff --git a/apps/progs.h b/apps/progs.h
index 346d583..9cc2f2b 100644
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -220,21 +220,11 @@ static FUNCTION functions[] = {
 #ifndef OPENSSL_NO_GOST
     { FT_md, "gost", dgst_main},
 #endif
-#ifndef OPENSSL_NO_SHA
     { FT_md, "sha1", dgst_main},
-#endif
-#ifndef OPENSSL_NO_SHA
     { FT_md, "sha224", dgst_main},
-#endif
-#ifndef OPENSSL_NO_SHA
     { FT_md, "sha256", dgst_main},
-#endif
-#ifndef OPENSSL_NO_SHA
     { FT_md, "sha384", dgst_main},
-#endif
-#ifndef OPENSSL_NO_SHA
     { FT_md, "sha512", dgst_main},
-#endif
 #ifndef OPENSSL_NO_MDC2
     { FT_md, "mdc2", dgst_main},
 #endif
diff --git a/apps/progs.pl b/apps/progs.pl
index 78e13e0..e43d436 100644
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -93,11 +93,6 @@ foreach my $cmd (@ARGV) {
 }
 
 my %md_disabler = (
-    sha1       => "sha",
-    sha224     => "sha",
-    sha256     => "sha",
-    sha384     => "sha",
-    sha512     => "sha",
     blake2b512 => "blake2",
     blake2s256 => "blake2",
     );