aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/x509
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/x509')
-rw-r--r--crypto/x509/Makefile.ssl6
-rw-r--r--crypto/x509/by_dir.c4
-rw-r--r--crypto/x509/by_file.c8
-rw-r--r--crypto/x509/x509.h18
-rw-r--r--crypto/x509/x509_cmp.c6
-rw-r--r--crypto/x509/x509_d2.c4
-rw-r--r--crypto/x509/x509_def.c4
-rw-r--r--crypto/x509/x509_err.c4
-rw-r--r--crypto/x509/x509_ext.c10
-rw-r--r--crypto/x509/x509_lu.c4
-rw-r--r--crypto/x509/x509_obj.c8
-rw-r--r--crypto/x509/x509_r2x.c12
-rw-r--r--crypto/x509/x509_req.c14
-rw-r--r--crypto/x509/x509_set.c8
-rw-r--r--crypto/x509/x509_txt.c12
-rw-r--r--crypto/x509/x509_v3.c10
-rw-r--r--crypto/x509/x509_vfy.c14
-rw-r--r--crypto/x509/x509_vfy.h4
-rw-r--r--crypto/x509/x509name.c10
-rw-r--r--crypto/x509/x509rset.c8
-rw-r--r--crypto/x509/x509type.c6
-rw-r--r--crypto/x509/x_all.c10
22 files changed, 92 insertions, 92 deletions
diff --git a/crypto/x509/Makefile.ssl b/crypto/x509/Makefile.ssl
index e71c2a8f62..9b5334faf2 100644
--- a/crypto/x509/Makefile.ssl
+++ b/crypto/x509/Makefile.ssl
@@ -57,15 +57,15 @@ files:
links:
@$(TOP)/util/point.sh Makefile.ssl Makefile
- @$(TOP)/util/mklink.sh ../../include $(EXHEADER)
+ @$(TOP)/util/mklink.sh ../../include/openssl $(EXHEADER)
@$(TOP)/util/mklink.sh ../../test $(TEST)
@$(TOP)/util/mklink.sh ../../apps $(APPS)
install:
@for i in $(EXHEADER) ; \
do \
- (cp $$i $(INSTALLTOP)/include/$$i; \
- chmod 644 $(INSTALLTOP)/include/$$i ); \
+ (cp $$i $(INSTALLTOP)/include/openssl/$$i; \
+ chmod 644 $(INSTALLTOP)/include/openssl/$$i ); \
done;
tags:
diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index 95c7aa92b0..0c7269c854 100644
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -63,8 +63,8 @@
#include <sys/stat.h>
#include "cryptlib.h"
-#include "lhash.h"
-#include "x509.h"
+#include <openssl/lhash.h>
+#include <openssl/x509.h>
typedef struct lookup_dir_st
{
diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c
index 95d57df3c7..5eb6cf2051 100644
--- a/crypto/x509/by_file.c
+++ b/crypto/x509/by_file.c
@@ -63,10 +63,10 @@
#include <sys/stat.h>
#include "cryptlib.h"
-#include "lhash.h"
-#include "buffer.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/lhash.h>
+#include <openssl/buffer.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
#ifndef NO_STDIO
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index 856872e138..59c4fee7db 100644
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -64,29 +64,29 @@
extern "C" {
#endif
-#include "stack.h"
-#include "asn1.h"
-#include "safestack.h"
+#include <openssl/stack.h>
+#include <openssl/asn1.h>
+#include <openssl/safestack.h>
#ifndef NO_RSA
-#include "rsa.h"
+#include <openssl/rsa.h>
#else
#define RSA long
#endif
#ifndef NO_DSA
-#include "dsa.h"
+#include <openssl/dsa.h>
#else
#define DSA long
#endif
#ifndef NO_DH
-#include "dh.h"
+#include <openssl/dh.h>
#else
#define DH long
#endif
-#include "evp.h"
+#include <openssl/evp.h>
#define X509_FILETYPE_PEM 1
#define X509_FILETYPE_ASN1 2
@@ -362,8 +362,8 @@ typedef struct pkcs8_priv_key_info_st
STACK *attributes;
} PKCS8_PRIV_KEY_INFO;
-#include "x509_vfy.h"
-#include "pkcs7.h"
+#include <openssl/x509_vfy.h>
+#include <openssl/pkcs7.h>
#ifdef SSLEAY_MACROS
#define X509_verify(a,r) ASN1_verify((int (*)())i2d_X509_CINF,a->sig_alg,\
diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c
index 899b00eb13..bc645d1a86 100644
--- a/crypto/x509/x509_cmp.c
+++ b/crypto/x509/x509_cmp.c
@@ -60,9 +60,9 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "cryptlib.h"
-#include "asn1.h"
-#include "objects.h"
-#include "x509.h"
+#include <openssl/asn1.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
int X509_issuer_and_serial_cmp(X509 *a, X509 *b)
{
diff --git a/crypto/x509/x509_d2.c b/crypto/x509/x509_d2.c
index 35c7157301..f8f1aa6b7b 100644
--- a/crypto/x509/x509_d2.c
+++ b/crypto/x509/x509_d2.c
@@ -60,8 +60,8 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "cryptlib.h"
-#include "crypto.h"
-#include "x509.h"
+#include <openssl/crypto.h>
+#include <openssl/x509.h>
#ifndef NO_STDIO
int X509_STORE_set_default_paths(X509_STORE *ctx)
diff --git a/crypto/x509/x509_def.c b/crypto/x509/x509_def.c
index e3126bf887..c4bee71569 100644
--- a/crypto/x509/x509_def.c
+++ b/crypto/x509/x509_def.c
@@ -60,8 +60,8 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "cryptlib.h"
-#include "crypto.h"
-#include "x509.h"
+#include <openssl/crypto.h>
+#include <openssl/x509.h>
const char *X509_get_default_private_dir(void)
{ return(X509_PRIVATE_DIR); }
diff --git a/crypto/x509/x509_err.c b/crypto/x509/x509_err.c
index 0b5ca59221..75cc8df0e0 100644
--- a/crypto/x509/x509_err.c
+++ b/crypto/x509/x509_err.c
@@ -56,8 +56,8 @@
* [including the GNU Public Licence.]
*/
#include <stdio.h>
-#include "err.h"
-#include "x509.h"
+#include <openssl/err.h>
+#include <openssl/x509.h>
/* BEGIN ERROR CODES */
#ifndef NO_ERR
diff --git a/crypto/x509/x509_ext.c b/crypto/x509/x509_ext.c
index 723b1d4d54..6fbab00ec8 100644
--- a/crypto/x509/x509_ext.c
+++ b/crypto/x509/x509_ext.c
@@ -57,12 +57,12 @@
*/
#include <stdio.h>
-#include "stack.h"
+#include <openssl/stack.h>
#include "cryptlib.h"
-#include "asn1.h"
-#include "objects.h"
-#include "evp.h"
-#include "x509.h"
+#include <openssl/asn1.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
int X509_CRL_get_ext_count(X509_CRL *x)
{
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index 65b6bcd0d2..2bdf613d4f 100644
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -58,8 +58,8 @@
#include <stdio.h>
#include "cryptlib.h"
-#include "lhash.h"
-#include "x509.h"
+#include <openssl/lhash.h>
+#include <openssl/x509.h>
static STACK *x509_store_meth=NULL;
static STACK *x509_store_ctx_meth=NULL;
diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c
index dd6fdbb7f9..188457872a 100644
--- a/crypto/x509/x509_obj.c
+++ b/crypto/x509/x509_obj.c
@@ -58,10 +58,10 @@
#include <stdio.h>
#include "cryptlib.h"
-#include "lhash.h"
-#include "objects.h"
-#include "x509.h"
-#include "buffer.h"
+#include <openssl/lhash.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
+#include <openssl/buffer.h>
char *X509_NAME_oneline(X509_NAME *a, char *buf, int len)
{
diff --git a/crypto/x509/x509_r2x.c b/crypto/x509/x509_r2x.c
index f9c498a55d..ec92d2f8a8 100644
--- a/crypto/x509/x509_r2x.c
+++ b/crypto/x509/x509_r2x.c
@@ -58,12 +58,12 @@
#include <stdio.h>
#include "cryptlib.h"
-#include "bn.h"
-#include "evp.h"
-#include "asn1.h"
-#include "x509.h"
-#include "objects.h"
-#include "buffer.h"
+#include <openssl/bn.h>
+#include <openssl/evp.h>
+#include <openssl/asn1.h>
+#include <openssl/x509.h>
+#include <openssl/objects.h>
+#include <openssl/buffer.h>
X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
{
diff --git a/crypto/x509/x509_req.c b/crypto/x509/x509_req.c
index 1f9e232c6a..2ef94decd1 100644
--- a/crypto/x509/x509_req.c
+++ b/crypto/x509/x509_req.c
@@ -58,13 +58,13 @@
#include <stdio.h>
#include "cryptlib.h"
-#include "bn.h"
-#include "evp.h"
-#include "asn1.h"
-#include "x509.h"
-#include "objects.h"
-#include "buffer.h"
-#include "pem.h"
+#include <openssl/bn.h>
+#include <openssl/evp.h>
+#include <openssl/asn1.h>
+#include <openssl/x509.h>
+#include <openssl/objects.h>
+#include <openssl/buffer.h>
+#include <openssl/pem.h>
X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, EVP_MD *md)
{
diff --git a/crypto/x509/x509_set.c b/crypto/x509/x509_set.c
index da5299dcdb..5a6f7b414f 100644
--- a/crypto/x509/x509_set.c
+++ b/crypto/x509/x509_set.c
@@ -58,10 +58,10 @@
#include <stdio.h>
#include "cryptlib.h"
-#include "asn1.h"
-#include "objects.h"
-#include "evp.h"
-#include "x509.h"
+#include <openssl/asn1.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
int X509_set_version(X509 *x, long version)
{
diff --git a/crypto/x509/x509_txt.c b/crypto/x509/x509_txt.c
index 06f284b0a6..11a3d2012f 100644
--- a/crypto/x509/x509_txt.c
+++ b/crypto/x509/x509_txt.c
@@ -62,12 +62,12 @@
#include <sys/types.h>
#include "cryptlib.h"
-#include "lhash.h"
-#include "buffer.h"
-#include "evp.h"
-#include "asn1.h"
-#include "x509.h"
-#include "objects.h"
+#include <openssl/lhash.h>
+#include <openssl/buffer.h>
+#include <openssl/evp.h>
+#include <openssl/asn1.h>
+#include <openssl/x509.h>
+#include <openssl/objects.h>
const char *X509_verify_cert_error_string(long n)
{
diff --git a/crypto/x509/x509_v3.c b/crypto/x509/x509_v3.c
index 83988cf194..18193c33fe 100644
--- a/crypto/x509/x509_v3.c
+++ b/crypto/x509/x509_v3.c
@@ -57,12 +57,12 @@
*/
#include <stdio.h>
-#include "stack.h"
+#include <openssl/stack.h>
#include "cryptlib.h"
-#include "asn1.h"
-#include "objects.h"
-#include "evp.h"
-#include "x509.h"
+#include <openssl/asn1.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
int X509v3_get_ext_count(STACK *x)
{
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index 26ca42144b..cd0a579965 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -62,14 +62,14 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include "crypto.h"
+#include <openssl/crypto.h>
#include "cryptlib.h"
-#include "lhash.h"
-#include "buffer.h"
-#include "evp.h"
-#include "asn1.h"
-#include "x509.h"
-#include "objects.h"
+#include <openssl/lhash.h>
+#include <openssl/buffer.h>
+#include <openssl/evp.h>
+#include <openssl/asn1.h>
+#include <openssl/x509.h>
+#include <openssl/objects.h>
#ifndef NOPROTO
static int null_callback(int ok,X509_STORE_CTX *e);
diff --git a/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h
index fd70b74961..41f65f7275 100644
--- a/crypto/x509/x509_vfy.h
+++ b/crypto/x509/x509_vfy.h
@@ -63,8 +63,8 @@
extern "C" {
#endif
-#include "bio.h"
-#include "crypto.h"
+#include <openssl/bio.h>
+#include <openssl/crypto.h>
/* Outer object */
typedef struct x509_hash_dir_st
diff --git a/crypto/x509/x509name.c b/crypto/x509/x509name.c
index 2bc5f29d08..d5172a9b03 100644
--- a/crypto/x509/x509name.c
+++ b/crypto/x509/x509name.c
@@ -57,12 +57,12 @@
*/
#include <stdio.h>
-#include "stack.h"
+#include <openssl/stack.h>
#include "cryptlib.h"
-#include "asn1.h"
-#include "objects.h"
-#include "evp.h"
-#include "x509.h"
+#include <openssl/asn1.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len)
{
diff --git a/crypto/x509/x509rset.c b/crypto/x509/x509rset.c
index 9f8032da0e..d9f6b57372 100644
--- a/crypto/x509/x509rset.c
+++ b/crypto/x509/x509rset.c
@@ -58,10 +58,10 @@
#include <stdio.h>
#include "cryptlib.h"
-#include "asn1.h"
-#include "objects.h"
-#include "evp.h"
-#include "x509.h"
+#include <openssl/asn1.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
int X509_REQ_set_version(X509_REQ *x, long version)
{
diff --git a/crypto/x509/x509type.c b/crypto/x509/x509type.c
index 992cd483b1..8e78b34458 100644
--- a/crypto/x509/x509type.c
+++ b/crypto/x509/x509type.c
@@ -58,9 +58,9 @@
#include <stdio.h>
#include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
int X509_certificate_type(X509 *x, EVP_PKEY *pkey)
{
diff --git a/crypto/x509/x_all.c b/crypto/x509/x_all.c
index 0e4302f64f..e7aee87dbe 100644
--- a/crypto/x509/x_all.c
+++ b/crypto/x509/x_all.c
@@ -58,12 +58,12 @@
#include <stdio.h>
#undef SSLEAY_MACROS
-#include "stack.h"
+#include <openssl/stack.h>
#include "cryptlib.h"
-#include "buffer.h"
-#include "asn1.h"
-#include "evp.h"
-#include "x509.h"
+#include <openssl/buffer.h>
+#include <openssl/asn1.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
int X509_verify(X509 *a, EVP_PKEY *r)
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-12 17:45:32 +0000