X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Finclude%2Finternal%2Fcryptlib.h;h=91267b78fc76fa6698d7ab032545a3c9b56c125d;hp=f2377d1c932db5691053b508049e99c3086e430b;hb=a90f8d7641d89bf36203784527b298c117e41335;hpb=7d37818dacc87c21dfc9d2def5014657344875e3

diff --git a/crypto/include/internal/cryptlib.h b/crypto/include/internal/cryptlib.h
index f2377d1c93..91267b78fc 100644
--- a/crypto/include/internal/cryptlib.h
+++ b/crypto/include/internal/cryptlib.h
@@ -16,6 +16,7 @@
 # include "e_os.h"
 
 # ifdef OPENSSL_USE_APPLINK
+#  undef BIO_FLAGS_UPLINK
 #  define BIO_FLAGS_UPLINK 0x8000
 #  include "ms/uplink.h"
 # endif
@@ -24,7 +25,6 @@
 # include <openssl/buffer.h>
 # include <openssl/bio.h>
 # include <openssl/err.h>
-# include <openssl/opensslconf.h>
 
 #ifdef  __cplusplus
 extern "C" {
@@ -46,11 +46,11 @@ DEFINE_LHASH_OF(MEM);
 #  define X509_PRIVATE_DIR        OPENSSLDIR "/private"
 #  define CTLOG_FILE              OPENSSLDIR "/ct_log_list.cnf"
 # else
-#  define X509_CERT_AREA          "SSLROOT:[000000]"
-#  define X509_CERT_DIR           "SSLCERTS:"
-#  define X509_CERT_FILE          "SSLCERTS:cert.pem"
-#  define X509_PRIVATE_DIR        "SSLPRIVATE:"
-#  define CTLOG_FILE              "SSLROOT:ct_log_list.cnf"
+#  define X509_CERT_AREA          "OSSL$DATAROOT:[000000]"
+#  define X509_CERT_DIR           "OSSL$DATAROOT:[CERTS]"
+#  define X509_CERT_FILE          "OSSL$DATAROOT:[000000]cert.pem"
+#  define X509_PRIVATE_DIR        "OSSL$DATAROOT:[PRIVATE]"
+#  define CTLOG_FILE              "OSSL$DATAROOT:[000000]ct_log_list.cnf"
 # endif
 
 # define X509_CERT_DIR_EVP        "SSL_CERT_DIR"
@@ -68,6 +68,11 @@ extern int OPENSSL_NONPIC_relocated;
 void crypto_cleanup_all_ex_data_int(void);
 
 int openssl_strerror_r(int errnum, char *buf, size_t buflen);
+# if !defined(OPENSSL_NO_STDIO)
+FILE *openssl_fopen(const char *filename, const char *mode);
+# else
+void *openssl_fopen(const char *filename, const char *mode);
+# endif
 
 #ifdef  __cplusplus
 }