aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/objects
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/objects')
-rw-r--r--crypto/objects/Makefile.ssl6
-rw-r--r--crypto/objects/o_names.c4
-rw-r--r--crypto/objects/obj_dat.c6
-rw-r--r--crypto/objects/obj_err.c4
-rw-r--r--crypto/objects/obj_lib.c6
-rw-r--r--crypto/objects/objects.h4
6 files changed, 15 insertions, 15 deletions
diff --git a/crypto/objects/Makefile.ssl b/crypto/objects/Makefile.ssl
index d520a7d249..670e6d5f11 100644
--- a/crypto/objects/Makefile.ssl
+++ b/crypto/objects/Makefile.ssl
@@ -50,15 +50,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/objects/o_names.c b/crypto/objects/o_names.c
index 8e5c2af964..22edb0e680 100644
--- a/crypto/objects/o_names.c
+++ b/crypto/objects/o_names.c
@@ -2,8 +2,8 @@
#include <stdlib.h>
#include <string.h>
-#include "lhash.h"
-#include "objects.h"
+#include <openssl/lhash.h>
+#include <openssl/objects.h>
/* I use the ex_data stuff to manage the identifiers for the obj_name_types
* that applications may define. I only really use the free function field.
diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index f42c462ac4..43b5c4a10e 100644
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -59,9 +59,9 @@
#include <stdio.h>
#include <ctype.h>
#include "cryptlib.h"
-#include "lhash.h"
-#include "asn1.h"
-#include "objects.h"
+#include <openssl/lhash.h>
+#include <openssl/asn1.h>
+#include <openssl/objects.h>
/* obj_dat.h is generated from objects.h by obj_dat.pl */
#ifndef NO_OBJECT
diff --git a/crypto/objects/obj_err.c b/crypto/objects/obj_err.c
index 50d52060b7..05c33bdc38 100644
--- a/crypto/objects/obj_err.c
+++ b/crypto/objects/obj_err.c
@@ -56,8 +56,8 @@
* [including the GNU Public Licence.]
*/
#include <stdio.h>
-#include "err.h"
-#include "objects.h"
+#include <openssl/err.h>
+#include <openssl/objects.h>
/* BEGIN ERROR CODES */
#ifndef NO_ERR
diff --git a/crypto/objects/obj_lib.c b/crypto/objects/obj_lib.c
index 1f0b906048..1a1ba0fc06 100644
--- a/crypto/objects/obj_lib.c
+++ b/crypto/objects/obj_lib.c
@@ -58,9 +58,9 @@
#include <stdio.h>
#include "cryptlib.h"
-#include "lhash.h"
-#include "objects.h"
-#include "buffer.h"
+#include <openssl/lhash.h>
+#include <openssl/objects.h>
+#include <openssl/buffer.h>
ASN1_OBJECT *OBJ_dup(ASN1_OBJECT *o)
{
diff --git a/crypto/objects/objects.h b/crypto/objects/objects.h
index 6669f1f544..d636df147d 100644
--- a/crypto/objects/objects.h
+++ b/crypto/objects/objects.h
@@ -866,8 +866,8 @@ extern "C" {
#define NID_id_qt_unotice 165
#define OBJ_id_qt_unotice OBJ_id_pkix,2L,2L
-#include "bio.h"
-#include "asn1.h"
+#include <openssl/bio.h>
+#include <openssl/asn1.h>
#define OBJ_NAME_TYPE_UNDEF 0x00
#define OBJ_NAME_TYPE_MD_METH 0x01