Skip to content

Commit

Permalink
Address PR feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
@WillChilds-Klein
WillChilds-Klein committed Aug 30, 2024
1 parent 53bc128 commit 42777da
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 32 deletions.
37 changes: 18 additions & 19 deletions crypto/pkcs7/pkcs7.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,7 @@ int pkcs7_add_signed_data(CBB *out,
}

int PKCS7_set_type(PKCS7 *p7, int type) {
ASN1_OBJECT *obj;

obj = OBJ_nid2obj(type);
ASN1_OBJECT *obj = OBJ_nid2obj(type);
if (obj == NULL) {
OPENSSL_PUT_ERROR(PKCS7, PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
return 0;
Expand Down Expand Up @@ -276,11 +274,8 @@ int PKCS7_set_type(PKCS7 *p7, int type) {

int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher)
{
int i;
PKCS7_ENC_CONTENT *ec;

i = OBJ_obj2nid(p7->type);
switch (i) {
switch (OBJ_obj2nid(p7->type)) {
case NID_pkcs7_signedAndEnveloped:
ec = p7->d.signed_and_enveloped->enc_data;
break;
Expand All @@ -304,8 +299,7 @@ int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher)

int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data)
{
int i = OBJ_obj2nid(p7->type);
switch (i) {
switch (OBJ_obj2nid(p7->type)) {
case NID_pkcs7_signed:
PKCS7_free(p7->d.sign->contents);
p7->d.sign->contents = p7_data;
Expand Down Expand Up @@ -344,11 +338,8 @@ int PKCS7_content_new(PKCS7 *p7, int type)
}

int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri) {
int i;
STACK_OF(PKCS7_RECIP_INFO) *sk;

i = OBJ_obj2nid(p7->type);
switch (i) {
switch (OBJ_obj2nid(p7->type)) {
case NID_pkcs7_signedAndEnveloped:
sk = p7->d.signed_and_enveloped->recipientinfo;
break;
Expand All @@ -360,8 +351,9 @@ int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri) {
return 0;
}

if (!sk_PKCS7_RECIP_INFO_push(sk, ri))
if (!sk_PKCS7_RECIP_INFO_push(sk, ri)) {
return 0;
}
return 1;
}

Expand Down Expand Up @@ -397,8 +389,6 @@ int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *p7i) {
}
}
if (!alg_found) {
int nid;

if ((alg = X509_ALGOR_new()) == NULL
|| (alg->parameter = ASN1_TYPE_new()) == NULL) {
X509_ALGOR_free(alg);
Expand All @@ -409,7 +399,7 @@ int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *p7i) {
* If there is a constant copy of the ASN1 OBJECT in libcrypto, then
* use that. Otherwise, use a dynamically duplicated copy
*/
nid = OBJ_obj2nid(obj);
int nid = OBJ_obj2nid(obj);
if (nid != NID_undef) {
alg->algorithm = OBJ_nid2obj(nid);
} else {
Expand All @@ -430,6 +420,7 @@ int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *p7i) {

ASN1_TYPE *PKCS7_get_signed_attribute(const PKCS7_SIGNER_INFO *si, int nid) {
if (si == NULL) {
OPENSSL_PUT_ERROR(PKCS7, ERR_R_PASSED_NULL_PARAMETER);
return NULL;
}
for (size_t i = 0; i < sk_X509_ATTRIBUTE_num(si->auth_attr); i++) {
Expand All @@ -444,6 +435,7 @@ ASN1_TYPE *PKCS7_get_signed_attribute(const PKCS7_SIGNER_INFO *si, int nid) {

STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7) {
if (p7 == NULL || p7->d.ptr == NULL) {
OPENSSL_PUT_ERROR(PKCS7, ERR_R_PASSED_NULL_PARAMETER);
return NULL;
} else if (PKCS7_type_is_signed(p7)) {
return p7->d.sign->signer_info;
Expand All @@ -457,6 +449,7 @@ int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
const EVP_MD *dgst) {
/* We now need to add another PKCS7_SIGNER_INFO entry */
if (!p7i || !dgst || !pkey || !dgst) {
OPENSSL_PUT_ERROR(PKCS7, ERR_R_PASSED_NULL_PARAMETER);
return 0;
} else if (!ASN1_INTEGER_set(p7i->version, 1)) {
return 0;
Expand Down Expand Up @@ -518,9 +511,9 @@ int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,

int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509) {
if (!p7i || !x509) {
OPENSSL_PUT_ERROR(PKCS7, ERR_R_PASSED_NULL_PARAMETER);
return 0;
}
EVP_PKEY *pkey = NULL;
if (!ASN1_INTEGER_set(p7i->version, 0)) {
return 0;
} else if (!X509_NAME_set(&p7i->issuer_and_serial->issuer,
Expand All @@ -534,7 +527,7 @@ int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509) {
return 0;
}

pkey = X509_get0_pubkey(x509);
EVP_PKEY *pkey = X509_get0_pubkey(x509);
if (pkey == NULL) {
return 0;
}
Expand All @@ -559,6 +552,9 @@ int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509) {
void PKCS7_SIGNER_INFO_get0_algs(PKCS7_SIGNER_INFO *si, EVP_PKEY **pk,
X509_ALGOR **pdig, X509_ALGOR **psig)
{
if (!si) {
return;
}
if (pk) {
*pk = si->pkey;
}
Expand All @@ -572,6 +568,9 @@ void PKCS7_SIGNER_INFO_get0_algs(PKCS7_SIGNER_INFO *si, EVP_PKEY **pk,

void PKCS7_RECIP_INFO_get0_alg(PKCS7_RECIP_INFO *ri, X509_ALGOR **penc)
{
if (!ri) {
return;
}
if (penc) {
*penc = ri->key_enc_algor;
}
Expand Down
11 changes: 3 additions & 8 deletions crypto/pkcs7/pkcs7_x509.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ int PKCS7_bundle_CRLs(CBB *out, const STACK_OF(X509_CRL) *crls) {

PKCS7 *d2i_PKCS7_bio(BIO *bio, PKCS7 **out) {
if (out == NULL) {
OPENSSL_PUT_ERROR(PKCS7, ERR_R_PASSED_NULL_PARAMETER);
return NULL;
}

Expand Down Expand Up @@ -431,11 +432,8 @@ PKCS7 *PKCS7_sign(X509 *sign_cert, EVP_PKEY *pkey, STACK_OF(X509) *certs,

int PKCS7_add_certificate(PKCS7 *p7, X509 *x509)
{
int i;
STACK_OF(X509) **sk;

i = OBJ_obj2nid(p7->type);
switch (i) {
switch (OBJ_obj2nid(p7->type)) {
case NID_pkcs7_signed:
sk = &(p7->d.sign->cert);
break;
Expand Down Expand Up @@ -466,11 +464,8 @@ int PKCS7_add_certificate(PKCS7 *p7, X509 *x509)

int PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl)
{
int i;
STACK_OF(X509_CRL) **sk;

i = OBJ_obj2nid(p7->type);
switch (i) {
switch (OBJ_obj2nid(p7->type)) {
case NID_pkcs7_signed:
sk = &(p7->d.sign->crl);
break;
Expand Down
10 changes: 5 additions & 5 deletions include/openssl/pkcs7.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ OPENSSL_EXPORT int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509);

// PKCS7_SIGNER_INFO_set attaches the other parameters to |p7i|, returning 1 on
// success and 0 on error or if specified parameters are inapplicable to
// signing. Only EC, DH, and RSA |pkey|s are supported. |pkey|'s reference
// count is incremented, but neither |x509|'s nor |dgst|'s is.
// signing. Only EC, DH, and RSA |pkey|s are supported. |pkey| is assigned to
// |p7i| and its reference count is incremented.
OPENSSL_EXPORT int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509,
EVP_PKEY *pkey, const EVP_MD *dgst);

Expand Down Expand Up @@ -230,9 +230,9 @@ OPENSSL_EXPORT int PKCS7_content_new(PKCS7 *p7, int nid);
// returns 1 on success and 0 on failure.
OPENSSL_EXPORT int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher);

// PKCS7_set_content sets |p7_data| as content on |p7| for applicaple types of
// |p7|. It frees any existing content on |p7|, returning 1 on success and 0 on
// failure.
// PKCS7_set_content sets |p7_data| as content on |p7| for applicable types of
// |p7|: signedData and digestData. It frees any existing content on |p7|,
// returning 1 on success and 0 on failure.
OPENSSL_EXPORT int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data);

// PKCS7_set_type instantiates |p7| as type |type|. It returns 1 on success and
Expand Down

0 comments on commit 42777da

Please sign in to comment.