From bbe9c694a66ce755c3593ef40f9fee6400d583bd Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Tue, 25 Apr 2023 13:56:29 -0600 Subject: [PATCH] more specific naming for attribute types --- wolfcrypt/src/pkcs7.c | 9 +++++---- wolfssl/wolfcrypt/pkcs7.h | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c index ed59b1de9..9a93044a8 100644 --- a/wolfcrypt/src/pkcs7.c +++ b/wolfcrypt/src/pkcs7.c @@ -1946,7 +1946,7 @@ static int wc_PKCS7_BuildSignedAttributes(PKCS7* pkcs7, ESD* esd, cannedAttribsCount = sizeof(cannedAttribs)/sizeof(PKCS7Attrib); - if ((pkcs7->defaultSignedAttribs & WOLFSSL_CONTENT_ATTRIBUTE) || + if ((pkcs7->defaultSignedAttribs & WOLFSSL_CONTENT_TYPE_ATTRIBUTE) || pkcs7->defaultSignedAttribs == 0) { cannedAttribs[idx].oid = contentTypeOid; cannedAttribs[idx].oidSz = contentTypeOidSz; @@ -1956,7 +1956,7 @@ static int wc_PKCS7_BuildSignedAttributes(PKCS7* pkcs7, ESD* esd, } #ifndef NO_ASN_TIME - if ((pkcs7->defaultSignedAttribs & WOLFSSL_TIME_ATTRIBUTE) || + if ((pkcs7->defaultSignedAttribs & WOLFSSL_SIGNING_TIME_ATTRIBUTE) || pkcs7->defaultSignedAttribs == 0) { cannedAttribs[idx].oid = signingTimeOid; cannedAttribs[idx].oidSz = signingTimeOidSz; @@ -2875,8 +2875,9 @@ int wc_PKCS7_SetDefaultSignedAttribs(PKCS7* pkcs7, word16 flag) } /* check for unknown flags */ - if (flag & ~(WOLFSSL_CONTENT_ATTRIBUTE | WOLFSSL_TIME_ATTRIBUTE | - WOLFSSL_MESSAGE_DIGEST_ATTRIBUTE | WOLFSSL_NO_ATTRIBUTES)) { + if (flag & ~(WOLFSSL_CONTENT_TYPE_ATTRIBUTE | + WOLFSSL_SIGNING_TIME_ATTRIBUTE | + WOLFSSL_MESSAGE_DIGEST_ATTRIBUTE | WOLFSSL_NO_ATTRIBUTES)) { WOLFSSL_MSG("Unknown attribute flags found"); return BAD_FUNC_ARG; } diff --git a/wolfssl/wolfcrypt/pkcs7.h b/wolfssl/wolfcrypt/pkcs7.h index da0a53f33..8f28fdbae 100644 --- a/wolfssl/wolfcrypt/pkcs7.h +++ b/wolfssl/wolfcrypt/pkcs7.h @@ -77,8 +77,8 @@ /* bitmap flag for attributes */ #define WOLFSSL_NO_ATTRIBUTES 0x1 -#define WOLFSSL_CONTENT_ATTRIBUTE 0x2 -#define WOLFSSL_TIME_ATTRIBUTE 0x4 +#define WOLFSSL_CONTENT_TYPE_ATTRIBUTE 0x2 +#define WOLFSSL_SIGNING_TIME_ATTRIBUTE 0x4 #define WOLFSSL_MESSAGE_DIGEST_ATTRIBUTE 0x8 /* PKCS#7 content types, ref RFC 2315 (Section 14) */