Skip to content

Update getSigAlgs to handle algorithms without combined NID #1019

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
eager-signal wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update getSigAlgs to handle algorithms without combined NID #1019

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
3 changes: 2 additions & 1 deletion openssl-classes/src/main/java/io/netty/internal/tcnative/SSL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,8 @@ public static void setKeyMaterialServerSide(long ssl, long chain, long key) thro
/**
* Return the signature algorithms that the remote peer supports or {@code null} if none are supported.
* See <a href="https://www.openssl.org/docs/man1.1.0/ssl/SSL_get_sigalgs.html"> man SSL_get_sigalgs</a> for more details.
* The returned names are generated using {@code OBJ_nid2ln} with the {@code psignhash} as parameter.
* The returned names are generated using {@code OBJ_nid2ln} with the {@code psignhash} as parameter, or with
* {@code psign} if there is no {@code psignhash} (for example for Ed25519).
*
* @param ssl the SSL instance (SSL *)
* @return the signature algorithms or {@code null}.
Expand Down
8 changes: 7 additions & 1 deletion openssl-dynamic/src/main/c/ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2704,6 +2704,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSL, getSigAlgs)(TCN_STDARGS, jlong ssl) {
#if OPENSSL_VERSION_NUMBER >= 0x10002000L || defined(__GNUC__) || defined(__GNUG__)
int i;
int nsig;
int psign;
int psignhash;
jobjectArray array = NULL;
jstring algString = NULL;
Expand All @@ -2718,7 +2719,12 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSL, getSigAlgs)(TCN_STDARGS, jlong ssl) {
}

for (i = 0; i < nsig; i++) {
SSL_get_sigalgs(ssl_, i, NULL, NULL, &psignhash, NULL, NULL);
SSL_get_sigalgs(ssl_, i, &psign, NULL, &psignhash, NULL, NULL);
if (psignhash == NID_undef) {
// Some algorithms, such as Ed25519, Ed448 and RSA-PSS, have no combined signature and hash NID.
// Use the signature NID so we return their name rather than "undefined".
psignhash = psign;
}
if ((algString = (*e)->NewStringUTF(e, OBJ_nid2ln(psignhash))) == NULL) {
// something is wrong we should better just return here
return NULL;
Expand Down