Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

20240910-configure-enable-all-asm-and-sp-cleanup #7967

Merged
merged 13 commits into from
Sep 12, 2024
Merged

20240910-configure-enable-all-asm-and-sp-cleanup #7967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3cb66ad
configure.ac: update help and error messages re fastmath.
douzzer Sep 10, 2024
cf8f9a8
configure.ac: add --enable-all-asm, and add it to --enable-all and --…
douzzer Sep 10, 2024
723d8ef
configure.ac: consolidate enable-all-crypto settings in one place.
douzzer Sep 10, 2024
430d104
configure.ac: render warnings when FIPS setup forces off options supp…
douzzer Sep 11, 2024
1b0ef04
configure.ac: move handling for enable-all-asm to precede handling fo…
douzzer Sep 11, 2024
5b8e9e6
wolfcrypt/src/siphash.c: fixes for bugprone-macro-parentheses.
douzzer Sep 11, 2024
e227b2a
wolfcrypt/src/sp_int.c: fix bugprone-too-small-loop-variable in _sp_m…
douzzer Sep 11, 2024
428e158
configure.ac:
douzzer Sep 11, 2024
8d0047f
SP: fixes for several bugprone-macro-parentheses and -Wconversions.
douzzer Sep 11, 2024
98a5102
configure.ac: in --enable-all-asm handler, support only x86_64 and aa…
douzzer Sep 12, 2024
53c4c00
wolfcrypt/src/sp_cortexm.c: update from scripts#423.
douzzer Sep 12, 2024
3fac3b7
configure.ac:
douzzer Sep 12, 2024
eb53a95
wolfcrypt/src/asn.c:DecodeSingleResponse(): fix gating for "at" worki…
douzzer Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
402 changes: 206 additions & 196 deletions configure.ac
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 12 additions & 13 deletions wolfcrypt/src/asn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36028,7 +36028,7 @@ static int DecodeSingleResponse(byte* source, word32* ioIndex, word32 size,
*ioIndex = idx;

return 0;
#else
#else /* WOLFSSL_ASN_TEMPLATE */
DECL_ASNGETDATA(dataASN, singleResponseASN_Length);
int ret = 0;
word32 ocspDigestSize = OCSP_DIGEST_SIZE;
Expand All @@ -36038,10 +36038,6 @@ static int DecodeSingleResponse(byte* source, word32* ioIndex, word32 size,
word32 issuerKeyHashLen;
word32 thisDateLen;
word32 nextDateLen;
#if defined(OPENSSL_ALL) || defined(WOLFSSL_NGINX) || \
defined(WOLFSSL_HAPROXY) || defined(HAVE_LIGHTY)
WOLFSSL_ASN1_TIME *at;
#endif

(void)wrapperSz;

Expand Down Expand Up @@ -36119,19 +36115,20 @@ static int DecodeSingleResponse(byte* source, word32* ioIndex, word32 size,
if (!XVALIDATE_DATE(cs->thisDate, ASN_GENERALIZED_TIME, ASN_BEFORE)) {
ret = ASN_BEFORE_DATE_E;
}
#endif /* !NO_ASN_TIME_CHECK && !WOLFSSL_NO_OCSP_DATE_CHECK */
}
#ifdef WOLFSSL_OCSP_PARSE_STATUS
if (ret == 0) {
#endif
#ifdef WOLFSSL_OCSP_PARSE_STATUS
/* Store ASN.1 version of thisDate. */
WOLFSSL_ASN1_TIME *at;
cs->thisDateAsn = GetASNItem_Addr(
dataASN[SINGLERESPONSEASN_IDX_THISUPDATE_GT], source);
at = &cs->thisDateParsed;
at->type = ASN_GENERALIZED_TIME;
XMEMCPY(at->data, cs->thisDate, thisDateLen);
at->length = (int)thisDateLen;
#endif
}
#endif
if ((ret == 0) &&
(dataASN[SINGLERESPONSEASN_IDX_NEXTUPDATE_GT].tag != 0)) {
/* Store the nextDate format - only one possible. */
Expand All @@ -36141,28 +36138,30 @@ static int DecodeSingleResponse(byte* source, word32* ioIndex, word32 size,
if (!XVALIDATE_DATE(cs->nextDate, ASN_GENERALIZED_TIME, ASN_AFTER)) {
ret = ASN_AFTER_DATE_E;
}
#endif /* !NO_ASN_TIME_CHECK && !WOLFSSL_NO_OCSP_DATE_CHECK */
}
#ifdef WOLFSSL_OCSP_PARSE_STATUS
if ((ret == 0) &&
(dataASN[SINGLERESPONSEASN_IDX_NEXTUPDATE_GT].tag != 0)) {
#endif
#ifdef WOLFSSL_OCSP_PARSE_STATUS
(dataASN[SINGLERESPONSEASN_IDX_NEXTUPDATE_GT].tag != 0))
{
/* Store ASN.1 version of thisDate. */
WOLFSSL_ASN1_TIME *at;
cs->nextDateAsn = GetASNItem_Addr(
dataASN[SINGLERESPONSEASN_IDX_NEXTUPDATE_GT], source);
at = &cs->nextDateParsed;
at->type = ASN_GENERALIZED_TIME;
XMEMCPY(at->data, cs->nextDate, nextDateLen);
at->length = (int)nextDateLen;
#endif
}
#endif
if (ret == 0) {
/* OcspEntry now used. */
single->used = 1;
}

FREE_ASNGETDATA(dataASN, NULL);
return ret;
#endif
#endif /* WOLFSSL_ASN_TEMPLATE */
}

#ifdef WOLFSSL_ASN_TEMPLATE
Expand Down
34 changes: 17 additions & 17 deletions wolfcrypt/src/siphash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,29 +805,29 @@ int wc_SipHash(const unsigned char* key, const unsigned char* in, word32 inSz,
#else

#define SipRoundV(v0, v1, v2, v3) \
v0 += v1; \
v2 += v3; \
v1 = rotlFixed64(v1, 13); \
v3 = rotlFixed64(v3, 16); \
v1 ^= v0; \
v3 ^= v2; \
v0 = rotlFixed64(v0, 32); \
v2 += v1; \
v0 += v3; \
v1 = rotlFixed64(v1, 17); \
v3 = rotlFixed64(v3, 21); \
v1 ^= v2; \
v3 ^= v0; \
v2 = rotlFixed64(v2, 32);
(v0) += (v1); \
(v2) += (v3); \
(v1) = rotlFixed64(v1, 13); \
(v3) = rotlFixed64(v3, 16); \
(v1) ^= (v0); \
(v3) ^= (v2); \
(v0) = rotlFixed64(v0, 32); \
(v2) += (v1); \
(v0) += (v3); \
(v1) = rotlFixed64(v1, 17); \
(v3) = rotlFixed64(v3, 21); \
(v1) ^= (v2); \
(v3) ^= (v0); \
(v2) = rotlFixed64(v2, 32);

#define SipHashCompressV(v0, v1, v2, v3, m) \
do { \
int i; \
v3 ^= m; \
(v3) ^= (m); \
for (i = 0; i < WOLFSSL_SIPHASH_CROUNDS; i++) { \
SipRoundV(v0, v1, v2, v3); \
} \
v0 ^= m; \
(v0) ^= (m); \
} \
while (0)

Expand All @@ -839,7 +839,7 @@ int wc_SipHash(const unsigned char* key, const unsigned char* in, word32 inSz,
for (i = 0; i < WOLFSSL_SIPHASH_DROUNDS; i++) { \
SipRoundV(v0, v1, v2, v3); \
} \
n = v0 ^ v1 ^ v2 ^ v3; \
n = (v0) ^ (v1) ^ (v2) ^ (v3); \
SET_U64(out, n); \
} \
while (0)
Expand Down
Loading