diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2017-01-06 17:51:28 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2017-01-08 01:42:52 +0000 |
| commit | f291138bbe5453858ce0f534f9d3d33902a63929 (patch) | |
| tree | 1e3f2c6d973fe5c76efa3bf4303d5193bc2cd73d /crypto | |
| parent | f488976ccff9cc811cf69f1923695bee3e0fdf58 (diff) | |
Remove unnecessary frees and style fixes.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2177)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/rsa/rsa_ameth.c | 14 | ||||
| -rw-r--r-- | crypto/rsa/rsa_pmeth.c | 1 |
2 files changed, 5 insertions, 10 deletions
diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c index 07002033fe..26033286e7 100644 --- a/crypto/rsa/rsa_ameth.c +++ b/crypto/rsa/rsa_ameth.c @@ -44,11 +44,8 @@ static int rsa_param_encode(const EVP_PKEY *pkey, return 1; } /* Encode PSS parameters */ - if (!ASN1_item_pack(rsa->pss, ASN1_ITEM_rptr(RSA_PSS_PARAMS), pstr)) { - ASN1_STRING_free(*pstr); - *pstr = NULL; + if (ASN1_item_pack(rsa->pss, ASN1_ITEM_rptr(RSA_PSS_PARAMS), pstr) == NULL) return 0; - } *pstrtype = V_ASN1_SEQUENCE; return 1; @@ -493,7 +490,7 @@ static int rsa_md_to_mgf1(X509_ALGOR **palg, const EVP_MD *mgf1md) /* need to embed algorithm ID inside another */ if (!rsa_md_to_algor(&algtmp, mgf1md)) goto err; - if (!ASN1_item_pack(algtmp, ASN1_ITEM_rptr(X509_ALGOR), &stmp)) + if (ASN1_item_pack(algtmp, ASN1_ITEM_rptr(X509_ALGOR), &stmp) == NULL) goto err; *palg = X509_ALGOR_new(); if (*palg == NULL) @@ -578,15 +575,12 @@ RSA_PSS_PARAMS *rsa_pss_params_create(const EVP_MD *sigmd, static ASN1_STRING *rsa_ctx_to_pss_string(EVP_PKEY_CTX *pkctx) { RSA_PSS_PARAMS *pss = rsa_ctx_to_pss(pkctx); - ASN1_STRING *os = NULL; + ASN1_STRING *os; if (pss == NULL) return NULL; - if (!ASN1_item_pack(pss, ASN1_ITEM_rptr(RSA_PSS_PARAMS), &os)) { - ASN1_STRING_free(os); - os = NULL; - } + os = ASN1_item_pack(pss, ASN1_ITEM_rptr(RSA_PSS_PARAMS), NULL); RSA_PSS_PARAMS_free(pss); return os; } diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c index 55f1f28d38..3e8f92c706 100644 --- a/crypto/rsa/rsa_pmeth.c +++ b/crypto/rsa/rsa_pmeth.c @@ -50,6 +50,7 @@ typedef struct { static int pkey_rsa_init(EVP_PKEY_CTX *ctx) { RSA_PKEY_CTX *rctx = OPENSSL_zalloc(sizeof(*rctx)); + if (rctx == NULL) return 0; rctx->nbits = 1024; |