[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  c7e10755fac1d8f4421aa60646d311ab2068752d (commit)
      from  774ff8fed67e19d4f5f0df2f59050f2737abab2a (commit)


- Log -----------------------------------------------------------------
commit c7e10755fac1d8f4421aa60646d311ab2068752d
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Tue May 1 23:25:16 2018 +0200

    opensslconf.h inclusion cleanup
    No need to buildtest on opensslconf.h
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6149)

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

Summary of changes:
 crypto/rand/rand_egd.c | 1 -
 include/openssl/dsa.h  | 1 -
 test/build.info        | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/crypto/rand/rand_egd.c b/crypto/rand/rand_egd.c
index 5eb3225..461ef25 100644
--- a/crypto/rand/rand_egd.c
+++ b/crypto/rand/rand_egd.c
@@ -38,7 +38,6 @@ int RAND_egd_bytes(const char *path, int bytes)
 
 # else
 
-#  include <openssl/opensslconf.h>
 #  include OPENSSL_UNISTD
 #  include <stddef.h>
 #  include <sys/types.h>
diff --git a/include/openssl/dsa.h b/include/openssl/dsa.h
index a5d539f..5a06847 100644
--- a/include/openssl/dsa.h
+++ b/include/openssl/dsa.h
@@ -20,7 +20,6 @@ extern "C" {
 # include <openssl/bio.h>
 # include <openssl/crypto.h>
 # include <openssl/ossl_typ.h>
-# include <openssl/opensslconf.h>
 # include <openssl/bn.h>
 # if OPENSSL_API_COMPAT < 0x10100000L
 #  include <openssl/dh.h>
diff --git a/test/build.info b/test/build.info
index 7887813..1708e94 100644
--- a/test/build.info
+++ b/test/build.info
@@ -536,6 +536,7 @@ ENDIF
    use OpenSSL::Glob;
 
    my @nogo_headers = ( "asn1_mac.h",
+                        "opensslconf.h",
                         "__decc_include_prologue.h",
                         "__decc_include_epilogue.h" );
    my @nogo_headers_re = ( qr/.*err\.h/ );