diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-03 10:23:44 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:09:45 +0100 |
| commit | e6623cfbffcc03e2483632359e005ca13adacc9d (patch) | |
| tree | 64caba9fa625624f304162011a54a55b09b0ad41 /crypto/cmp | |
| parent | 6ac1cd10ba8a1d92d3858e53a7aea2cf444adf26 (diff) | |
Fix safestack issues in x509.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_client.c | 2 | ||||
| -rw-r--r-- | crypto/cmp/cmp_ctx.c | 2 | ||||
| -rw-r--r-- | crypto/cmp/cmp_msg.c | 2 | ||||
| -rw-r--r-- | crypto/cmp/cmp_protect.c | 2 | ||||
| -rw-r--r-- | crypto/cmp/cmp_server.c | 1 | ||||
| -rw-r--r-- | crypto/cmp/cmp_util.c | 1 | ||||
| -rw-r--r-- | crypto/cmp/cmp_vfy.c | 2 |
7 files changed, 0 insertions, 12 deletions
diff --git a/crypto/cmp/cmp_client.c b/crypto/cmp/cmp_client.c index fe7168916a..567eb45519 100644 --- a/crypto/cmp/cmp_client.c +++ b/crypto/cmp/cmp_client.c @@ -22,8 +22,6 @@ #include "openssl/cmp_util.h" DEFINE_STACK_OF(ASN1_UTF8STRING) -DEFINE_STACK_OF(X509) -DEFINE_STACK_OF(X509_CRL) DEFINE_STACK_OF(OSSL_CMP_CERTRESPONSE) DEFINE_STACK_OF(OSSL_CMP_PKISI) DEFINE_STACK_OF(OSSL_CRMF_CERTID) diff --git a/crypto/cmp/cmp_ctx.c b/crypto/cmp/cmp_ctx.c index 6bbd3510c7..f324763bf1 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(X509) -DEFINE_STACK_OF(X509_EXTENSION) DEFINE_STACK_OF(POLICYINFO) DEFINE_STACK_OF(ASN1_UTF8STRING) DEFINE_STACK_OF(GENERAL_NAME) diff --git a/crypto/cmp/cmp_msg.c b/crypto/cmp/cmp_msg.c index 64e00fc884..11f43ab588 100644 --- a/crypto/cmp/cmp_msg.c +++ b/crypto/cmp/cmp_msg.c @@ -24,8 +24,6 @@ DEFINE_STACK_OF(OSSL_CMP_CERTSTATUS) DEFINE_STACK_OF(OSSL_CMP_ITAV) DEFINE_STACK_OF(GENERAL_NAME) -DEFINE_STACK_OF(X509) -DEFINE_STACK_OF(X509_EXTENSION) DEFINE_STACK_OF(OSSL_CMP_PKISI) DEFINE_STACK_OF(OSSL_CRMF_MSG) DEFINE_STACK_OF(OSSL_CMP_CERTRESPONSE) diff --git a/crypto/cmp/cmp_protect.c b/crypto/cmp/cmp_protect.c index a6a0f9f9e0..eb162e382d 100644 --- a/crypto/cmp/cmp_protect.c +++ b/crypto/cmp/cmp_protect.c @@ -18,8 +18,6 @@ #include <openssl/err.h> #include <openssl/x509.h> -DEFINE_STACK_OF(X509) - /* * This function is also used by the internal verify_PBMAC() in cmp_vfy.c. * diff --git a/crypto/cmp/cmp_server.c b/crypto/cmp/cmp_server.c index 2ba6cb7984..3c247336fc 100644 --- a/crypto/cmp/cmp_server.c +++ b/crypto/cmp/cmp_server.c @@ -20,7 +20,6 @@ #include <openssl/err.h> DEFINE_STACK_OF(OSSL_CRMF_MSG) -DEFINE_STACK_OF(X509) DEFINE_STACK_OF(OSSL_CMP_ITAV) DEFINE_STACK_OF(OSSL_CMP_CERTSTATUS) diff --git a/crypto/cmp/cmp_util.c b/crypto/cmp/cmp_util.c index c2ee9b6e0d..ec292ee352 100644 --- a/crypto/cmp/cmp_util.c +++ b/crypto/cmp/cmp_util.c @@ -16,7 +16,6 @@ #include <openssl/err.h> /* should be implied by cmperr.h */ #include <openssl/x509v3.h> -DEFINE_STACK_OF(X509) DEFINE_STACK_OF(X509_OBJECT) DEFINE_STACK_OF(ASN1_UTF8STRING) diff --git a/crypto/cmp/cmp_vfy.c b/crypto/cmp/cmp_vfy.c index f5026e0bbc..00757c11ae 100644 --- a/crypto/cmp/cmp_vfy.c +++ b/crypto/cmp/cmp_vfy.c @@ -22,8 +22,6 @@ #include <openssl/x509.h> #include "crypto/x509.h" -DEFINE_STACK_OF(X509) - /* Verify a message protected by signature according to RFC section 5.1.3.3 */ static int verify_signature(const OSSL_CMP_CTX *cmp_ctx, const OSSL_CMP_MSG *msg, X509 *cert) |