diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-03 11:23:44 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 12:09:45 +0200 |
| commit | e6623cfbffcc03e2483632359e005ca13adacc9d (patch) | |
| tree | 64caba9fa625624f304162011a54a55b09b0ad41 /crypto/ts | |
| parent | Fix safestack issues in ssl.h (diff) | |
| download | openssl-e6623cfbffcc03e2483632359e005ca13adacc9d.tar.xz openssl-e6623cfbffcc03e2483632359e005ca13adacc9d.zip | |
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/ts')
| -rw-r--r-- | crypto/ts/ts_conf.c | 2 | ||||
| -rw-r--r-- | crypto/ts/ts_req_utils.c | 2 | ||||
| -rw-r--r-- | crypto/ts/ts_rsp_sign.c | 2 | ||||
| -rw-r--r-- | crypto/ts/ts_rsp_utils.c | 2 | ||||
| -rw-r--r-- | crypto/ts/ts_rsp_verify.c | 1 | ||||
| -rw-r--r-- | crypto/ts/ts_verify_ctx.c | 2 |
6 files changed, 0 insertions, 11 deletions
diff --git a/crypto/ts/ts_conf.c b/crypto/ts/ts_conf.c index 71664fa091..9d4011519e 100644 --- a/crypto/ts/ts_conf.c +++ b/crypto/ts/ts_conf.c @@ -18,8 +18,6 @@ #include <openssl/engine.h> #include <openssl/ts.h> -DEFINE_STACK_OF(X509) -DEFINE_STACK_OF(X509_INFO) DEFINE_STACK_OF(CONF_VALUE) /* Macro definitions for the configuration file. */ diff --git a/crypto/ts/ts_req_utils.c b/crypto/ts/ts_req_utils.c index 2d14ed1145..e4b3eee48f 100644 --- a/crypto/ts/ts_req_utils.c +++ b/crypto/ts/ts_req_utils.c @@ -14,8 +14,6 @@ #include <openssl/ts.h> #include "ts_local.h" -DEFINE_STACK_OF(X509_EXTENSION) - int TS_REQ_set_version(TS_REQ *a, long version) { return ASN1_INTEGER_set(a->version, version); diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c index 33f2b511e8..a1904719cc 100644 --- a/crypto/ts/ts_rsp_sign.c +++ b/crypto/ts/ts_rsp_sign.c @@ -17,8 +17,6 @@ #include "ts_local.h" #include "crypto/ess.h" -DEFINE_STACK_OF(X509) -DEFINE_STACK_OF(X509_EXTENSION) DEFINE_STACK_OF(ASN1_UTF8STRING) DEFINE_STACK_OF(ASN1_OBJECT) DEFINE_STACK_OF_CONST(EVP_MD) diff --git a/crypto/ts/ts_rsp_utils.c b/crypto/ts/ts_rsp_utils.c index 86e1a9d49d..92dcb5bff7 100644 --- a/crypto/ts/ts_rsp_utils.c +++ b/crypto/ts/ts_rsp_utils.c @@ -14,8 +14,6 @@ #include <openssl/pkcs7.h> #include "ts_local.h" -DEFINE_STACK_OF(X509_EXTENSION) - int TS_RESP_set_status_info(TS_RESP *a, TS_STATUS_INFO *status_info) { TS_STATUS_INFO *new_status_info; diff --git a/crypto/ts/ts_rsp_verify.c b/crypto/ts/ts_rsp_verify.c index c909b211d4..1ca14bc056 100644 --- a/crypto/ts/ts_rsp_verify.c +++ b/crypto/ts/ts_rsp_verify.c @@ -16,7 +16,6 @@ #include "crypto/ess.h" DEFINE_STACK_OF(PKCS7_SIGNER_INFO) -DEFINE_STACK_OF(X509) DEFINE_STACK_OF(ESS_CERT_ID) DEFINE_STACK_OF(ESS_CERT_ID_V2) DEFINE_STACK_OF(ASN1_UTF8STRING) diff --git a/crypto/ts/ts_verify_ctx.c b/crypto/ts/ts_verify_ctx.c index 2c95fd1f14..776d5cf43e 100644 --- a/crypto/ts/ts_verify_ctx.c +++ b/crypto/ts/ts_verify_ctx.c @@ -12,8 +12,6 @@ #include <openssl/ts.h> #include "ts_local.h" -DEFINE_STACK_OF(X509) - TS_VERIFY_CTX *TS_VERIFY_CTX_new(void) { TS_VERIFY_CTX *ctx = OPENSSL_zalloc(sizeof(*ctx)); |