Skip to content

fix(x25519): workaround bug in Conscrypt #449

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

Merged
kruton merged 1 commit into from
Jan 24, 2026
Merged

fix(x25519): workaround bug in Conscrypt #449

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
15 changes: 14 additions & 1 deletion src/main/java/com/trilead/ssh2/crypto/dh/PlatformX25519Provider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.security.PublicKey;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.NamedParameterSpec;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.XECPrivateKeySpec;
import java.security.spec.XECPublicKeySpec;

Expand Down Expand Up @@ -79,9 +80,21 @@ public byte[] computeSharedSecret(byte[] privateKey, byte[] publicKey) throws In
}
}

private static final byte[] PKCS8_PREFIX = {
0x30, 0x2e, // SEQUENCE (46 bytes)
0x02, 0x01, 0x00, // INTEGER 0 (version)
0x30, 0x05, // SEQUENCE (5 bytes)
0x06, 0x03, 0x2b, 0x65, 0x6e, // OID 1.3.101.110 (X25519)
0x04, 0x22, // OCTET STRING (34 bytes)
0x04, 0x20 // OCTET STRING (32 bytes) - key follows
};

private PrivateKey createPrivateKey(byte[] keyBytes) throws InvalidKeyException {
try {
XECPrivateKeySpec spec = new XECPrivateKeySpec(X25519_SPEC, keyBytes.clone());
byte[] pkcs8 = new byte[PKCS8_PREFIX.length + KEY_SIZE];
System.arraycopy(PKCS8_PREFIX, 0, pkcs8, 0, PKCS8_PREFIX.length);
System.arraycopy(keyBytes, 0, pkcs8, PKCS8_PREFIX.length, KEY_SIZE);
PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(pkcs8);
return keyFactory.generatePrivate(spec);
} catch (InvalidKeySpecException e) {
throw new InvalidKeyException("Invalid private key", e);
Expand Down
Loading