Reformat/tidy some of the ASN1 code.

[openssl.git] / crypto / cryptlib.h

diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h
index e3d38524ae9cd6cac5cad817ed8923cabb428f56..0d6b9d59f0b1896a31cb1276496db8122aa348af 100644 (file)
--- a/crypto/cryptlib.h
+++ b/crypto/cryptlib.h
@@ -62,11 +62,7 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include "openssl/e_os.h"
+#include "e_os.h"

 
 #include <openssl/crypto.h>
 #include <openssl/buffer.h> 
 
 #include <openssl/crypto.h>
 #include <openssl/buffer.h> 


@@ -74,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"


@@ -89,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