diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2015-12-23 00:47:28 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2016-01-07 18:00:51 +0000 |
commit | 4a640fb6c395302d7aad22833d573c44211b0a2d (patch) | |
tree | dd8f1928f7ed2e3a9db1362934e6b37bfd8e9e12 /crypto/evp | |
parent | 411abf2dd37974a5baa54859c1abcd287b3c1181 (diff) |
Fix declarations and constification for inline stack.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/evp')
-rw-r--r-- | crypto/evp/evp_pbe.c | 6 | ||||
-rw-r--r-- | crypto/evp/pmeth_lib.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c index 563634ec53..dc908f804e 100644 --- a/crypto/evp/evp_pbe.c +++ b/crypto/evp/evp_pbe.c @@ -66,9 +66,6 @@ /* Password based encryption (PBE) functions */ -DECLARE_STACK_OF(EVP_PBE_CTL) -static STACK_OF(EVP_PBE_CTL) *pbe_algs; - /* Setup a cipher context from a PBE algorithm */ typedef struct { @@ -79,6 +76,9 @@ typedef struct { EVP_PBE_KEYGEN *keygen; } EVP_PBE_CTL; +DECLARE_STACK_OF(EVP_PBE_CTL) +static STACK_OF(EVP_PBE_CTL) *pbe_algs; + static const EVP_PBE_CTL builtin_pbe[] = { {EVP_PBE_TYPE_OUTER, NID_pbeWithMD2AndDES_CBC, NID_des_cbc, NID_md2, PKCS5_PBE_keyivgen}, diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c index a80fc33ccb..e880cfa37d 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_STACK_OF(EVP_PKEY_METHOD) +DECLARE_CONST_STACK_OF(EVP_PKEY_METHOD) static STACK_OF(EVP_PKEY_METHOD) *app_pkey_methods = NULL; static const EVP_PKEY_METHOD *standard_methods[] = { |