Skip to content

openssl compat errors and mldsa oid fix #10785

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
stenslae wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −3
Open

openssl compat errors and mldsa oid fix #10785

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: 3 additions & 3 deletions src/ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9123,7 +9123,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
#ifdef WOLFSSL_HAVE_ERROR_QUEUE
return (unsigned long)wc_GetErrorNodeErr();
#else
return (unsigned long)(0 - NOT_COMPILED_IN);
return 0;
#endif
}
#endif
Expand Down Expand Up @@ -15181,7 +15181,7 @@ unsigned long wolfSSL_ERR_peek_last_error_line(const char **file, int *line)
return (unsigned long)ret;
}
#else
return (unsigned long)(0 - NOT_COMPILED_IN);
return 0;
#endif
}

Expand Down Expand Up @@ -16225,7 +16225,7 @@ unsigned long wolfSSL_ERR_peek_last_error(void)
return (unsigned long)ret;
}
#else
return (unsigned long)(0 - NOT_COMPILED_IN);
return 0;
#endif
}

Expand Down
6 changes: 6 additions & 0 deletions src/x509.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8954,6 +8954,12 @@ static int verifyX509orX509REQ(WOLFSSL_X509* x509, WOLFSSL_EVP_PKEY* pkey,
type = DSAk;
break;

#if defined(WOLFSSL_HAVE_MLDSA)
case WC_EVP_PKEY_DILITHIUM:
type = x509->pubKeyOID;
break;
#endif

default:
WOLFSSL_MSG("Unknown pkey key type");
return WOLFSSL_FATAL_ERROR;
Expand Down
Loading