Skip to content

give debug log hint about hash min size and adjust configure with CI #228

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

Open
JacobBarthelmeh wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −8
Open

give debug log hint about hash min size and adjust configure with CI #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,11 @@ jobs:
working-directory: ./wolfssl
run: |
./autogen.sh
./configure ${{ matrix.config }} ${{ matrix.sanitize }} --prefix=$GITHUB_WORKSPACE/build-dir
# Lower the WC_SIG_MIN_HASH_TYPE floor (default SHA-256 on master
# post-PR-10496) back to MD5 for test cases.
./configure ${{ matrix.config }} ${{ matrix.sanitize }} \
CPPFLAGS="-DWC_SIG_MIN_HASH_TYPE=WC_HASH_TYPE_MD5" \
--prefix=$GITHUB_WORKSPACE/build-dir
make -j
make install

Expand Down
26 changes: 19 additions & 7 deletions src/sign-verify/clu_dgst_setup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,12 +407,18 @@ int wolfCLU_dgst_setup(int argc, char** argv)

/* if not signing then do verification */
if (ret == WOLFCLU_SUCCESS && signing == 0) {
if (wc_SignatureVerify(hashType, sigType, (const byte*)data, dataSz,
(const byte*)sig, sigSz, key, keySz) == 0) {
int verifyRet = wc_SignatureVerify(hashType, sigType,
(const byte*)data, dataSz, (const byte*)sig, sigSz,
key, keySz);
if (verifyRet == 0) {
WOLFCLU_LOG(WOLFCLU_L0, "Verify OK");
}
else {
wolfCLU_LogError("Verification failure");
if (hashType == WC_HASH_TYPE_MD5 && verifyRet == BAD_FUNC_ARG) {
WOLFCLU_LOG(WOLFCLU_L0,
"Note: MD5 below default min sig hash on wolfSSL > 5.9.1");
Comment on lines +419 to +420
}
ret = WOLFCLU_FATAL_ERROR;
}
}
Expand Down Expand Up @@ -446,11 +452,17 @@ int wolfCLU_dgst_setup(int argc, char** argv)
}
}

if (ret == WOLFCLU_SUCCESS &&
wc_SignatureGenerate(hashType, sigType, (const byte*)data,
dataSz, sig, &sigSz, key, keySz, &rng) != 0) {
wolfCLU_LogError("Error getting signature");
ret = WOLFCLU_FATAL_ERROR;
if (ret == WOLFCLU_SUCCESS) {
int signRet = wc_SignatureGenerate(hashType, sigType,
(const byte*)data, dataSz, sig, &sigSz, key, keySz, &rng);
if (signRet != 0) {
wolfCLU_LogError("Error getting signature");
if (hashType == WC_HASH_TYPE_MD5 && signRet == BAD_FUNC_ARG) {
WOLFCLU_LOG(WOLFCLU_L0,
"Note: MD5 below default min sig hash on wolfSSL > 5.9.1");
Comment on lines +461 to +462
}
ret = WOLFCLU_FATAL_ERROR;
}
}

/* write out the signature */
Expand Down
Loading