aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
Diffstat (limited to 'crypto')
-rw-r--r--crypto/asn1/ameth_lib.c2
-rw-r--r--crypto/asn1/asn_mime.c4
-rw-r--r--crypto/async/async_locl.h2
-rw-r--r--crypto/cms/cms_lcl.h2
-rw-r--r--crypto/engine/eng_int.h4
-rw-r--r--crypto/evp/evp_pbe.c2
-rw-r--r--crypto/evp/pmeth_lib.c2
-rw-r--r--crypto/ex_data.c2
-rw-r--r--crypto/include/internal/ct_int.h2
-rw-r--r--crypto/lock.c2
-rw-r--r--crypto/objects/o_names.c2
-rw-r--r--crypto/objects/obj_xref.c2
-rw-r--r--crypto/store/str_mem.c4
-rw-r--r--crypto/ts/ts_lcl.h2
-rw-r--r--crypto/x509/by_dir.c4
-rw-r--r--crypto/x509/x_name.c2
-rw-r--r--crypto/x509v3/pcy_int.h2
17 files changed, 21 insertions, 21 deletions
diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index cca4a79141..1febfe91ba 100644
--- a/crypto/asn1/ameth_lib.c
+++ b/crypto/asn1/ameth_lib.c
@@ -92,7 +92,7 @@ static const EVP_PKEY_ASN1_METHOD *standard_methods[] = {
};
typedef int sk_cmp_fn_type(const char *const *a, const char *const *b);
-DECLARE_CONST_STACK_OF(EVP_PKEY_ASN1_METHOD)
+DEFINE_CONST_STACK_OF(EVP_PKEY_ASN1_METHOD)
static STACK_OF(EVP_PKEY_ASN1_METHOD) *app_methods = NULL;
#ifdef TEST
diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index ed9d8d68b7..f138db9c81 100644
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -78,7 +78,7 @@ typedef struct {
char *param_value; /* Param value e.g. "sha1" */
} MIME_PARAM;
-DECLARE_STACK_OF(MIME_PARAM)
+DEFINE_STACK_OF(MIME_PARAM)
typedef struct {
char *name; /* Name of line e.g. "content-type" */
@@ -86,7 +86,7 @@ typedef struct {
STACK_OF(MIME_PARAM) *params; /* Zero or more parameters */
} MIME_HEADER;
-DECLARE_STACK_OF(MIME_HEADER)
+DEFINE_STACK_OF(MIME_HEADER)
static int asn1_output_data(BIO *out, BIO *data, ASN1_VALUE *val, int flags,
const ASN1_ITEM *it);
diff --git a/crypto/async/async_locl.h b/crypto/async/async_locl.h
index ffb34f82e5..2f84a78e33 100644
--- a/crypto/async/async_locl.h
+++ b/crypto/async/async_locl.h
@@ -87,7 +87,7 @@ struct async_job_st {
OSSL_ASYNC_FD wake_fd;
};
-DECLARE_STACK_OF(ASYNC_JOB)
+DEFINE_STACK_OF(ASYNC_JOB)
struct async_pool_st {
STACK_OF(ASYNC_JOB) *jobs;
diff --git a/crypto/cms/cms_lcl.h b/crypto/cms/cms_lcl.h
index abc2a2741c..e4b96d26eb 100644
--- a/crypto/cms/cms_lcl.h
+++ b/crypto/cms/cms_lcl.h
@@ -109,7 +109,7 @@ struct CMS_ContentInfo_st {
} d;
};
-DECLARE_STACK_OF(CMS_CertificateChoices)
+DEFINE_STACK_OF(CMS_CertificateChoices)
struct CMS_SignedData_st {
long version;
diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h
index 2a0a9d452f..8f775f5de7 100644
--- a/crypto/engine/eng_int.h
+++ b/crypto/engine/eng_int.h
@@ -106,12 +106,12 @@ typedef void (ENGINE_CLEANUP_CB) (void);
typedef struct st_engine_cleanup_item {
ENGINE_CLEANUP_CB *cb;
} ENGINE_CLEANUP_ITEM;
-DECLARE_STACK_OF(ENGINE_CLEANUP_ITEM)
+DEFINE_STACK_OF(ENGINE_CLEANUP_ITEM)
void engine_cleanup_add_first(ENGINE_CLEANUP_CB *cb);
void engine_cleanup_add_last(ENGINE_CLEANUP_CB *cb);
/* We need stacks of ENGINEs for use in eng_table.c */
-DECLARE_STACK_OF(ENGINE)
+DEFINE_STACK_OF(ENGINE)
/*
* If this symbol is defined then engine_table_select(), the function that is
diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c
index dc908f804e..731ae91a7a 100644
--- a/crypto/evp/evp_pbe.c
+++ b/crypto/evp/evp_pbe.c
@@ -76,7 +76,7 @@ typedef struct {
EVP_PBE_KEYGEN *keygen;
} EVP_PBE_CTL;
-DECLARE_STACK_OF(EVP_PBE_CTL)
+DEFINE_STACK_OF(EVP_PBE_CTL)
static STACK_OF(EVP_PBE_CTL) *pbe_algs;
static const EVP_PBE_CTL builtin_pbe[] = {
diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index e880cfa37d..aaba42aa1f 100644
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -69,7 +69,7 @@
typedef int sk_cmp_fn_type(const char *const *a, const char *const *b);
-DECLARE_CONST_STACK_OF(EVP_PKEY_METHOD)
+DEFINE_CONST_STACK_OF(EVP_PKEY_METHOD)
static STACK_OF(EVP_PKEY_METHOD) *app_pkey_methods = NULL;
static const EVP_PKEY_METHOD *standard_methods[] = {
diff --git a/crypto/ex_data.c b/crypto/ex_data.c
index 5bf8e1e5cd..76e4b3b6a2 100644
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.c
@@ -125,7 +125,7 @@ typedef struct ex_callback_st {
CRYPTO_EX_dup *dup_func;
} EX_CALLBACK;
-DECLARE_STACK_OF(EX_CALLBACK)
+DEFINE_STACK_OF(EX_CALLBACK)
/*
* The state for each class. This could just be a typedef, but
diff --git a/crypto/include/internal/ct_int.h b/crypto/include/internal/ct_int.h
index 2d8e045cdf..31411b62be 100644
--- a/crypto/include/internal/ct_int.h
+++ b/crypto/include/internal/ct_int.h
@@ -114,7 +114,7 @@ typedef struct {
log_entry_type_t entry_type;
} SCT;
-DECLARE_STACK_OF(SCT)
+DEFINE_STACK_OF(SCT)
/*
* Allocate new SCT.
diff --git a/crypto/lock.c b/crypto/lock.c
index f337c0d8de..ec01a815ba 100644
--- a/crypto/lock.c
+++ b/crypto/lock.c
@@ -121,7 +121,7 @@
static double OpenSSL_MSVC5_hack = 0.0; /* and for VC1.5 */
#endif
-DECLARE_STACK_OF(CRYPTO_dynlock)
+DEFINE_STACK_OF(CRYPTO_dynlock)
/* real #defines in crypto.h, keep these upto date */
static const char *const lock_names[CRYPTO_NUM_LOCKS] = {
diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c
index d7441cad82..0839feeee6 100644
--- a/crypto/objects/o_names.c
+++ b/crypto/objects/o_names.c
@@ -34,7 +34,7 @@ typedef struct name_funcs_st {
void (*free_func) (const char *, int, const char *);
} NAME_FUNCS;
-DECLARE_STACK_OF(NAME_FUNCS)
+DEFINE_STACK_OF(NAME_FUNCS)
static STACK_OF(NAME_FUNCS) *name_funcs_stack;
diff --git a/crypto/objects/obj_xref.c b/crypto/objects/obj_xref.c
index 6e35f5746f..15426fe342 100644
--- a/crypto/objects/obj_xref.c
+++ b/crypto/objects/obj_xref.c
@@ -61,7 +61,7 @@
#include "obj_xref.h"
#include "e_os.h"
-DECLARE_STACK_OF(nid_triple)
+DEFINE_STACK_OF(nid_triple)
static STACK_OF(nid_triple) *sig_app, *sigx_app;
diff --git a/crypto/store/str_mem.c b/crypto/store/str_mem.c
index dd71a1955d..1ffa4b01a4 100644
--- a/crypto/store/str_mem.c
+++ b/crypto/store/str_mem.c
@@ -83,7 +83,7 @@ typedef struct mem_object_data_st {
int references;
} MEM_OBJECT_DATA;
-DECLARE_STACK_OF(MEM_OBJECT_DATA)
+DEFINE_STACK_OF(MEM_OBJECT_DATA)
struct mem_data_st {
/*
* sorted with
@@ -98,7 +98,7 @@ struct mem_data_st {
unsigned int compute_components:1;
};
-DECLARE_STACK_OF(STORE_ATTR_INFO)
+DEFINE_STACK_OF(STORE_ATTR_INFO)
struct mem_ctx_st {
/* The type we're searching for */
int type;
diff --git a/crypto/ts/ts_lcl.h b/crypto/ts/ts_lcl.h
index da28ef1cb9..e3f915c795 100644
--- a/crypto/ts/ts_lcl.h
+++ b/crypto/ts/ts_lcl.h
@@ -144,7 +144,7 @@ struct TS_status_info_st {
ASN1_BIT_STRING *failure_info;
};
-DECLARE_STACK_OF(ASN1_UTF8STRING)
+DEFINE_STACK_OF(ASN1_UTF8STRING)
/*-
* IssuerSerial ::= SEQUENCE {
diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index 8310bc4701..7e49daadfd 100644
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -90,8 +90,8 @@ typedef struct lookup_dir_st {
STACK_OF(BY_DIR_ENTRY) *dirs;
} BY_DIR;
-DECLARE_STACK_OF(BY_DIR_HASH)
-DECLARE_STACK_OF(BY_DIR_ENTRY)
+DEFINE_STACK_OF(BY_DIR_HASH)
+DEFINE_STACK_OF(BY_DIR_ENTRY)
static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
char **ret);
diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c
index 2895734cc1..c12b248f3a 100644
--- a/crypto/x509/x_name.c
+++ b/crypto/x509/x_name.c
@@ -65,7 +65,7 @@
#include "internal/asn1_int.h"
typedef STACK_OF(X509_NAME_ENTRY) STACK_OF_X509_NAME_ENTRY;
-DECLARE_STACK_OF(STACK_OF_X509_NAME_ENTRY)
+DEFINE_STACK_OF(STACK_OF_X509_NAME_ENTRY)
static int x509_name_ex_d2i(ASN1_VALUE **val,
const unsigned char **in, long len,
diff --git a/crypto/x509v3/pcy_int.h b/crypto/x509v3/pcy_int.h
index cbc94c0419..b222557c52 100644
--- a/crypto/x509v3/pcy_int.h
+++ b/crypto/x509v3/pcy_int.h
@@ -59,7 +59,7 @@
typedef struct X509_POLICY_DATA_st X509_POLICY_DATA;
-DECLARE_STACK_OF(X509_POLICY_DATA)
+DEFINE_STACK_OF(X509_POLICY_DATA)
/* Internal structures */