Browse Source

Only declare stacks in headers

Don't define stacks in C source files: it causes warnings
about unused functions in some compilers.

Reviewed-by: Richard Levitte <levitte@openssl.org>
master
Dr. Stephen Henson 7 years ago
parent
commit
4a1f3f2741
22 changed files with 54 additions and 40 deletions
  1. +0
    -1
      crypto/asn1/ameth_lib.c
  2. +5
    -0
      crypto/asn1/asn1_locl.h
  3. +4
    -8
      crypto/asn1/asn_mime.c
  4. +3
    -0
      crypto/evp/evp_locl.h
  5. +2
    -3
      crypto/evp/evp_pbe.c
  6. +0
    -1
      crypto/evp/pmeth_lib.c
  7. +2
    -6
      crypto/ex_data.c
  8. +2
    -0
      crypto/include/internal/asn1_int.h
  9. +7
    -0
      crypto/include/internal/cryptlib.h
  10. +2
    -0
      crypto/include/internal/evp_int.h
  11. +0
    -2
      crypto/lock.c
  12. +1
    -1
      crypto/objects/Makefile
  13. +3
    -4
      crypto/objects/o_names.c
  14. +4
    -0
      crypto/objects/o_names.h
  15. +0
    -2
      crypto/objects/obj_xref.c
  16. +2
    -0
      crypto/objects/obj_xref.h
  17. +2
    -0
      crypto/objects/objxref.pl
  18. +5
    -7
      crypto/x509/by_dir.c
  19. +7
    -0
      crypto/x509/x509_lcl.h
  20. +1
    -3
      crypto/x509/x_name.c
  21. +2
    -0
      include/internal/dane.h
  22. +0
    -2
      include/openssl/ssl.h

+ 0
- 1
crypto/asn1/ameth_lib.c View File

@ -92,7 +92,6 @@ static const EVP_PKEY_ASN1_METHOD *standard_methods[] = {
};
typedef int sk_cmp_fn_type(const char *const *a, const char *const *b);
DEFINE_CONST_STACK_OF(EVP_PKEY_ASN1_METHOD)
static STACK_OF(EVP_PKEY_ASN1_METHOD) *app_methods = NULL;
#ifdef TEST


+ 5
- 0
crypto/asn1/asn1_locl.h View File

@ -87,6 +87,11 @@ struct asn1_sctx_st {
void *app_data;
} /* ASN1_SCTX */ ;
typedef struct mime_param_st MIME_PARAM;
DEFINE_STACK_OF(MIME_PARAM)
typedef struct mime_header_st MIME_HEADER;
DEFINE_STACK_OF(MIME_HEADER)
/* Month values for printing out times */
extern const char *_asn1_mon[12];


+ 4
- 8
crypto/asn1/asn_mime.c View File

@ -73,20 +73,16 @@
* from parameter values. Quotes are stripped off
*/
typedef struct {
struct mime_param_st {
char *param_name; /* Param name e.g. "micalg" */
char *param_value; /* Param value e.g. "sha1" */
} MIME_PARAM;
};
DEFINE_STACK_OF(MIME_PARAM)
typedef struct {
struct mime_header_st {
char *name; /* Name of line e.g. "content-type" */
char *value; /* Value of line e.g. "text/plain" */
STACK_OF(MIME_PARAM) *params; /* Zero or more parameters */
} 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);


+ 3
- 0
crypto/evp/evp_locl.h View File

@ -295,3 +295,6 @@ struct evp_Encode_Ctx_st {
int line_num;
int expect_nl;
};
typedef struct evp_pbe_st EVP_PBE_CTL;
DEFINE_STACK_OF(EVP_PBE_CTL)

+ 2
- 3
crypto/evp/evp_pbe.c View File

@ -68,15 +68,14 @@
/* Setup a cipher context from a PBE algorithm */
typedef struct {
struct evp_pbe_st {
int pbe_type;
int pbe_nid;
int cipher_nid;
int md_nid;
EVP_PBE_KEYGEN *keygen;
} EVP_PBE_CTL;
};
DEFINE_STACK_OF(EVP_PBE_CTL)
static STACK_OF(EVP_PBE_CTL) *pbe_algs;
static const EVP_PBE_CTL builtin_pbe[] = {


+ 0
- 1
crypto/evp/pmeth_lib.c View File

@ -69,7 +69,6 @@
typedef int sk_cmp_fn_type(const char *const *a, const char *const *b);
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
- 6
crypto/ex_data.c View File

@ -111,21 +111,17 @@
#include "internal/cryptlib.h"
#include <openssl/lhash.h>
/*
* Each structure type (sometimes called a class), that supports
* exdata has a stack of callbacks for each instance.
*/
typedef struct ex_callback_st {
struct ex_callback_st {
long argl; /* Arbitary long */
void *argp; /* Arbitary void * */
CRYPTO_EX_new *new_func;
CRYPTO_EX_free *free_func;
CRYPTO_EX_dup *dup_func;
} EX_CALLBACK;
DEFINE_STACK_OF(EX_CALLBACK)
};
/*
* The state for each class. This could just be a typedef, but


+ 2
- 0
crypto/include/internal/asn1_int.h View File

@ -104,6 +104,8 @@ struct evp_pkey_asn1_method_st {
ASN1_BIT_STRING *sig);
} /* EVP_PKEY_ASN1_METHOD */ ;
DEFINE_CONST_STACK_OF(EVP_PKEY_ASN1_METHOD)
extern const EVP_PKEY_ASN1_METHOD cmac_asn1_meth;
extern const EVP_PKEY_ASN1_METHOD dh_asn1_meth;
extern const EVP_PKEY_ASN1_METHOD dhx_asn1_meth;


+ 7
- 0
crypto/include/internal/cryptlib.h View File

@ -79,6 +79,13 @@
extern "C" {
#endif
typedef struct ex_callback_st EX_CALLBACK;
DEFINE_STACK_OF(EX_CALLBACK)
DEFINE_STACK_OF(CRYPTO_dynlock)
# ifndef OPENSSL_SYS_VMS
# define X509_CERT_AREA OPENSSLDIR
# define X509_CERT_DIR OPENSSLDIR "/certs"


+ 2
- 0
crypto/include/internal/evp_int.h View File

@ -120,6 +120,8 @@ struct evp_pkey_method_st {
int (*ctrl_str) (EVP_PKEY_CTX *ctx, const char *type, const char *value);
} /* EVP_PKEY_METHOD */ ;
DEFINE_CONST_STACK_OF(EVP_PKEY_METHOD)
void evp_pkey_set_cb_translate(BN_GENCB *cb, EVP_PKEY_CTX *ctx);
extern const EVP_PKEY_METHOD cmac_pkey_meth;


+ 0
- 2
crypto/lock.c View File

@ -121,8 +121,6 @@
static double OpenSSL_MSVC5_hack = 0.0; /* and for VC1.5 */
#endif
DEFINE_STACK_OF(CRYPTO_dynlock)
/* real #defines in crypto.h, keep these upto date */
static const char *const lock_names[CRYPTO_NUM_LOCKS] = {
"<<ERROR>>",


+ 1
- 1
crypto/objects/Makefile View File

@ -21,7 +21,7 @@ LIBOBJ= o_names.o obj_dat.o obj_lib.o obj_err.o obj_xref.o
SRC= $(LIBSRC)
HEADER= obj_dat.h obj_xref.h
HEADER= obj_dat.h obj_xref.h o_names.h
ALL= $(GENERAL) $(SRC) $(HEADER)


+ 3
- 4
crypto/objects/o_names.c View File

@ -7,6 +7,7 @@
#include <openssl/objects.h>
#include <openssl/safestack.h>
#include <openssl/e_os2.h>
#include "o_names.h"
/*
* Later versions of DEC C has started to add lnkage information to certain
@ -28,13 +29,11 @@ DECLARE_LHASH_OF(OBJ_NAME);
static LHASH_OF(OBJ_NAME) *names_lh = NULL;
static int names_type_num = OBJ_NAME_TYPE_NUM;
typedef struct name_funcs_st {
struct name_funcs_st {
unsigned long (*hash_func) (const char *name);
int (*cmp_func) (const char *a, const char *b);
void (*free_func) (const char *, int, const char *);
} NAME_FUNCS;
DEFINE_STACK_OF(NAME_FUNCS)
};
static STACK_OF(NAME_FUNCS) *name_funcs_stack;


+ 4
- 0
crypto/objects/o_names.h View File

@ -0,0 +1,4 @@
typedef struct name_funcs_st NAME_FUNCS;
DEFINE_STACK_OF(NAME_FUNCS)

+ 0
- 2
crypto/objects/obj_xref.c View File

@ -61,8 +61,6 @@
#include "obj_xref.h"
#include "e_os.h"
DEFINE_STACK_OF(nid_triple)
static STACK_OF(nid_triple) *sig_app, *sigx_app;
static int sig_cmp(const nid_triple *a, const nid_triple *b)


+ 2
- 0
crypto/objects/obj_xref.h View File

@ -6,6 +6,8 @@ typedef struct {
int pkey_id;
} nid_triple;
DEFINE_STACK_OF(nid_triple)
static const nid_triple sigoid_srt[] = {
{NID_md2WithRSAEncryption, NID_md2, NID_rsaEncryption},
{NID_md5WithRSAEncryption, NID_md5, NID_rsaEncryption},


+ 2
- 0
crypto/objects/objxref.pl View File

@ -68,6 +68,8 @@ typedef struct {
int pkey_id;
} nid_triple;
DEFINE_STACK_OF(nid_triple)
static const nid_triple sigoid_srt[] = {
EOF


+ 5
- 7
crypto/x509/by_dir.c View File

@ -73,26 +73,24 @@
#include <openssl/lhash.h>
#include <openssl/x509.h>
#include "internal/x509_int.h"
#include "x509_lcl.h"
typedef struct lookup_dir_hashes_st {
struct lookup_dir_hashes_st {
unsigned long hash;
int suffix;
} BY_DIR_HASH;
};
typedef struct lookup_dir_entry_st {
struct lookup_dir_entry_st {
char *dir;
int dir_type;
STACK_OF(BY_DIR_HASH) *hashes;
} BY_DIR_ENTRY;
};
typedef struct lookup_dir_st {
BUF_MEM *buffer;
STACK_OF(BY_DIR_ENTRY) *dirs;
} BY_DIR;
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);
static int new_dir(X509_LOOKUP *lu);


+ 7
- 0
crypto/x509/x509_lcl.h View File

@ -113,3 +113,10 @@ struct x509_crl_method_st {
ASN1_INTEGER *ser, X509_NAME *issuer);
int (*crl_verify) (X509_CRL *crl, EVP_PKEY *pk);
};
typedef struct lookup_dir_hashes_st BY_DIR_HASH;
typedef struct lookup_dir_entry_st BY_DIR_ENTRY;
DEFINE_STACK_OF(BY_DIR_HASH)
DEFINE_STACK_OF(BY_DIR_ENTRY)
typedef STACK_OF(X509_NAME_ENTRY) STACK_OF_X509_NAME_ENTRY;
DEFINE_STACK_OF(STACK_OF_X509_NAME_ENTRY)

+ 1
- 3
crypto/x509/x_name.c View File

@ -63,9 +63,7 @@
#include <openssl/x509.h>
#include "internal/x509_int.h"
#include "internal/asn1_int.h"
typedef STACK_OF(X509_NAME_ENTRY) STACK_OF_X509_NAME_ENTRY;
DEFINE_STACK_OF(STACK_OF_X509_NAME_ENTRY)
#include "x509_lcl.h"
static int x509_name_ex_d2i(ASN1_VALUE **val,
const unsigned char **in, long len,


+ 2
- 0
include/internal/dane.h View File

@ -97,6 +97,8 @@ typedef struct danetls_record_st {
EVP_PKEY *spki;
} danetls_record;
DEFINE_STACK_OF(danetls_record)
/*
* Shared DANE context
*/


+ 0
- 2
include/openssl/ssl.h View File

@ -327,8 +327,6 @@ typedef struct ssl_conf_ctx_st SSL_CONF_CTX;
DEFINE_CONST_STACK_OF(SSL_CIPHER)
DECLARE_STACK_OF(danetls_record)
/* SRTP protection profiles for use with the use_srtp extension (RFC 5764)*/
typedef struct srtp_protection_profile_st {
const char *name;


Loading…
Cancel
Save