Add OPENSSL_VERSION_AT_LEAST

[openssl.git] / include / internal / cryptlib.h

diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h
index c73c7542424723d02a31b8b96d85a09b76a16d1b..25ccdb1001a835b0de6a5025d0ac045f3908aae4 100644 (file)
--- a/include/internal/cryptlib.h
+++ b/include/internal/cryptlib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -13,8 +13,6 @@
 # include <stdlib.h>
 # include <string.h>
 
-# include "e_os.h"
-
 # ifdef OPENSSL_USE_APPLINK
 #  undef BIO_FLAGS_UPLINK
 #  define BIO_FLAGS_UPLINK 0x8000
@@ -25,6 +23,7 @@
 # include <openssl/buffer.h>
 # include <openssl/bio.h>
 # include <openssl/err.h>
+# include "internal/nelem.h"
 
 #ifdef  __cplusplus
 extern "C" {
@@ -56,6 +55,8 @@ typedef struct app_mem_info_st APP_INFO;
 typedef struct mem_st MEM;
 DEFINE_LHASH_OF(MEM);
 
+# define OPENSSL_CONF             "openssl.cnf"
+
 # ifndef OPENSSL_SYS_VMS
 #  define X509_CERT_AREA          OPENSSLDIR
 #  define X509_CERT_DIR           OPENSSLDIR "/certs"
@@ -85,6 +86,7 @@ extern int OPENSSL_NONPIC_relocated;
 void crypto_cleanup_all_ex_data_int(void);
 int openssl_init_fork_handlers(void);
 
+extern CRYPTO_RWLOCK *memdbg_lock;
 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);
@@ -92,6 +94,10 @@ FILE *openssl_fopen(const char *filename, const char *mode);
 void *openssl_fopen(const char *filename, const char *mode);
 # endif
 
+#ifdef OPENSSL_CPUID_OBJ
+uint32_t OPENSSL_rdtsc();
+#endif
+
 #ifdef  __cplusplus
 }
 #endif