e_os.h does not belong with the exported headers. Do not put it there

[openssl.git] / crypto / cryptlib.h

diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h
index 8671bea9ff823dba93a638aaae9e77f337409405..a0489e57fc9d9334272f8bdf39bde1bfdf24a335 100644 (file)
--- a/crypto/cryptlib.h
+++ b/crypto/cryptlib.h
@@ -62,33 +62,29 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
+#include "e_os.h"
 
-/* #ifdef FLAT_INC */
-
-#include <openssl/e_os.h>
 #include <openssl/crypto.h>
 #include <openssl/buffer.h> 
 #include <openssl/bio.h> 
 #include <openssl/err.h>
+#include <openssl/opensslconf.h>
 
-/*
-#else
-
-#include "../e_os.h"
-#include <openssl/crypto.h>
-#include "buffer/buffer.h"
-#include "bio/bio.h"
-#include "err/err.h"
+#ifdef  __cplusplus
+extern "C" {
 #endif
-*/
 
-#define X509_CERT_AREA         "/usr/local/ssl"
-#define X509_CERT_DIR          "/usr/local/ssl/certs"
-#define X509_CERT_FILE         "/usr/local/ssl/cert.pem"
-#define X509_PRIVATE_DIR       "/usr/local/ssl/private"
+#ifndef OPENSSL_SYS_VMS
+#define X509_CERT_AREA         OPENSSLDIR
+#define X509_CERT_DIR          OPENSSLDIR "/certs"
+#define X509_CERT_FILE         OPENSSLDIR "/cert.pem"
+#define X509_PRIVATE_DIR       OPENSSLDIR "/private"
+#else
+#define X509_CERT_AREA         "SSLROOT:[000000]"
+#define X509_CERT_DIR          "SSLCERTS:"
+#define X509_CERT_FILE         "SSLCERTS:cert.pem"
+#define X509_PRIVATE_DIR        "SSLPRIVATE:"
+#endif
 
 #define X509_CERT_DIR_EVP        "SSL_CERT_DIR"
 #define X509_CERT_FILE_EVP       "SSL_CERT_FILE"