diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-03 14:45:54 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:10:40 +0100 |
| commit | 798f932980e2fe656a8ba2a1bde453484f6f07dc (patch) | |
| tree | dce53065fe04758c0cf8a1751bba33de9ce1ccfd /crypto/cmp | |
| parent | b4780134df95b34ae263e966e93c83594a38de5b (diff) | |
Fix safestack issues in cmp.h
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12781)
Diffstat (limited to 'crypto/cmp')
| -rw-r--r-- | crypto/cmp/cmp_asn.c | 2 | ||||
| -rw-r--r-- | crypto/cmp/cmp_client.c | 2 | ||||
| -rw-r--r-- | crypto/cmp/cmp_ctx.c | 2 | ||||
| -rw-r--r-- | crypto/cmp/cmp_hdr.c | 2 | ||||
| -rw-r--r-- | crypto/cmp/cmp_msg.c | 4 | ||||
| -rw-r--r-- | crypto/cmp/cmp_server.c | 2 |
6 files changed, 0 insertions, 14 deletions
diff --git a/crypto/cmp/cmp_asn.c b/crypto/cmp/cmp_asn.c index f109af0502..d9013911a0 100644 --- a/crypto/cmp/cmp_asn.c +++ b/crypto/cmp/cmp_asn.c @@ -17,8 +17,6 @@ #include <openssl/cmp.h> #include <openssl/crmf.h> -DEFINE_STACK_OF(OSSL_CMP_ITAV) - /* ASN.1 declarations from RFC4210 */ ASN1_SEQUENCE(OSSL_CMP_REVANNCONTENT) = { /* OSSL_CMP_PKISTATUS is effectively ASN1_INTEGER so it is used directly */ diff --git a/crypto/cmp/cmp_client.c b/crypto/cmp/cmp_client.c index 3889d63fcd..ad34b978c7 100644 --- a/crypto/cmp/cmp_client.c +++ b/crypto/cmp/cmp_client.c @@ -21,8 +21,6 @@ #include "openssl/cmp_util.h" -DEFINE_STACK_OF(OSSL_CMP_CERTRESPONSE) -DEFINE_STACK_OF(OSSL_CMP_PKISI) DEFINE_STACK_OF(OSSL_CRMF_CERTID) #define IS_CREP(t) ((t) == OSSL_CMP_PKIBODY_IP || (t) == OSSL_CMP_PKIBODY_CP \ diff --git a/crypto/cmp/cmp_ctx.c b/crypto/cmp/cmp_ctx.c index fdbd90a076..d960167bc0 100644 --- a/crypto/cmp/cmp_ctx.c +++ b/crypto/cmp/cmp_ctx.c @@ -21,8 +21,6 @@ #include <openssl/crmf.h> #include <openssl/err.h> -DEFINE_STACK_OF(OSSL_CMP_ITAV) - /* * Get current certificate store containing trusted root CA certs */ diff --git a/crypto/cmp/cmp_hdr.c b/crypto/cmp/cmp_hdr.c index 2691fce1b5..947f984505 100644 --- a/crypto/cmp/cmp_hdr.c +++ b/crypto/cmp/cmp_hdr.c @@ -20,8 +20,6 @@ #include <openssl/cmp.h> #include <openssl/err.h> -DEFINE_STACK_OF(OSSL_CMP_ITAV) - int ossl_cmp_hdr_set_pvno(OSSL_CMP_PKIHEADER *hdr, int pvno) { if (!ossl_assert(hdr != NULL)) diff --git a/crypto/cmp/cmp_msg.c b/crypto/cmp/cmp_msg.c index c11fe4ca93..73246ffaee 100644 --- a/crypto/cmp/cmp_msg.c +++ b/crypto/cmp/cmp_msg.c @@ -21,11 +21,7 @@ #include <openssl/x509.h> #include "crypto/x509.h" /* for x509_set0_libctx() */ -DEFINE_STACK_OF(OSSL_CMP_CERTSTATUS) -DEFINE_STACK_OF(OSSL_CMP_ITAV) -DEFINE_STACK_OF(OSSL_CMP_PKISI) DEFINE_STACK_OF(OSSL_CRMF_MSG) -DEFINE_STACK_OF(OSSL_CMP_CERTRESPONSE) DEFINE_STACK_OF(OSSL_CRMF_CERTID) OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg) diff --git a/crypto/cmp/cmp_server.c b/crypto/cmp/cmp_server.c index 3c247336fc..94aa9aac8b 100644 --- a/crypto/cmp/cmp_server.c +++ b/crypto/cmp/cmp_server.c @@ -20,8 +20,6 @@ #include <openssl/err.h> DEFINE_STACK_OF(OSSL_CRMF_MSG) -DEFINE_STACK_OF(OSSL_CMP_ITAV) -DEFINE_STACK_OF(OSSL_CMP_CERTSTATUS) /* the context for the generic CMP server */ struct ossl_cmp_srv_ctx_st |