diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-03 14:10:41 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:10:39 +0100 |
| commit | 24c4ea958ecae0b194cc3eb812a81766cdb421f6 (patch) | |
| tree | 29be67ecc7efed3b5ae25bb3d976281d1499437d /crypto | |
| parent | e144fd36ceb4d71a75b04503995a52ad6699fb22 (diff) | |
Fix stacks of OPENSSL_STRING, OPENSSL_CSTRING and OPENSSL_BLOCK
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')
| -rw-r--r-- | crypto/encode_decode/decoder_pkey.c | 2 | ||||
| -rw-r--r-- | crypto/encode_decode/encoder_pkey.c | 2 | ||||
| -rw-r--r-- | crypto/engine/eng_dyn.c | 2 | ||||
| -rw-r--r-- | crypto/x509/by_store.c | 2 | ||||
| -rw-r--r-- | crypto/x509/v3_utl.c | 1 | ||||
| -rw-r--r-- | crypto/x509/x509_vfy.c | 2 | ||||
| -rw-r--r-- | crypto/x509/x509_vpm.c | 1 |
7 files changed, 0 insertions, 12 deletions
diff --git a/crypto/encode_decode/decoder_pkey.c b/crypto/encode_decode/decoder_pkey.c index 64ea4e2c3f..dfc7cccab1 100644 --- a/crypto/encode_decode/decoder_pkey.c +++ b/crypto/encode_decode/decoder_pkey.c @@ -187,8 +187,6 @@ static void decoder_clean_EVP_PKEY_construct_arg(void *construct_data) } } -DEFINE_STACK_OF_CSTRING() - struct collected_data_st { struct decoder_EVP_PKEY_data_st *process_data; STACK_OF(OPENSSL_CSTRING) *names; diff --git a/crypto/encode_decode/encoder_pkey.c b/crypto/encode_decode/encoder_pkey.c index 76b8386e0c..7c63a76adb 100644 --- a/crypto/encode_decode/encoder_pkey.c +++ b/crypto/encode_decode/encoder_pkey.c @@ -18,8 +18,6 @@ #include "crypto/evp.h" #include "encoder_local.h" -DEFINE_STACK_OF_CSTRING() - int OSSL_ENCODER_CTX_set_cipher(OSSL_ENCODER_CTX *ctx, const char *cipher_name, const char *propquery) diff --git a/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c index 73d7b14ae6..01935578c2 100644 --- a/crypto/engine/eng_dyn.c +++ b/crypto/engine/eng_dyn.c @@ -20,8 +20,6 @@ * prototypes. */ -DEFINE_STACK_OF_STRING() - /* Our ENGINE handlers */ static int dynamic_init(ENGINE *e); static int dynamic_finish(ENGINE *e); diff --git a/crypto/x509/by_store.c b/crypto/x509/by_store.c index debb76150d..7822da8cd5 100644 --- a/crypto/x509/by_store.c +++ b/crypto/x509/by_store.c @@ -12,8 +12,6 @@ #include "crypto/x509.h" #include "x509_local.h" -DEFINE_STACK_OF_STRING() - /* Generic object loader, given expected type and criterion */ static int cache_objects(X509_LOOKUP *lctx, const char *uri, const OSSL_STORE_SEARCH *criterion, diff --git a/crypto/x509/v3_utl.c b/crypto/x509/v3_utl.c index 7e813af3e9..8acdfd3296 100644 --- a/crypto/x509/v3_utl.c +++ b/crypto/x509/v3_utl.c @@ -22,7 +22,6 @@ #include "x509_local.h" DEFINE_STACK_OF(CONF_VALUE) -DEFINE_STACK_OF_STRING() static char *strip_spaces(char *name); static int sk_strcmp(const char *const *a, const char *const *b); diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index ce31975f8b..d4a085ddb0 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -25,8 +25,6 @@ #include "crypto/x509.h" #include "x509_local.h" -DEFINE_STACK_OF_STRING() - /* CRL score values */ /* No unhandled critical extensions */ diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c index f87dfd0726..8fe09fd61a 100644 --- a/crypto/x509/x509_vpm.c +++ b/crypto/x509/x509_vpm.c @@ -20,7 +20,6 @@ DEFINE_STACK_OF(ASN1_OBJECT) DEFINE_STACK_OF(X509_VERIFY_PARAM) -DEFINE_STACK_OF_STRING() /* X509_VERIFY_PARAM functions */ |