projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New function RSA_check_key.
[openssl.git]
/
e_os.h
diff --git
a/e_os.h
b/e_os.h
index f480f6223e2c4c94ce1d3304229e623d75beb8ed..58934d1be104f5d49264ae1c0002c2448032483c 100644
(file)
--- a/
e_os.h
+++ b/
e_os.h
@@
-59,10
+59,12
@@
#ifndef HEADER_E_OS_H
#define HEADER_E_OS_H
#ifndef HEADER_E_OS_H
#define HEADER_E_OS_H
+#include <openssl/opensslconf.h>
+
#include <openssl/e_os2.h>
/* <openssl/e_os2.h> contains what we can justify to make visible
#include <openssl/e_os2.h>
/* <openssl/e_os2.h> contains what we can justify to make visible
- * to the outside
. e_os.h shouldn't even be in the include/openssl
- *
directory, these are just local definitions
. */
+ * to the outside
; this file e_os.h is not part of the exported
+ *
interface
. */
#ifdef __cplusplus
extern "C" {
#ifdef __cplusplus
extern "C" {
@@
-103,9
+105,6
@@
extern "C" {
#ifdef WIN32
#define get_last_sys_error() GetLastError()
#define clear_sys_error() SetLastError(0)
#ifdef WIN32
#define get_last_sys_error() GetLastError()
#define clear_sys_error() SetLastError(0)
-/* These are defined in wincrypt.h and can cause problems */
-#undef X509_NAME
-#undef PKCS7_SIGNER_INFO
#if !defined(WINNT)
#define WIN_CONSOLE_BUG
#endif
#if !defined(WINNT)
#define WIN_CONSOLE_BUG
#endif
@@
-229,7
+228,8
@@
extern "C" {
return(n); } while(0)
# endif
# else
return(n); } while(0)
# endif
# else
-# include <unistd.h>
+ /* !defined VMS */
+# include OPENSSL_UNISTD
# define OPENSSL_CONF "openssl.cnf"
# define SSLEAY_CONF OPENSSL_CONF
# define OPENSSL_CONF "openssl.cnf"
# define SSLEAY_CONF OPENSSL_CONF
@@
-351,6
+351,9
@@
extern HINSTANCE _hInstance;
#ifdef sgi
#define IRIX_CC_BUG /* all version of IRIX I've tested (4.* 5.*) */
#endif
#ifdef sgi
#define IRIX_CC_BUG /* all version of IRIX I've tested (4.* 5.*) */
#endif
+#ifdef SNI
+#define IRIX_CC_BUG /* CDS++ up to V2.0Bsomething suffered from the same bug.*/
+#endif
#ifdef NO_MD2
#define MD2_Init MD2Init
#ifdef NO_MD2
#define MD2_Init MD2Init