summaryrefslogtreecommitdiffstats
path: root/crypto/evp/evp_err.c
diff options
context:
space:
mode:
authorKurt Roeckx <kurt@roeckx.be>2016-07-12 15:50:06 +0200
committerKurt Roeckx <kurt@roeckx.be>2016-07-20 19:20:53 +0200
commit69588edbaa424beb71c6a9b1be416588232cb78c (patch)
treebc2d601241ea428fac0bc35d215b3964f0fce199 /crypto/evp/evp_err.c
parent8cc44d970ced1004db0727d7a7b3e2709c442e55 (diff)
Check for errors allocating the error strings.
Reviewed-by: Richard Levitte <levitte@openssl.org> GH: #1330
Diffstat (limited to 'crypto/evp/evp_err.c')
-rw-r--r--crypto/evp/evp_err.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c
index 50277ffb82..bde5e31e91 100644
--- a/crypto/evp/evp_err.c
+++ b/crypto/evp/evp_err.c
@@ -57,10 +57,10 @@ static ERR_STRING_DATA EVP_str_functs[] = {
{ERR_FUNC(EVP_F_EVP_PKEY_ENCRYPT), "EVP_PKEY_encrypt"},
{ERR_FUNC(EVP_F_EVP_PKEY_ENCRYPT_INIT), "EVP_PKEY_encrypt_init"},
{ERR_FUNC(EVP_F_EVP_PKEY_ENCRYPT_OLD), "EVP_PKEY_encrypt_old"},
- {ERR_FUNC(EVP_F_EVP_PKEY_GET0_HMAC), "EVP_PKEY_get0_hmac"},
{ERR_FUNC(EVP_F_EVP_PKEY_GET0_DH), "EVP_PKEY_get0_DH"},
{ERR_FUNC(EVP_F_EVP_PKEY_GET0_DSA), "EVP_PKEY_get0_DSA"},
{ERR_FUNC(EVP_F_EVP_PKEY_GET0_EC_KEY), "EVP_PKEY_get0_EC_KEY"},
+ {ERR_FUNC(EVP_F_EVP_PKEY_GET0_HMAC), "EVP_PKEY_get0_hmac"},
{ERR_FUNC(EVP_F_EVP_PKEY_GET0_RSA), "EVP_PKEY_get0_RSA"},
{ERR_FUNC(EVP_F_EVP_PKEY_KEYGEN), "EVP_PKEY_keygen"},
{ERR_FUNC(EVP_F_EVP_PKEY_KEYGEN_INIT), "EVP_PKEY_keygen_init"},
@@ -159,7 +159,7 @@ static ERR_STRING_DATA EVP_str_reasons[] = {
#endif
-void ERR_load_EVP_strings(void)
+int ERR_load_EVP_strings(void)
{
#ifndef OPENSSL_NO_ERR
@@ -168,4 +168,5 @@ void ERR_load_EVP_strings(void)
ERR_load_strings(0, EVP_str_reasons);
}
#endif
+ return 1;
}