aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/include
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2016-01-06 02:54:18 +0000
committerDr. Stephen Henson <steve@openssl.org>2016-01-07 18:00:51 +0000
commit4a1f3f274108e25b97bd9870170fe2970892e155 (patch)
tree45e10bfbd19cec70d44d079d677b9852f12a501e /crypto/include
parent858857157290dd35145b14044ae96be9cd8eb0df (diff)
downloadopenssl-4a1f3f274108e25b97bd9870170fe2970892e155.tar.gz
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>
Diffstat (limited to 'crypto/include')
-rw-r--r--crypto/include/internal/asn1_int.h2
-rw-r--r--crypto/include/internal/cryptlib.h7
-rw-r--r--crypto/include/internal/evp_int.h2
3 files changed, 11 insertions, 0 deletions
diff --git a/crypto/include/internal/asn1_int.h b/crypto/include/internal/asn1_int.h
index 966f3aa8c6..c227224e59 100644
--- a/crypto/include/internal/asn1_int.h
+++ b/crypto/include/internal/asn1_int.h
@@ -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;
diff --git a/crypto/include/internal/cryptlib.h b/crypto/include/internal/cryptlib.h
index d7018b61e7..1265a042f2 100644
--- a/crypto/include/internal/cryptlib.h
+++ b/crypto/include/internal/cryptlib.h
@@ -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"
diff --git a/crypto/include/internal/evp_int.h b/crypto/include/internal/evp_int.h
index 4372d4bae0..831d9684ad 100644
--- a/crypto/include/internal/evp_int.h
+++ b/crypto/include/internal/evp_int.h
@@ -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;