[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  5f8dd0f849d3bb87b2224715f8880716f39e9b0a (commit)
      from  c57c32a8b1e381a5f272e64db349ebadc1ce4ff5 (commit)


- Log -----------------------------------------------------------------
commit 5f8dd0f849d3bb87b2224715f8880716f39e9b0a
Author: Rich Salz <rsalz at openssl.org>
Date:   Thu Aug 3 16:21:01 2017 -0400

    Add missing include of cryptlib.h
    
    Also use "" not <> for all include cryptlib
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4082)

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

Summary of changes:
 crypto/asn1/tasn_utl.c                 | 2 +-
 crypto/ec/ec_key.c                     | 2 +-
 crypto/include/internal/cryptlib_int.h | 2 +-
 crypto/threads_none.c                  | 2 +-
 crypto/threads_pthread.c               | 2 +-
 ssl/s3_lib.c                           | 1 +
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c
index f79d7d6..9fc4cc2 100644
--- a/crypto/asn1/tasn_utl.c
+++ b/crypto/asn1/tasn_utl.c
@@ -9,7 +9,7 @@
 
 #include <stddef.h>
 #include <string.h>
-#include <internal/cryptlib.h>
+#include "internal/cryptlib.h"
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/objects.h>
diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index 3abf467..4098be6 100644
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -8,7 +8,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <internal/cryptlib.h>
+#include "internal/cryptlib.h"
 #include <string.h>
 #include "ec_lcl.h"
 #include <openssl/err.h>
diff --git a/crypto/include/internal/cryptlib_int.h b/crypto/include/internal/cryptlib_int.h
index 60241d1..3dddf08 100644
--- a/crypto/include/internal/cryptlib_int.h
+++ b/crypto/include/internal/cryptlib_int.h
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <internal/cryptlib.h>
+#include "internal/cryptlib.h"
 
 /* This file is not scanned by mkdef.pl, whereas cryptlib.h is */
 
diff --git a/crypto/threads_none.c b/crypto/threads_none.c
index 1fc2f0f..f7e5359 100644
--- a/crypto/threads_none.c
+++ b/crypto/threads_none.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/crypto.h>
-#include <internal/cryptlib.h>
+#include "internal/cryptlib.h"
 
 #if !defined(OPENSSL_THREADS) || defined(CRYPTO_TDEBUG)
 
diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c
index f7c7921..e28a202 100644
--- a/crypto/threads_pthread.c
+++ b/crypto/threads_pthread.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/crypto.h>
-#include <internal/cryptlib.h>
+#include "internal/cryptlib.h"
 
 #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && !defined(OPENSSL_SYS_WINDOWS)
 
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index e36eb93..fdccdb7 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -15,6 +15,7 @@
 #include <openssl/md5.h>
 #include <openssl/dh.h>
 #include <openssl/rand.h>
+#include "internal/cryptlib.h"
 
 #define SSL3_NUM_CIPHERS        OSSL_NELEM(ssl3_ciphers)
 #define SSL3_NUM_SCSVS          OSSL_NELEM(ssl3_scsvs)