Reformat/tidy some of the ASN1 code.
[openssl.git] / crypto / cryptlib.h
index 1b62a5a..0d6b9d5 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifndef FLAT_INC
-# include "../e_os.h"
-#else
-# include "e_os.h"
-#endif
+#include "e_os.h"
 
 #include <openssl/crypto.h>
 #include <openssl/buffer.h> 
 
 #include <openssl/crypto.h>
 #include <openssl/buffer.h> 
@@ -78,7 +70,11 @@ extern "C" {
 #include <openssl/err.h>
 #include <openssl/opensslconf.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"
 #define X509_CERT_AREA         OPENSSLDIR
 #define X509_CERT_DIR          OPENSSLDIR "/certs"
 #define X509_CERT_FILE         OPENSSLDIR "/cert.pem"
@@ -93,6 +89,10 @@ extern "C" {
 #define X509_CERT_DIR_EVP        "SSL_CERT_DIR"
 #define X509_CERT_FILE_EVP       "SSL_CERT_FILE"
 
 #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)
+
 #ifdef  __cplusplus
 }
 #endif
 #ifdef  __cplusplus
 }
 #endif