From 68d8ff79fc48cb0ae82399628cd7bf1ca459bc3b Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Fri, 8 Apr 2016 21:25:43 +0000
Subject: OpenSSL 1.1 compatability, part 1.

OpenSSL 1.1 will include some backwards-compatible API changes.  In
some cases, the new API won't be available until OpenSSL 1.1, but a
lot of the new API already exists in OpenSSL 1.0.2.

This commit switches the parts that can be switched with OpenSSL 1.0.
Other changes deferred until OpenSSL 1.1 public release.

svn path=/branches/tk705/; revision=6351
---
 h/rpki/manifest.h    |  7 ++++---
 h/rpki/roa.h         | 14 ++++++++++----
 h/rpki/sk_manifest.h |  2 +-
 h/rpki/sk_roa.h      |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'h')

diff --git a/h/rpki/manifest.h b/h/rpki/manifest.h
index 83d180a7..5e5ddf67 100644
--- a/h/rpki/manifest.h
+++ b/h/rpki/manifest.h
@@ -44,8 +44,6 @@
 #include <openssl/asn1t.h>
 #include <openssl/cms.h>
 
-#include <rpki/sk_manifest.h>
-
 /*
  * ASN.1 templates.  Not sure that ASN1_EXP_OPT() is the right macro
  * for these defaulted "version" fields, but it's what the examples
@@ -66,8 +64,11 @@ typedef struct FileAndHash_st {
   ASN1_BIT_STRING *hash;
 } FileAndHash;
 
-#ifdef DECLARE_STACK_OF
+#ifdef DEFINE_STACK_OF
+DEFINE_STACK_OF(FileAndHash)
+#else
 DECLARE_STACK_OF(FileAndHash)
+#include <rpki/sk_manifest.h>
 #endif
 
 ASN1_SEQUENCE(FileAndHash) = {
diff --git a/h/rpki/roa.h b/h/rpki/roa.h
index 2198e249..36f1ec5c 100644
--- a/h/rpki/roa.h
+++ b/h/rpki/roa.h
@@ -44,8 +44,6 @@
 #include <openssl/asn1t.h>
 #include <openssl/cms.h>
 
-#include <rpki/sk_roa.h>
-
 /*
  * ASN.1 templates.  Not sure that ASN1_EXP_OPT() is the right macro
  * for these defaulted "version" fields, but it's what the examples
@@ -66,7 +64,9 @@ typedef struct ROAIPAddress_st {
   ASN1_INTEGER *maxLength;
 } ROAIPAddress;
 
-#ifdef DECLARE_STACK_OF
+#ifdef DEFINE_STACK_OF
+DEFINE_STACK_OF(ROAIPAddress)
+#else
 DECLARE_STACK_OF(ROAIPAddress)
 #endif
 
@@ -80,7 +80,9 @@ typedef struct ROAIPAddressFamily_st {
   STACK_OF(ROAIPAddress) *addresses;
 } ROAIPAddressFamily;
 
-#ifdef DECLARE_STACK_OF
+#ifdef DEFINE_STACK_OF
+DEFINE_STACK_OF(ROAIPAddressFamily)
+#else
 DECLARE_STACK_OF(ROAIPAddressFamily)
 #endif
 
@@ -108,6 +110,10 @@ IMPLEMENT_ASN1_FUNCTIONS(ROAIPAddress)
 IMPLEMENT_ASN1_FUNCTIONS(ROAIPAddressFamily)
 IMPLEMENT_ASN1_FUNCTIONS(ROA)
 
+#ifndef DEFINE_STACK_OF
+#include <rpki/sk_roa.h>
+#endif
+
 #endif /* DOXYGEN_GETS_HOPELESSLY_CONFUSED_BY_THIS_SECTION */
 
 #endif /* __ROA_H__ */
diff --git a/h/rpki/sk_manifest.h b/h/rpki/sk_manifest.h
index 59ff80a5..48ad6317 100644
--- a/h/rpki/sk_manifest.h
+++ b/h/rpki/sk_manifest.h
@@ -1,6 +1,6 @@
 /*
  * Automatically generated, do not edit.
- * Generator $Id: defstack.py 4878 2012-11-15 22:13:53Z sra $
+ * Generator $Id: defstack.py 6152 2015-10-26 06:29:00Z sra $
  */
 
 #ifndef __RPKI_MANIFEST_H__DEFSTACK_H__
diff --git a/h/rpki/sk_roa.h b/h/rpki/sk_roa.h
index 7423f8ff..7952e3c2 100644
--- a/h/rpki/sk_roa.h
+++ b/h/rpki/sk_roa.h
@@ -1,6 +1,6 @@
 /*
  * Automatically generated, do not edit.
- * Generator $Id: defstack.py 5784 2014-04-10 22:56:47Z sra $
+ * Generator $Id: defstack.py 6152 2015-10-26 06:29:00Z sra $
  */
 
 #ifndef __RPKI_ROA_H__DEFSTACK_H__
-- 
cgit v1.2.3