engines/dasync: add explaining comments about AES-128-CBC-HMAC-SHA1

[openssl.git] / e_os.h

diff --git a/e_os.h b/e_os.h
index 5071af6231970aa14df275e778f022857afea12d..8e6efa9616cfa97734e3bebff699ceca49202e3c 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -22,10 +22,6 @@
  * outside; this file e_os.h is not part of the exported interface.
  */
 
  * outside; this file e_os.h is not part of the exported interface.
  */
 

-#ifdef  __cplusplus
-extern "C" {
-#endif
-

 # ifndef DEVRANDOM
 /*
  * set this to a comma-separated list of 'random' device files to try out. By
 # ifndef DEVRANDOM
 /*
  * set this to a comma-separated list of 'random' device files to try out. By


@@ -53,6 +49,7 @@ extern "C" {
 
 # define get_last_sys_error()    errno
 # define clear_sys_error()       errno=0
 
 # define get_last_sys_error()    errno
 # define clear_sys_error()       errno=0

+# define set_sys_error(e)        errno=(e)

 
 /********************************************************************
  The Microsoft section
 
 /********************************************************************
  The Microsoft section


@@ -70,8 +67,10 @@ extern "C" {
 # ifdef WIN32
 #  undef get_last_sys_error
 #  undef clear_sys_error
 # ifdef WIN32
 #  undef get_last_sys_error
 #  undef clear_sys_error

+#  undef set_sys_error

 #  define get_last_sys_error()    GetLastError()
 #  define clear_sys_error()       SetLastError(0)
 #  define get_last_sys_error()    GetLastError()
 #  define clear_sys_error()       SetLastError(0)

+#  define set_sys_error(e)        SetLastError(e)

 #  if !defined(WINNT)
 #   define WIN_CONSOLE_BUG
 #  endif
 #  if !defined(WINNT)
 #   define WIN_CONSOLE_BUG
 #  endif


@@ -249,7 +248,7 @@ extern FILE *_imp___iob;
 
      Finally, we add the VMS C facility code 0x35a000, because there are some
      programs, such as Perl, that will reinterpret the code back to something
 
      Finally, we add the VMS C facility code 0x35a000, because there are some
      programs, such as Perl, that will reinterpret the code back to something

-     POSIXly.  'man perlvms' explains it further.
+     POSIX.  'man perlvms' explains it further.

 
      NOTE: the perlvms manual wants to turn all codes 2 to 255 into success
      codes (status type = 1).  I couldn't disagree more.  Fortunately, the
 
      NOTE: the perlvms manual wants to turn all codes 2 to 255 into success
      codes (status type = 1).  I couldn't disagree more.  Fortunately, the


@@ -321,12 +320,15 @@ struct servent *getservbyname(const char *name, const char *proto);
 # endif
 /* end vxworks */
 
 # endif
 /* end vxworks */
 

-#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
-# define CRYPTO_memcmp memcmp
-#endif
-
-#ifdef  __cplusplus
-}
-#endif
+# ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+#  define CRYPTO_memcmp memcmp
+# endif

 
 

+/* unistd.h defines _POSIX_VERSION */
+# if !defined(OPENSSL_NO_SECURE_MEMORY) && defined(OPENSSL_SYS_UNIX) \
+     && ( (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L)      \
+          || defined(__sun) || defined(__hpux) || defined(__sgi)      \
+          || defined(__osf__) )
+#  define OPENSSL_SECURE_MEMORY  /* secure memory is implemented */
+# endif

 #endif
 #endif