diff options
| author | Pauli <paul.dale@oracle.com> | 2020-04-27 08:05:23 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-04-30 20:21:31 +1000 |
| commit | 1f74259d4237a98db7aaa65c55a747f15a347b7c (patch) | |
| tree | bf86ff7f6c976559fd955aff4511ba98740441ba /crypto/cms | |
| parent | bd5f280091e7b9b2308b6f99a239653eb317ca7d (diff) | |
coverity 1462543 Logically dead code
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11651)
Diffstat (limited to 'crypto/cms')
| -rw-r--r-- | crypto/cms/cms_kari.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/crypto/cms/cms_kari.c b/crypto/cms/cms_kari.c index 4e837718dc..7372a94ecd 100644 --- a/crypto/cms/cms_kari.c +++ b/crypto/cms/cms_kari.c @@ -382,27 +382,27 @@ int cms_RecipientInfo_kari_init(CMS_RecipientInfo *ri, X509 *recip, EVP_PKEY *r if (!cms_kari_create_ephemeral_key(kari, recipPubKey)) return 0; } else { - /* Use originator key */ - CMS_OriginatorIdentifierOrKey *oik = ri->d.kari->originator; + /* Use originator key */ + CMS_OriginatorIdentifierOrKey *oik = ri->d.kari->originator; - if (originatorPrivKey == NULL && originator == NULL) + if (originatorPrivKey == NULL || originator == NULL) return 0; - if (flags & CMS_USE_ORIGINATOR_KEYID) { - oik->type = CMS_OIK_KEYIDENTIFIER; - oik->d.subjectKeyIdentifier = ASN1_OCTET_STRING_new(); - if (oik->d.subjectKeyIdentifier == NULL) - return 0; - if (!cms_set1_keyid(&oik->d.subjectKeyIdentifier, originator)) - return 0; - } else { - oik->type = CMS_REK_ISSUER_SERIAL; - if (!cms_set1_ias(&oik->d.issuerAndSerialNumber, originator)) - return 0; - } - - if (!cms_kari_set_originator_private_key(kari, originatorPrivKey)) - return 0; + if (flags & CMS_USE_ORIGINATOR_KEYID) { + oik->type = CMS_OIK_KEYIDENTIFIER; + oik->d.subjectKeyIdentifier = ASN1_OCTET_STRING_new(); + if (oik->d.subjectKeyIdentifier == NULL) + return 0; + if (!cms_set1_keyid(&oik->d.subjectKeyIdentifier, originator)) + return 0; + } else { + oik->type = CMS_REK_ISSUER_SERIAL; + if (!cms_set1_ias(&oik->d.issuerAndSerialNumber, originator)) + return 0; + } + + if (!cms_kari_set_originator_private_key(kari, originatorPrivKey)) + return 0; } EVP_PKEY_up_ref(recipPubKey); |