generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename DECLARE*STACK_OF to DEFINE*STACK_OF

Browse Source 
Applications wishing to include their own stacks now just need to include

DEFINE_STACK_OF(foo)

in a header file.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2015-12-28 00:04:33 +00:00
parent c5e0c54047
commit 8588571572
38 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/asn1/ameth_lib.c
View File

@ -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

4
crypto/asn1/asn_mime.c
View File

@ -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);

2
crypto/async/async_locl.h
View File

@ -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;

2
crypto/cms/cms_lcl.h
View File

@ -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;

4
crypto/engine/eng_int.h
View File

@ -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

2
crypto/evp/evp_pbe.c
View File

@ -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[] = {

2
crypto/evp/pmeth_lib.c
View File

@ -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[] = {

2
crypto/ex_data.c
View File

@ -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

2
crypto/include/internal/ct_int.h
View File

@ -114,7 +114,7 @@ typedef struct {
log_entry_type_t entry_type;
} SCT;
DECLARE_STACK_OF(SCT)
DEFINE_STACK_OF(SCT)
/*
* Allocate new SCT.

2
crypto/lock.c
View File

@ -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] = {

2
crypto/objects/o_names.c
View File

@ -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;

2
crypto/objects/obj_xref.c
View File

@ -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;

4
crypto/store/str_mem.c
View File

@ -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;

2
crypto/ts/ts_lcl.h
View File

@ -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 {

4
crypto/x509/by_dir.c
View File

@ -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);

2
crypto/x509/x_name.c
View File

@ -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,

2
crypto/x509v3/pcy_int.h
View File

@ -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 */

12
include/openssl/asn1.h
View File

@ -157,7 +157,7 @@ extern "C" {
# define SMIME_CRLFEOL 0x800
# define SMIME_STREAM 0x1000
struct X509_algor_st;
DECLARE_STACK_OF(X509_ALGOR)
DEFINE_STACK_OF(X509_ALGOR)
# define ASN1_STRING_FLAG_BITS_LEFT 0x08/* Set if 0x07 has bits left value */
/*
@ -230,7 +230,7 @@ typedef struct asn1_string_table_st {
unsigned long flags;
} ASN1_STRING_TABLE;
DECLARE_STACK_OF(ASN1_STRING_TABLE)
DEFINE_STACK_OF(ASN1_STRING_TABLE)
/* size limits: this stuff is taken straight from RFC2459 */
@ -469,9 +469,9 @@ typedef const ASN1_ITEM *ASN1_ITEM_EXP (void);
ASN1_STRFLGS_DUMP_UNKNOWN | \
ASN1_STRFLGS_DUMP_DER)
DECLARE_STACK_OF(ASN1_INTEGER)
DEFINE_STACK_OF(ASN1_INTEGER)
DECLARE_STACK_OF(ASN1_GENERALSTRING)
DEFINE_STACK_OF(ASN1_GENERALSTRING)
typedef struct asn1_type_st {
int type;
@ -504,7 +504,7 @@ typedef struct asn1_type_st {
} value;
} ASN1_TYPE;
DECLARE_STACK_OF(ASN1_TYPE)
DEFINE_STACK_OF(ASN1_TYPE)
typedef STACK_OF(ASN1_TYPE) ASN1_SEQUENCE_ANY;
@ -565,7 +565,7 @@ ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
DECLARE_ASN1_ITEM(ASN1_OBJECT)
DECLARE_STACK_OF(ASN1_OBJECT)
DEFINE_STACK_OF(ASN1_OBJECT)
ASN1_STRING *ASN1_STRING_new(void);
void ASN1_STRING_free(ASN1_STRING *a);

2
include/openssl/asn1t.h
View File

@ -964,7 +964,7 @@ DECLARE_ASN1_ITEM(BIGNUM)
DECLARE_ASN1_ITEM(LONG)
DECLARE_ASN1_ITEM(ZLONG)
DECLARE_STACK_OF(ASN1_VALUE)
DEFINE_STACK_OF(ASN1_VALUE)
/* Functions used internally by the ASN1 code */

2
include/openssl/bio.h
View File

@ -328,7 +328,7 @@ struct bio_st {
CRYPTO_EX_DATA ex_data;
};
DECLARE_STACK_OF(BIO)
DEFINE_STACK_OF(BIO)
typedef struct bio_f_buffer_ctx_struct {
/*-

8
include/openssl/cms.h
View File

@ -76,10 +76,10 @@ typedef struct CMS_Receipt_st CMS_Receipt;
typedef struct CMS_RecipientEncryptedKey_st CMS_RecipientEncryptedKey;
typedef struct CMS_OtherKeyAttribute_st CMS_OtherKeyAttribute;
DECLARE_STACK_OF(CMS_SignerInfo)
DECLARE_STACK_OF(CMS_RecipientEncryptedKey)
DECLARE_STACK_OF(CMS_RecipientInfo)
DECLARE_STACK_OF(CMS_RevocationInfoChoice)
DEFINE_STACK_OF(CMS_SignerInfo)
DEFINE_STACK_OF(CMS_RecipientEncryptedKey)
DEFINE_STACK_OF(CMS_RecipientInfo)
DEFINE_STACK_OF(CMS_RevocationInfoChoice)
DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo)
DECLARE_ASN1_FUNCTIONS(CMS_ReceiptRequest)
DECLARE_ASN1_PRINT_FUNCTION(CMS_ContentInfo)

6
include/openssl/conf.h
View File

@ -77,7 +77,7 @@ typedef struct {
char *value;
} CONF_VALUE;
DECLARE_STACK_OF(CONF_VALUE)
DEFINE_STACK_OF(CONF_VALUE)
DECLARE_LHASH_OF(CONF_VALUE);
struct conf_st;
@ -102,8 +102,8 @@ struct conf_method_st {
typedef struct conf_imodule_st CONF_IMODULE;
typedef struct conf_module_st CONF_MODULE;
DECLARE_STACK_OF(CONF_MODULE)
DECLARE_STACK_OF(CONF_IMODULE)
DEFINE_STACK_OF(CONF_MODULE)
DEFINE_STACK_OF(CONF_IMODULE)
/* DSO module function typedefs */
typedef int conf_init_func (CONF_IMODULE *md, const CONF *cnf);

2
include/openssl/crypto.h
View File

@ -257,7 +257,7 @@ typedef struct bio_st BIO_dummy;
struct crypto_ex_data_st {
STACK_OF(void) *sk;
};
DECLARE_STACK_OF(void)
DEFINE_STACK_OF(void)
/*
* Per class, we have a STACK of function pointers.

8
include/openssl/ocsp.h
View File

@ -95,11 +95,11 @@ extern "C" {
typedef struct ocsp_cert_id_st OCSP_CERTID;
DECLARE_STACK_OF(OCSP_CERTID)
DEFINE_STACK_OF(OCSP_CERTID)
typedef struct ocsp_one_request_st OCSP_ONEREQ;
DECLARE_STACK_OF(OCSP_ONEREQ)
DEFINE_STACK_OF(OCSP_ONEREQ)
typedef struct ocsp_req_info_st OCSP_REQINFO;
typedef struct ocsp_signature_st OCSP_SIGNATURE;
@ -117,7 +117,7 @@ typedef struct ocsp_resp_bytes_st OCSP_RESPBYTES;
# define V_OCSP_RESPID_NAME 0
# define V_OCSP_RESPID_KEY 1
DECLARE_STACK_OF(OCSP_RESPID)
DEFINE_STACK_OF(OCSP_RESPID)
DECLARE_ASN1_FUNCTIONS(OCSP_RESPID)
typedef struct ocsp_revoked_info_st OCSP_REVOKEDINFO;
@ -129,7 +129,7 @@ typedef struct ocsp_revoked_info_st OCSP_REVOKEDINFO;
typedef struct ocsp_cert_status_st OCSP_CERTSTATUS;
typedef struct ocsp_single_response_st OCSP_SINGLERESP;
DECLARE_STACK_OF(OCSP_SINGLERESP)
DEFINE_STACK_OF(OCSP_SINGLERESP)
typedef struct ocsp_response_data_st OCSP_RESPDATA;

2
include/openssl/pkcs12.h
View File

@ -123,7 +123,7 @@ typedef struct {
STACK_OF(X509_ATTRIBUTE) *attrib;
} PKCS12_SAFEBAG;
DECLARE_STACK_OF(PKCS12_SAFEBAG)
DEFINE_STACK_OF(PKCS12_SAFEBAG)
typedef struct pkcs12_bag_st {
ASN1_OBJECT *type;

6
include/openssl/pkcs7.h
View File

@ -100,7 +100,7 @@ typedef struct pkcs7_signer_info_st {
EVP_PKEY *pkey;
} PKCS7_SIGNER_INFO;
DECLARE_STACK_OF(PKCS7_SIGNER_INFO)
DEFINE_STACK_OF(PKCS7_SIGNER_INFO)
typedef struct pkcs7_recip_info_st {
ASN1_INTEGER *version; /* version 0 */
@ -110,7 +110,7 @@ typedef struct pkcs7_recip_info_st {
X509 *cert; /* get the pub-key from this */
} PKCS7_RECIP_INFO;
DECLARE_STACK_OF(PKCS7_RECIP_INFO)
DEFINE_STACK_OF(PKCS7_RECIP_INFO)
typedef struct pkcs7_signed_st {
ASN1_INTEGER *version; /* version 1 */
@ -197,7 +197,7 @@ typedef struct pkcs7_st {
} d;
} PKCS7;
DECLARE_STACK_OF(PKCS7)
DEFINE_STACK_OF(PKCS7)
# define PKCS7_OP_SET_DETACHED_SIGNATURE 1
# define PKCS7_OP_GET_DETACHED_SIGNATURE 2

12
include/openssl/safestack.h
View File

@ -88,7 +88,7 @@ extern "C" {
# define STACK_OF(type) struct stack_st_##type
# define SKM_DECLARE_STACK_OF(t1, t2, t3) \
# define SKM_DEFINE_STACK_OF(t1, t2, t3) \
STACK_OF(t1); \
static ossl_inline int sk_##t1##_num(const STACK_OF(t1) *sk) \
{ \
@ -183,9 +183,9 @@ extern "C" {
return (int (*)(const t3 * const *,const t3 * const *))sk_set_cmp_func((_STACK *)sk, (int (*)(const void *a, const void *b))cmpf); \
}
# define DECLARE_SPECIAL_STACK_OF(t1, t2) SKM_DECLARE_STACK_OF(t1, t2, t2)
# define DECLARE_STACK_OF(t) SKM_DECLARE_STACK_OF(t, t, t)
# define DECLARE_CONST_STACK_OF(t) SKM_DECLARE_STACK_OF(t, const t, t)
# define DEFINE_SPECIAL_STACK_OF(t1, t2) SKM_DEFINE_STACK_OF(t1, t2, t2)
# define DEFINE_STACK_OF(t) SKM_DEFINE_STACK_OF(t, t, t)
# define DEFINE_CONST_STACK_OF(t) SKM_DEFINE_STACK_OF(t, const t, t)
/*-
* Strings are special: normally an lhash entry will point to a single
@ -211,14 +211,14 @@ typedef const char *OPENSSL_CSTRING;
* chars. So, we have to implement STRING specially for STACK_OF. This is
* dealt with in the autogenerated macros below.
*/
DECLARE_SPECIAL_STACK_OF(OPENSSL_STRING, char)
DEFINE_SPECIAL_STACK_OF(OPENSSL_STRING, char)
/*
* Similarly, we sometimes use a block of characters, NOT nul-terminated.
* These should also be distinguished from "normal" stacks.
*/
typedef void *OPENSSL_BLOCK;
DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
DEFINE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
/*
* This file is automatically generated by util/mkstack.pl

6
include/openssl/srp.h
View File

@ -83,7 +83,7 @@ typedef struct SRP_gN_cache_st {
} SRP_gN_cache;
DECLARE_STACK_OF(SRP_gN_cache)
DEFINE_STACK_OF(SRP_gN_cache)
typedef struct SRP_user_pwd_st {
char *id;
@ -94,7 +94,7 @@ typedef struct SRP_user_pwd_st {
char *info;
} SRP_user_pwd;
DECLARE_STACK_OF(SRP_user_pwd)
DEFINE_STACK_OF(SRP_user_pwd)
typedef struct SRP_VBASE_st {
STACK_OF(SRP_user_pwd) *users_pwd;
@ -114,7 +114,7 @@ typedef struct SRP_gN_st {
BIGNUM *N;
} SRP_gN;
DECLARE_STACK_OF(SRP_gN)
DEFINE_STACK_OF(SRP_gN)
SRP_VBASE *SRP_VBASE_new(char *seed_key);
void SRP_VBASE_free(SRP_VBASE *vb);

4
include/openssl/ssl.h
View File

@ -325,7 +325,7 @@ typedef struct ssl_session_st SSL_SESSION;
typedef struct tls_sigalgs_st TLS_SIGALGS;
typedef struct ssl_conf_ctx_st SSL_CONF_CTX;
DECLARE_CONST_STACK_OF(SSL_CIPHER)
DEFINE_CONST_STACK_OF(SSL_CIPHER)
DECLARE_STACK_OF(danetls_record)
@ -335,7 +335,7 @@ typedef struct srtp_protection_profile_st {
unsigned long id;
} SRTP_PROTECTION_PROFILE;
DECLARE_STACK_OF(SRTP_PROTECTION_PROFILE)
DEFINE_STACK_OF(SRTP_PROTECTION_PROFILE)
typedef int (*tls_session_ticket_ext_cb_fn) (SSL *s,
const unsigned char *data,

2
include/openssl/store.h
View File

@ -244,7 +244,7 @@ typedef struct STORE_OBJECT_st {
BUF_MEM *arbitrary;
} data;
} STORE_OBJECT;
DECLARE_STACK_OF(STORE_OBJECT)
DEFINE_STACK_OF(STORE_OBJECT)
STORE_OBJECT *STORE_OBJECT_new(void);
void STORE_OBJECT_free(STORE_OBJECT *data);

4
include/openssl/ts.h
View File

@ -122,7 +122,7 @@ typedef struct ESS_issuer_serial ESS_ISSUER_SERIAL;
typedef struct ESS_cert_id ESS_CERT_ID;
typedef struct ESS_signing_cert ESS_SIGNING_CERT;
DECLARE_STACK_OF(ESS_CERT_ID)
DEFINE_STACK_OF(ESS_CERT_ID)
typedef struct TS_resp_st TS_RESP;
@ -359,7 +359,7 @@ typedef int (*TS_extension_cb) (struct TS_resp_ctx *, X509_EXTENSION *,
typedef struct TS_resp_ctx TS_RESP_CTX;
DECLARE_STACK_OF(EVP_MD)
DEFINE_STACK_OF(EVP_MD)
/* Creates a response context that can be used for generating responses. */
TS_RESP_CTX *TS_RESP_CTX_new(void);

2
include/openssl/txt_db.h
View File

@ -77,7 +77,7 @@ extern "C" {
#endif
typedef OPENSSL_STRING *OPENSSL_PSTRING;
DECLARE_SPECIAL_STACK_OF(OPENSSL_PSTRING, OPENSSL_STRING)
DEFINE_SPECIAL_STACK_OF(OPENSSL_PSTRING, OPENSSL_STRING)
typedef struct txt_db_st {
int num_fields;

2
include/openssl/ui.h
View File

@ -303,7 +303,7 @@ UI_METHOD *UI_OpenSSL(void);
* about a string or a prompt, including test data for a verification prompt.
*/
typedef struct ui_string_st UI_STRING;
DECLARE_STACK_OF(UI_STRING)
DEFINE_STACK_OF(UI_STRING)
/*
* The different types of strings that are currently supported. This is only

18
include/openssl/x509.h
View File

@ -142,9 +142,9 @@ typedef struct X509_sig_st {
typedef struct X509_name_entry_st X509_NAME_ENTRY;
DECLARE_STACK_OF(X509_NAME_ENTRY)
DEFINE_STACK_OF(X509_NAME_ENTRY)
DECLARE_STACK_OF(X509_NAME)
DEFINE_STACK_OF(X509_NAME)
# define X509_EX_V_NETSCAPE_HACK 0x8000
# define X509_EX_V_INIT 0x0001
@ -152,11 +152,11 @@ typedef struct X509_extension_st X509_EXTENSION;
typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS;
DECLARE_STACK_OF(X509_EXTENSION)
DEFINE_STACK_OF(X509_EXTENSION)
typedef struct x509_attributes_st X509_ATTRIBUTE;
DECLARE_STACK_OF(X509_ATTRIBUTE)
DEFINE_STACK_OF(X509_ATTRIBUTE)
typedef struct X509_req_info_st X509_REQ_INFO;
@ -166,7 +166,7 @@ typedef struct x509_cert_aux_st X509_CERT_AUX;
typedef struct x509_cinf_st X509_CINF;
DECLARE_STACK_OF(X509)
DEFINE_STACK_OF(X509)
/* This is used for a table of trust checking functions */
@ -179,7 +179,7 @@ typedef struct x509_trust_st {
void *arg2;
} X509_TRUST;
DECLARE_STACK_OF(X509_TRUST)
DEFINE_STACK_OF(X509_TRUST)
/* standard trust ids */
@ -285,11 +285,11 @@ DECLARE_STACK_OF(X509_TRUST)
XN_FLAG_FN_LN | \
XN_FLAG_FN_ALIGN)
DECLARE_STACK_OF(X509_REVOKED)
DEFINE_STACK_OF(X509_REVOKED)
typedef struct X509_crl_info_st X509_CRL_INFO;
DECLARE_STACK_OF(X509_CRL)
DEFINE_STACK_OF(X509_CRL)
typedef struct private_key_st {
int version;
@ -317,7 +317,7 @@ typedef struct X509_info_st {
int references;
} X509_INFO;
DECLARE_STACK_OF(X509_INFO)
DEFINE_STACK_OF(X509_INFO)
/*
* The next 2 structures and their 8 routines were sent to me by Pat Richard

6
include/openssl/x509_vfy.h
View File

@ -120,8 +120,8 @@ typedef struct x509_object_st {
typedef struct x509_lookup_st X509_LOOKUP;
DECLARE_STACK_OF(X509_LOOKUP)
DECLARE_STACK_OF(X509_OBJECT)
DEFINE_STACK_OF(X509_LOOKUP)
DEFINE_STACK_OF(X509_OBJECT)
/* This is a static that defines the function interface */
typedef struct x509_lookup_method_st {
@ -145,7 +145,7 @@ typedef struct x509_lookup_method_st {
typedef struct X509_VERIFY_PARAM_st X509_VERIFY_PARAM;
DECLARE_STACK_OF(X509_VERIFY_PARAM)
DEFINE_STACK_OF(X509_VERIFY_PARAM)
/*
* This is used to hold everything. It is used for all certificate

30
include/openssl/x509v3.h
View File

@ -145,7 +145,7 @@ struct v3_ext_ctx {
typedef struct v3_ext_method X509V3_EXT_METHOD;
DECLARE_STACK_OF(X509V3_EXT_METHOD)
DEFINE_STACK_OF(X509V3_EXT_METHOD)
/* ext_flags values */
# define X509V3_EXT_DYNAMIC 0x1
@ -217,11 +217,11 @@ typedef STACK_OF(ASN1_OBJECT) EXTENDED_KEY_USAGE;
typedef STACK_OF(ASN1_INTEGER) TLS_FEATURE;
DECLARE_STACK_OF(GENERAL_NAME)
DEFINE_STACK_OF(GENERAL_NAME)
typedef STACK_OF(GENERAL_NAME) GENERAL_NAMES;
DECLARE_STACK_OF(GENERAL_NAMES)
DEFINE_STACK_OF(GENERAL_NAMES)
DECLARE_STACK_OF(ACCESS_DESCRIPTION)
DEFINE_STACK_OF(ACCESS_DESCRIPTION)
typedef struct DIST_POINT_NAME_st {
int type;
@ -256,7 +256,7 @@ struct DIST_POINT_st {
typedef STACK_OF(DIST_POINT) CRL_DIST_POINTS;
DECLARE_STACK_OF(DIST_POINT)
DEFINE_STACK_OF(DIST_POINT)
struct AUTHORITY_KEYID_st {
ASN1_OCTET_STRING *keyid;
@ -271,7 +271,7 @@ typedef struct SXNET_ID_st {
ASN1_OCTET_STRING *user;
} SXNETID;
DECLARE_STACK_OF(SXNETID)
DEFINE_STACK_OF(SXNETID)
typedef struct SXNET_st {
ASN1_INTEGER *version;
@ -297,7 +297,7 @@ typedef struct POLICYQUALINFO_st {
} d;
} POLICYQUALINFO;
DECLARE_STACK_OF(POLICYQUALINFO)
DEFINE_STACK_OF(POLICYQUALINFO)
typedef struct POLICYINFO_st {
ASN1_OBJECT *policyid;
@ -306,14 +306,14 @@ typedef struct POLICYINFO_st {
typedef STACK_OF(POLICYINFO) CERTIFICATEPOLICIES;
DECLARE_STACK_OF(POLICYINFO)
DEFINE_STACK_OF(POLICYINFO)
typedef struct POLICY_MAPPING_st {
ASN1_OBJECT *issuerDomainPolicy;
ASN1_OBJECT *subjectDomainPolicy;
} POLICY_MAPPING;
DECLARE_STACK_OF(POLICY_MAPPING)
DEFINE_STACK_OF(POLICY_MAPPING)
typedef STACK_OF(POLICY_MAPPING) POLICY_MAPPINGS;
@ -323,7 +323,7 @@ typedef struct GENERAL_SUBTREE_st {
ASN1_INTEGER *maximum;
} GENERAL_SUBTREE;
DECLARE_STACK_OF(GENERAL_SUBTREE)
DEFINE_STACK_OF(GENERAL_SUBTREE)
struct NAME_CONSTRAINTS_st {
STACK_OF(GENERAL_SUBTREE) *permittedSubtrees;
@ -497,7 +497,7 @@ typedef struct x509_purpose_st {
# define X509V3_ADD_DELETE 5L
# define X509V3_ADD_SILENT 0x10
DECLARE_STACK_OF(X509_PURPOSE)
DEFINE_STACK_OF(X509_PURPOSE)
DECLARE_ASN1_FUNCTIONS(BASIC_CONSTRAINTS)
@ -760,7 +760,7 @@ int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk,
unsigned long chtype);
void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent);
DECLARE_STACK_OF(X509_POLICY_NODE)
DEFINE_STACK_OF(X509_POLICY_NODE)
#ifndef OPENSSL_NO_RFC3779
typedef struct ASRange_st {
@ -779,7 +779,7 @@ typedef struct ASIdOrRange_st {
} ASIdOrRange;
typedef STACK_OF(ASIdOrRange) ASIdOrRanges;
DECLARE_STACK_OF(ASIdOrRange)
DEFINE_STACK_OF(ASIdOrRange)
# define ASIdentifierChoice_inherit 0
# define ASIdentifierChoice_asIdsOrRanges 1
@ -817,7 +817,7 @@ typedef struct IPAddressOrRange_st {
} IPAddressOrRange;
typedef STACK_OF(IPAddressOrRange) IPAddressOrRanges;
DECLARE_STACK_OF(IPAddressOrRange)
DEFINE_STACK_OF(IPAddressOrRange)
# define IPAddressChoice_inherit 0
# define IPAddressChoice_addressesOrRanges 1
@ -836,7 +836,7 @@ typedef struct IPAddressFamily_st {
} IPAddressFamily;
typedef STACK_OF(IPAddressFamily) IPAddrBlocks;
DECLARE_STACK_OF(IPAddressFamily)
DEFINE_STACK_OF(IPAddressFamily)
DECLARE_ASN1_FUNCTIONS(IPAddressRange)
DECLARE_ASN1_FUNCTIONS(IPAddressOrRange)

2
ssl/ssl_locl.h
View File

@ -693,7 +693,7 @@ struct ssl_comp_st {
COMP_METHOD *method;
};
DECLARE_STACK_OF(SSL_COMP)
DEFINE_STACK_OF(SSL_COMP)
DECLARE_LHASH_OF(SSL_SESSION);

12
util/mkstack.pl
View File

@ -117,7 +117,7 @@ extern "C" {
# define STACK_OF(type) struct stack_st_##type
# define SKM_DECLARE_STACK_OF(t1, t2, t3) \
# define SKM_DEFINE_STACK_OF(t1, t2, t3) \
STACK_OF(t1); \
static ossl_inline int sk_##t1##_num(const STACK_OF(t1) *sk) \
{ \
@ -212,9 +212,9 @@ extern "C" {
return (int (*)(const t3 * const *,const t3 * const *))sk_set_cmp_func((_STACK *)sk, (int (*)(const void *a, const void *b))cmpf); \
}
# define DECLARE_SPECIAL_STACK_OF(t1, t2) SKM_DECLARE_STACK_OF(t1, t2, t2)
# define DECLARE_STACK_OF(t) SKM_DECLARE_STACK_OF(t, t, t)
# define DECLARE_CONST_STACK_OF(t) SKM_DECLARE_STACK_OF(t, const t, t)
# define DEFINE_SPECIAL_STACK_OF(t1, t2) SKM_DEFINE_STACK_OF(t1, t2, t2)
# define DEFINE_STACK_OF(t) SKM_DEFINE_STACK_OF(t, t, t)
# define DEFINE_CONST_STACK_OF(t) SKM_DEFINE_STACK_OF(t, const t, t)
/*-
* Strings are special: normally an lhash entry will point to a single
@ -240,14 +240,14 @@ typedef const char *OPENSSL_CSTRING;
* chars. So, we have to implement STRING specially for STACK_OF. This is
* dealt with in the autogenerated macros below.
*/
DECLARE_SPECIAL_STACK_OF(OPENSSL_STRING, char)
DEFINE_SPECIAL_STACK_OF(OPENSSL_STRING, char)
/*
* Similarly, we sometimes use a block of characters, NOT nul-terminated.
* These should also be distinguished from "normal" stacks.
*/
typedef void *OPENSSL_BLOCK;
DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
DEFINE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
/*
* This file is automatically generated by util/mkstack.pl