diff options
| author | Rob Austein <sra@hactrn.net> | 2016-04-08 21:25:43 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-04-08 21:25:43 +0000 |
| commit | 68d8ff79fc48cb0ae82399628cd7bf1ca459bc3b (patch) | |
| tree | 9f1bf6219c803a26c29a7216ebd7e7a3be9adb79 /h/rpki/manifest.h | |
| parent | 6a8906e83a45c3c04c39eb4e71fcda0b1da293df (diff) | |
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
Diffstat (limited to 'h/rpki/manifest.h')
| -rw-r--r-- | h/rpki/manifest.h | 7 |
1 files changed, 4 insertions, 3 deletions
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) = { |