[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  94225cf59ec50e356e2c090bcbe76e1635e6d565 (commit)
      from  01b30563b97d01477e2ab577a8a268991696c6e1 (commit)


- Log -----------------------------------------------------------------
commit 94225cf59ec50e356e2c090bcbe76e1635e6d565
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu May 11 20:20:07 2017 +0200

    Cleanup - use e_os2.h rather than stdint.h
    
    Not exactly everywhere, but in those source files where stdint.h is
    included conditionally, or where it will be eventually
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3447)
    (cherry picked from commit 74a011ebb5e9028ef18982d737a434a8ff926a95)

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

Summary of changes:
 crypto/ec/ecp_nistp521.c | 8 +-------
 include/openssl/bio.h    | 6 +-----
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/crypto/ec/ecp_nistp521.c b/crypto/ec/ecp_nistp521.c
index 7207494..4701d5d 100644
--- a/crypto/ec/ecp_nistp521.c
+++ b/crypto/ec/ecp_nistp521.c
@@ -31,17 +31,11 @@
  * work which got its smarts from Daniel J. Bernstein's work on the same.
  */
 
-#include <openssl/opensslconf.h>
+#include <openssl/e_os2.h>
 #ifdef OPENSSL_NO_EC_NISTP_64_GCC_128
 NON_EMPTY_TRANSLATION_UNIT
 #else
 
-# ifndef OPENSSL_SYS_VMS
-#  include <stdint.h>
-# else
-#  include <inttypes.h>
-# endif
-
 # include <string.h>
 # include <openssl/err.h>
 # include "ec_lcl.h"
diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index 6d45101..7812851 100644
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -20,11 +20,7 @@
 # include <openssl/crypto.h>
 
 # ifndef OPENSSL_NO_SCTP
-#  ifndef OPENSSL_SYS_VMS
-#   include <stdint.h>
-#  else
-#   include <inttypes.h>
-#  endif
+#  include <openssl/e_os2.h>
 # endif
 
 #ifdef  __cplusplus