projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use non-copying BIO interface in ssltest.c.
[oweals/openssl.git]
/
crypto
/
cryptlib.h
diff --git
a/crypto/cryptlib.h
b/crypto/cryptlib.h
index 7208f9e4e9241dcf03d4fac2ead3f931423c9452..e3d38524ae9cd6cac5cad817ed8923cabb428f56 100644
(file)
--- a/
crypto/cryptlib.h
+++ b/
crypto/cryptlib.h
@@
-66,29
+66,25
@@
extern "C" {
#endif
extern "C" {
#endif
-/* #ifdef FLAT_INC */
+#include "openssl/e_os.h"
-#include
"e_os.h"
-#include
"crypto.h"
-#include
"buffer.h"
-#include
"bio.h"
-#include
"err.h"
+#include
<openssl/crypto.h>
+#include
<openssl/buffer.h>
+#include
<openssl/bio.h>
+#include
<openssl/err.h>
+#include
<openssl/opensslconf.h>
-/*
+#ifndef VMS
+#define X509_CERT_AREA OPENSSLDIR
+#define X509_CERT_DIR OPENSSLDIR "/certs"
+#define X509_CERT_FILE OPENSSLDIR "/cert.pem"
+#define X509_PRIVATE_DIR OPENSSLDIR "/private"
#else
#else
-
-#include "../e_os.h"
-#include "crypto.h"
-#include "buffer/buffer.h"
-#include "bio/bio.h"
-#include "err/err.h"
+#define X509_CERT_AREA "SSLROOT:[000000]"
+#define X509_CERT_DIR "SSLCERTS:"
+#define X509_CERT_FILE "SSLCERTS:cert.pem"
+#define X509_PRIVATE_DIR "SSLPRIVATE:"
#endif
#endif
-*/
-
-#define X509_CERT_AREA "/usr/local/ssl"
-#define X509_CERT_DIR "/usr/local/ssl/certs"
-#define X509_CERT_FILE "/usr/local/ssl/cert.pem"
-#define X509_PRIVATE_DIR "/usr/local/ssl/private"
#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"