Skip to content

[fix] select EC and EdDSA credentials with BC-JSSE (#383) #391

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

Closed
kares wants to merge 4 commits into from
Closed

[fix] select EC and EdDSA credentials with BC-JSSE (#383) #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b24bd94
initial draft: deliver buffered TLS data before EOF
kares Oct 23, 2026
db4c28d
refactor: simplify and use KeyStore inner class
kares Oct 23, 2026
0844672
refactor and handle extra-chain properly
kares Oct 23, 2026
cdab838
adjust key-store tests
kares Oct 23, 2026
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
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,6 +1046,7 @@ DO NOT MODIFY - GENERATED CODE
<include>org/jruby/ext/openssl/Random.java</include>
<include>org/jruby/ext/openssl/SSL.java</include>
<include>org/jruby/ext/openssl/SSLContext.java</include>
<include>org/jruby/ext/openssl/SSLKeyStore.java</include>
<include>org/jruby/ext/openssl/SSLSession.java</include>
<include>org/jruby/ext/openssl/SSLSocket.java</include>
<include>org/jruby/ext/openssl/SecurityHelper.java</include>
Expand Down
14 changes: 12 additions & 2 deletions src/main/java/org/jruby/ext/openssl/PKeyEdDSA.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,17 @@ private PKeyEdDSA(Ruby runtime, RubyClass type, PublicKey publicKey, PrivateKey
}

PKeyEdDSA(Ruby runtime, PublicKey publicKey) {
this(runtime, publicKey, null);
this(runtime, convertNonBCPublicKey(runtime, publicKey), null);
}

static PublicKey convertNonBCPublicKey(Ruby runtime, PublicKey publicKey) {
if (publicKey instanceof EdDSAPublicKey) return publicKey;
try {
return SecurityHelper.getKeyFactory("EdDSA")
.generatePublic(new X509EncodedKeySpec(publicKey.getEncoded()));
} catch (GeneralSecurityException e) {
throw newPKeyError(runtime, e);
}
}

static PKeyEdDSA newInstance(final Ruby runtime, final KeyPair keyPair) {
Expand Down Expand Up @@ -332,6 +342,6 @@ static boolean isEdDSAAlgorithm(final String alg) {
}

static boolean isEdDSAKey(final PublicKey key) {
return key instanceof EdDSAPublicKey;
return key instanceof EdDSAPublicKey || (key != null && isEdDSAAlgorithm(key.getAlgorithm()));
}
}
Loading
Loading