wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 03:07:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

more specific naming for attribute types

Browse Source
This commit is contained in:
Jacob Barthelmeh
2023-04-25 13:56:29 -06:00
parent ca71907142
commit bbe9c694a6
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wolfcrypt/src/pkcs7.c
View File

@ -1946,7 +1946,7 @@ static int wc_PKCS7_BuildSignedAttributes(PKCS7* pkcs7, ESD* esd,
cannedAttribsCount = sizeof(cannedAttribs)/sizeof(PKCS7Attrib); cannedAttribsCount = sizeof(cannedAttribs)/sizeof(PKCS7Attrib);
if ((pkcs7->defaultSignedAttribs & WOLFSSL_CONTENT_ATTRIBUTE) || if ((pkcs7->defaultSignedAttribs & WOLFSSL_CONTENT_TYPE_ATTRIBUTE) ||
pkcs7->defaultSignedAttribs == 0) { pkcs7->defaultSignedAttribs == 0) {
cannedAttribs[idx].oid = contentTypeOid; cannedAttribs[idx].oid = contentTypeOid;
cannedAttribs[idx].oidSz = contentTypeOidSz; cannedAttribs[idx].oidSz = contentTypeOidSz;
@ -1956,7 +1956,7 @@ static int wc_PKCS7_BuildSignedAttributes(PKCS7* pkcs7, ESD* esd,
} }
#ifndef NO_ASN_TIME #ifndef NO_ASN_TIME
if ((pkcs7->defaultSignedAttribs & WOLFSSL_TIME_ATTRIBUTE) || if ((pkcs7->defaultSignedAttribs & WOLFSSL_SIGNING_TIME_ATTRIBUTE) ||
pkcs7->defaultSignedAttribs == 0) { pkcs7->defaultSignedAttribs == 0) {
cannedAttribs[idx].oid = signingTimeOid; cannedAttribs[idx].oid = signingTimeOid;
cannedAttribs[idx].oidSz = signingTimeOidSz; cannedAttribs[idx].oidSz = signingTimeOidSz;
@ -2875,8 +2875,9 @@ int wc_PKCS7_SetDefaultSignedAttribs(PKCS7* pkcs7, word16 flag)
} }
/* check for unknown flags */ /* check for unknown flags */
if (flag & ~(WOLFSSL_CONTENT_ATTRIBUTE | WOLFSSL_TIME_ATTRIBUTE | if (flag & ~(WOLFSSL_CONTENT_TYPE_ATTRIBUTE |
WOLFSSL_MESSAGE_DIGEST_ATTRIBUTE | WOLFSSL_NO_ATTRIBUTES)) { WOLFSSL_SIGNING_TIME_ATTRIBUTE |
WOLFSSL_MESSAGE_DIGEST_ATTRIBUTE | WOLFSSL_NO_ATTRIBUTES)) {
WOLFSSL_MSG("Unknown attribute flags found"); WOLFSSL_MSG("Unknown attribute flags found");
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }

4
wolfssl/wolfcrypt/pkcs7.h
View File

@ -77,8 +77,8 @@
/* bitmap flag for attributes */ /* bitmap flag for attributes */
#define WOLFSSL_NO_ATTRIBUTES 0x1 #define WOLFSSL_NO_ATTRIBUTES 0x1
#define WOLFSSL_CONTENT_ATTRIBUTE 0x2 #define WOLFSSL_CONTENT_TYPE_ATTRIBUTE 0x2
#define WOLFSSL_TIME_ATTRIBUTE 0x4 #define WOLFSSL_SIGNING_TIME_ATTRIBUTE 0x4
#define WOLFSSL_MESSAGE_DIGEST_ATTRIBUTE 0x8 #define WOLFSSL_MESSAGE_DIGEST_ATTRIBUTE 0x8
/* PKCS#7 content types, ref RFC 2315 (Section 14) */ /* PKCS#7 content types, ref RFC 2315 (Section 14) */