aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2016-04-06 04:49:37 +0000
committerRob Austein <sra@hactrn.net>2016-04-06 04:49:37 +0000
commit007d200523e17d79fd803397ec0c0aaa317c2aa4 (patch)
tree93f2dc4b9110a4c8907c7159ed190b908478fdff
parent14c22156a9cd1e48280fad09338bba2ad6b97e7f (diff)
Start getting ready for OpenSSL 1.1, one deprecated piece of the
OpenSSL API at a time. svn path=/branches/tk705/; revision=6349
-rw-r--r--h/rpki/manifest.h2
-rw-r--r--h/rpki/roa.h4
2 files changed, 6 insertions, 0 deletions
diff --git a/h/rpki/manifest.h b/h/rpki/manifest.h
index 0e6cd531..83d180a7 100644
--- a/h/rpki/manifest.h
+++ b/h/rpki/manifest.h
@@ -66,7 +66,9 @@ typedef struct FileAndHash_st {
ASN1_BIT_STRING *hash;
} FileAndHash;
+#ifdef DECLARE_STACK_OF
DECLARE_STACK_OF(FileAndHash)
+#endif
ASN1_SEQUENCE(FileAndHash) = {
ASN1_SIMPLE(FileAndHash, file, ASN1_IA5STRING),
diff --git a/h/rpki/roa.h b/h/rpki/roa.h
index a63f726b..2198e249 100644
--- a/h/rpki/roa.h
+++ b/h/rpki/roa.h
@@ -66,7 +66,9 @@ typedef struct ROAIPAddress_st {
ASN1_INTEGER *maxLength;
} ROAIPAddress;
+#ifdef DECLARE_STACK_OF
DECLARE_STACK_OF(ROAIPAddress)
+#endif
ASN1_SEQUENCE(ROAIPAddress) = {
ASN1_SIMPLE(ROAIPAddress, IPAddress, ASN1_BIT_STRING),
@@ -78,7 +80,9 @@ typedef struct ROAIPAddressFamily_st {
STACK_OF(ROAIPAddress) *addresses;
} ROAIPAddressFamily;
+#ifdef DECLARE_STACK_OF
DECLARE_STACK_OF(ROAIPAddressFamily)
+#endif
ASN1_SEQUENCE(ROAIPAddressFamily) = {
ASN1_SIMPLE(ROAIPAddressFamily, addressFamily, ASN1_OCTET_STRING),