Skip to content

Be bug compatible with OpenSSH Ed25519 #26

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 2 commits into from
Jun 10, 2016
Merged

Be bug compatible with OpenSSH Ed25519 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a84892
Go back to junit 4.11 because of serialization format error
kruton Jun 9, 2016
bac6448
Be bug compatible with OpenSSH
kruton Jun 10, 2016
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
2 changes: 1 addition & 1 deletion sshlib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ dependencies {
compile 'org.connectbot:simplesocks:1.0.1'
compile 'net.vrallev.ecc:ecc-25519-java:1.0.3'

testCompile 'junit:junit:4.12'
testCompile 'junit:junit:4.11'
}
17 changes: 7 additions & 10 deletions sshlib/src/main/java/com/trilead/ssh2/crypto/PEMDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,10 +505,8 @@ public static KeyPair decode(PEMStructure ps, String password) throws IOExceptio
throw new IOException("Only one key supported, but encountered bundle of " + numberOfKeys);
}

byte[] publicBytes = tr.readByteString();

TypesReader trPub = new TypesReader(publicBytes);
String keyType = trPub.readString();
// OpenSSH discards this, so we will as well.
tr.readByteString();

byte[] encryptedBytes = tr.readByteString();

Expand All @@ -526,19 +524,18 @@ public static KeyPair decode(PEMStructure ps, String password) throws IOExceptio
throw new IOException("Decryption failed when trying to read private keys");
}

String privateKeyType = trEnc.readString();
if (!keyType.equals(privateKeyType)) {
throw new IOException("Public and private key types do not match!");
}
String keyType = trEnc.readString();

PrivateKey privKey;
PublicKey pubKey;
if (Ed25519Verify.ED25519_ID.equals(keyType)) {
byte[] publicBytes = trEnc.readByteString();
byte[] privateBytes = trEnc.readByteString();
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName(
EdDSANamedCurveTable.CURVE_ED25519_SHA512);
privKey = new EdDSAPrivateKey(new EdDSAPrivateKeySpec(privateBytes, spec));
pubKey = Ed25519Verify.decodeSSHEd25519PublicKey(publicBytes);
privKey = new EdDSAPrivateKey(new EdDSAPrivateKeySpec(
Arrays.copyOfRange(privateBytes, 0, 32), spec));
pubKey = new EdDSAPublicKey(new EdDSAPublicKeySpec(publicBytes, spec));
// TODO write decode private key support for these two:
//} else if (keyType.startsWith("ecdsa-sha2-")) {
// pubKey = ECDSASHA2Verify.decodeSSHECDSAPublicKey(publicBytes);
Expand Down
7 changes: 7 additions & 0 deletions sshlib/src/main/java/com/trilead/ssh2/signature/Ed25519Verify.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec;

import java.io.IOException;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
Expand Down Expand Up @@ -102,13 +103,16 @@ public static EdDSAPublicKey decodeSSHEd25519PublicKey(byte[] key) throws IOExce
public static byte[] generateSignature(byte[] msg, EdDSAPrivateKey privateKey) throws IOException {
try {
EdDSAEngine engine = new EdDSAEngine(MessageDigest.getInstance("SHA-512"));
engine.setParameter(EdDSAEngine.ONE_SHOT_MODE);
engine.initSign(privateKey);
engine.update(msg);
return engine.sign();
} catch (NoSuchAlgorithmException e) {
throw new IOException(e);
} catch (SignatureException e) {
throw new IOException(e);
} catch (InvalidAlgorithmParameterException e) {
throw new IOException(e);
} catch (InvalidKeyException e) {
throw new IOException(e);
}
Expand All @@ -118,10 +122,13 @@ public static boolean verifySignature(byte[] msg, byte[] sig, EdDSAPublicKey pub
try {
EdDSAEngine engine = new EdDSAEngine(MessageDigest.getInstance("SHA-512"));
engine.initVerify(publicKey);
engine.setParameter(EdDSAEngine.ONE_SHOT_MODE);
engine.update(msg);
return engine.verify(sig);
} catch (NoSuchAlgorithmException e) {
throw new IOException(e);
} catch (InvalidAlgorithmParameterException e) {
throw new IOException(e);
} catch (InvalidKeyException e) {
throw new IOException(e);
} catch (SignatureException e) {
Expand Down
38 changes: 38 additions & 0 deletions sshlib/src/test/java/com/trilead/ssh2/signature/Ed25519VerifyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,21 @@ public class Ed25519VerifyTest {
private static final byte[] PUBLIC_KEY = toByteArray("ec172b93ad5e563bf4932c70e1245034c35467ef2efd4d64ebf819683467e2bf");
private static final byte[] MESSAGE = toByteArray("616263");
private static final byte[] SIGNATURE = toByteArray("dc2a4459e7369633a52b1bf277839a00201009a3efbf3ecb69bea2186c26b58909351fc9ac90b3ecfdfbc7c66431e0303dca179c138ac17ad9bef1177331a704");

private static final byte[] SSH_KAT_MESSAGE = toByteArray("4885f67437486e61");
private static final byte[] SSH_KAT_SIGNATURE = toByteArray("0000000b7373682d656432353531390000004022e82017bd03b6d3ac969b3c519e8f25af0ec058e9c0d1263a93ac010be7270c6a4cccbfb3ca7dbd6ee993e2764e95c18b5a620a1794501f85a4d8a7946af106");
private static final char[] SSH_KAT_PRIVATE = ("-----BEGIN OPENSSH PRIVATE KEY-----\n" +
"b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW\n" +
"QyNTUxOQAAACBThupGO0X+FLQhbz8CoKPwc7V3JNsQuGtlsgN+F7SMGQAAAJjnj4Ao54+A\n" +
"KAAAAAtzc2gtZWQyNTUxOQAAACBThupGO0X+FLQhbz8CoKPwc7V3JNsQuGtlsgN+F7SMGQ\n" +
"AAAED3KgoDbjR54V7bdNpfKlQY5m20UK1QaHytkCR+6rZEDFOG6kY7Rf4UtCFvPwKgo/Bz\n" +
"tXck2xC4a2WyA34XtIwZAAAAE0VEMjU1MTkgdGVzdCBrZXkgIzEBAg==\n" +
"-----END OPENSSH PRIVATE KEY-----").toCharArray();
private static final byte[] SSH_KAT_ED25519_PK = toByteArray("5386ea463b45fe14b4216f3f02a0a3f073b57724db10b86b65b2037e17b48c19");
private static final byte[] SSH_KAT_ED25519_SK = toByteArray("f72a0a036e3479e15edb74da5f2a5418e66db450ad50687cad90247eeab6440c");
// There is actually another 32 bytes in the key, but it's not used.
// 5386ea463b45fe14b4216f3f02a0a3f073b57724db10b86b65b2037e17b48c19

private EdDSANamedCurveSpec spec;

private static byte[] toByteArray(String s) {
Expand Down Expand Up @@ -119,4 +134,27 @@ public void publicKeyEncodeSuccess() throws Exception {
byte[] pubKeyBytes = Base64.decode(SSH_PUBLIC_KEY.toCharArray());
assertArrayEquals(pubKeyBytes, Ed25519Verify.encodeSSHEd25519PublicKey(pubKey));
}

@Test
public void opensshVectorVerifies() throws Exception {
KeyPair pair = PEMDecoder.decode(SSH_KAT_PRIVATE, null);
assertTrue(Ed25519Verify.verifySignature(SSH_KAT_MESSAGE,
Ed25519Verify.decodeSSHEd25519Signature(SSH_KAT_SIGNATURE),
(EdDSAPublicKey) pair.getPublic()));
}

@Test
public void opensshPrivateDecodesCorrectly() throws Exception {
KeyPair pair = PEMDecoder.decode(SSH_KAT_PRIVATE, null);
assertArrayEquals(SSH_KAT_ED25519_SK, ((EdDSAPrivateKey) pair.getPrivate()).getSeed());
assertArrayEquals(SSH_KAT_ED25519_PK, ((EdDSAPublicKey) pair.getPublic()).getAbyte());
}

@Test
public void opensshVectorSigns() throws Exception {
KeyPair pair = PEMDecoder.decode(SSH_KAT_PRIVATE, null);
byte[] sig = Ed25519Verify.generateSignature(SSH_KAT_MESSAGE, (EdDSAPrivateKey) pair.getPrivate());
byte[] encoded = Ed25519Verify.encodeSSHEd25519Signature(sig);
assertArrayEquals(SSH_KAT_SIGNATURE, Ed25519Verify.encodeSSHEd25519Signature(sig));
}
}