Make VIA Padlock engine more platform friendly and eliminate compiler

[openssl.git] / crypto / cryptlib.h

diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h
index 967385281009c156a19a3315c13850f155287f5a..8b0add7e20d9134d1bea04d310ee176b929d0a47 100644 (file)
--- a/crypto/cryptlib.h
+++ b/crypto/cryptlib.h
@@ -62,18 +62,19 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
+#include "e_os.h"
 
-#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>
 
-#ifndef VMS
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#ifndef OPENSSL_SYS_VMS
 #define X509_CERT_AREA         OPENSSLDIR
 #define X509_CERT_DIR          OPENSSLDIR "/certs"
 #define X509_CERT_FILE         OPENSSLDIR "/cert.pem"
@@ -88,6 +89,13 @@ extern "C" {
 #define X509_CERT_DIR_EVP        "SSL_CERT_DIR"
 #define X509_CERT_FILE_EVP       "SSL_CERT_FILE"
 
+/* size of string representations */
+#define DECIMAL_SIZE(type)     ((sizeof(type)*8+2)/3+1)
+#define HEX_SIZE(type)         (sizeof(type)*2)
+
+void OPENSSL_cpuid_setup(void);
+extern unsigned long OPENSSL_ia32cap_P;
+
 #ifdef  __cplusplus
 }
 #endif