diff options
| author | Matt Caswell <matt@openssl.org> | 2015-10-30 11:12:26 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-11-09 22:48:41 +0000 |
| commit | 90945fa31a42dcf3beb90540c618e4d627c595ea (patch) | |
| tree | e73870c253abf0c37ca618384e30a7937a996b55 /crypto/pem/pem_info.c | |
| parent | a71edf3ba275b946224b5bcded0a8ecfce1855c0 (diff) | |
| download | openssl-90945fa31a42dcf3beb90540c618e4d627c595ea.tar.gz | |
Continue standardising malloc style for libcrypto
Continuing from previous commit ensure our style is consistent for malloc
return checks.
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Diffstat (limited to 'crypto/pem/pem_info.c')
| -rw-r--r-- | crypto/pem/pem_info.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c index 045f568e0c..0cbd081b38 100644 --- a/crypto/pem/pem_info.c +++ b/crypto/pem/pem_info.c @@ -172,6 +172,8 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, xi->enc_len = 0; xi->x_pkey = X509_PKEY_new(); + if (xi->x_pkey == NULL) + goto err; ptype = EVP_PKEY_RSA; pp = &xi->x_pkey->dec_pkey; if ((int)strlen(header) > 10) /* assume encrypted */ @@ -193,6 +195,8 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, xi->enc_len = 0; xi->x_pkey = X509_PKEY_new(); + if (xi->x_pkey == NULL) + goto err; ptype = EVP_PKEY_DSA; pp = &xi->x_pkey->dec_pkey; if ((int)strlen(header) > 10) /* assume encrypted */ @@ -214,6 +218,8 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, xi->enc_len = 0; xi->x_pkey = X509_PKEY_new(); + if (xi->x_pkey == NULL) + goto err; ptype = EVP_PKEY_EC; pp = &xi->x_pkey->dec_pkey; if ((int)strlen(header) > 10) /* assume encrypted */ |