use Hex.decode in unit tests

This commit is contained in:
Vincent Breitmoser 2017-11-28 16:40:06 +01:00
parent 8afc43d192
commit e981a1444c
1 changed files with 103 additions and 122 deletions

View File

@ -17,7 +17,9 @@
package org.sufficientlysecure.keychain.ssh.signature;
import org.bouncycastle.bcpg.PublicKeyAlgorithmTags;
import org.bouncycastle.util.encoders.Hex;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -27,154 +29,133 @@ import org.sufficientlysecure.keychain.KeychainTestRunner;
@RunWith(KeychainTestRunner.class)
public class SshSignatureConverterTest {
private final static String sCurveOidNistP256 = "1.2.840.10045.3.1.7";
private final static String CURVE_OID_NIST_P_256 = "1.2.840.10045.3.1.7";
private final static int[] sRawEcDsaSignatureInt = {
0x30, 0x46,
0x02, 0x21,
0x00, 0x94, 0x9f, 0xa9, 0x15, 0x1d, 0x71, 0x49, 0x5d, 0x9c, 0x02, 0x06, 0x35, 0xdc, 0xed, 0xac, 0x6a,
0x86, 0x65, 0xd0, 0x79, 0xb4, 0xf7, 0x21, 0xb0, 0x5a, 0x94, 0x08, 0x77, 0x1e, 0x45, 0x5f, 0xe2,
0x02, 0x21,
0x00, 0xdf, 0x9c, 0x7a, 0x5a, 0xe5, 0x9e, 0x5d, 0x2e, 0x42, 0xd3, 0x76, 0x7e, 0x15, 0x25, 0xc8, 0x25,
0x7c, 0xff, 0x82, 0xac, 0x26, 0x64, 0xb6, 0x41, 0x9f, 0xf6, 0x6f, 0x6e, 0x8b, 0x96, 0x69, 0xa0
};
private final static byte[] RAW_ECDSA_SIGNATURE = Hex.decode(
"3046" +
"0221" +
"00949fa9151d71495d9c020635dcedac6a" +
"8665d079b4f721b05a9408771e455fe2" +
"0221" +
"00df9c7a5ae59e5d2e42d3767e1525c825" +
"7cff82ac2664b6419ff66f6e8b9669a0");
private final static int[] sSshEcDsaSignatureInt = {
0x00, 0x00, 0x00, 0x13,
0x65, 0x63, 0x64, 0x73, 0x61, 0x2d, 0x73, 0x68, 0x61, 0x32, 0x2d, 0x6e, 0x69, 0x73, 0x74, 0x70, 0x32,
0x35, 0x36,
0x00, 0x00, 0x00, 0x4a,
0x00, 0x00, 0x00, 0x21,
0x00, 0x94, 0x9f, 0xa9, 0x15, 0x1d, 0x71, 0x49, 0x5d, 0x9c, 0x02, 0x06, 0x35, 0xdc, 0xed, 0xac, 0x6a,
0x86, 0x65, 0xd0, 0x79, 0xb4, 0xf7, 0x21, 0xb0, 0x5a, 0x94, 0x08, 0x77, 0x1e, 0x45, 0x5f, 0xe2,
0x00, 0x00, 0x00, 0x21,
0x00, 0xdf, 0x9c, 0x7a, 0x5a, 0xe5, 0x9e, 0x5d, 0x2e, 0x42, 0xd3, 0x76, 0x7e, 0x15, 0x25, 0xc8, 0x25,
0x7c, 0xff, 0x82, 0xac, 0x26, 0x64, 0xb6, 0x41, 0x9f, 0xf6, 0x6f, 0x6e, 0x8b, 0x96, 0x69, 0xa0
};
private final static byte[] SSH_ECDSA_SIGNATURE = Hex.decode(
"00000013" +
"65636473612d736861322d6e6973747032" +
"3536" +
"0000004a" +
"00000021" +
"00949fa9151d71495d9c020635dcedac6a" +
"8665d079b4f721b05a9408771e455fe2" +
"00000021" +
"00df9c7a5ae59e5d2e42d3767e1525c825" +
"7cff82ac2664b6419ff66f6e8b9669a0"
);
private final static int[] sRawRsaSignatureInt = {
0x1c, 0x97, 0x5c, 0x37, 0xa4, 0x13, 0x7e, 0x9c, 0x86, 0x1d, 0x20, 0xd9, 0xd4, 0x0b, 0x6d, 0xb1, 0x6d,
0x1d, 0xa8, 0xb1, 0x7e, 0x36, 0x03, 0x11, 0xb6, 0xa4, 0xeb, 0xcb, 0x3f, 0x1f, 0xf5, 0x1d, 0x49, 0x06,
0x28, 0xb8, 0x0d, 0xe0, 0xde, 0xce, 0x08, 0xa1, 0xb5, 0xeb, 0xe8, 0xa5, 0x89, 0x4e, 0xa2, 0xfe, 0xa7,
0x40, 0x74, 0x1e, 0x7c, 0x83, 0xc2, 0x41, 0xa0, 0xd2, 0xbd, 0x9b, 0xdb, 0x3a, 0x2f, 0x39, 0x42, 0xca,
0xe8, 0xcc, 0xc3, 0xbd, 0xa7, 0xa1, 0x7b, 0x40, 0xb0, 0x0a, 0x0e, 0x21, 0x4a, 0x5d, 0xa7, 0x65, 0x42,
0x11, 0xf5, 0xfc, 0x49, 0xb4, 0x5d, 0x16, 0xb1, 0xe4, 0x6f, 0xa8, 0x0c, 0xe7, 0x77, 0x96, 0x9c, 0x51,
0x9f, 0x09, 0xbb, 0x45, 0xe3, 0x12, 0xe4, 0x10, 0x9b, 0x3a, 0xf0, 0xc3, 0x13, 0x3f, 0xfa, 0x22, 0x1d,
0xa9, 0xe3, 0xc9, 0xe0, 0x3f, 0xa2, 0xfd, 0xb7, 0x0d, 0xf0, 0x3e, 0x6c, 0x83, 0xee, 0x71, 0xf1, 0x06,
0xb8, 0xf2, 0x4f, 0xd7, 0x2b, 0xad, 0x5e, 0x4e, 0x68, 0x12, 0x3d, 0xda, 0x65, 0x6d, 0xdb, 0xa8, 0xee,
0x11, 0xf9, 0x10, 0x61, 0x54, 0xd1, 0xe1, 0x37, 0x0b, 0xff, 0x3b, 0xa2, 0x2e, 0x3c, 0x25, 0xb7, 0xd9,
0x33, 0x4d, 0x90, 0x3e, 0x4d, 0xd7, 0x9a, 0x73, 0x89, 0xda, 0x41, 0xe9, 0x43, 0x7e, 0x79, 0xdd, 0xd8,
0xa3, 0x33, 0x5d, 0x2c, 0x21, 0x7f, 0x01, 0x05, 0x9b, 0xde, 0x2f, 0x34, 0x50, 0xf8, 0x93, 0x3f, 0x38,
0xbe, 0x10, 0xcd, 0x59, 0x46, 0x7e, 0x9c, 0x93, 0x32, 0xc7, 0x79, 0x4c, 0xcb, 0x9d, 0x19, 0xcb, 0x65,
0xa1, 0x79, 0xb0, 0x16, 0x6c, 0xd0, 0xe5, 0x83, 0xe1, 0x7f, 0x8f, 0x31, 0x22, 0x22, 0x25, 0x9a, 0xe3,
0x1b, 0x13, 0xe6, 0x1f, 0xca, 0xe4, 0xda, 0x5c, 0x55, 0x54, 0xe2, 0x35, 0x52, 0x18, 0xa0, 0xeb, 0x07,
0x19
};
private final static byte[] RAW_RSA_SIGNATURE = Hex.decode(
"1c975c37a4137e9c861d20d9d40b6db16d" +
"1da8b17e360311b6a4ebcb3f1ff51d4906" +
"28b80de0dece08a1b5ebe8a5894ea2fea7" +
"40741e7c83c241a0d2bd9bdb3a2f3942ca" +
"e8ccc3bda7a17b40b00a0e214a5da76542" +
"11f5fc49b45d16b1e46fa80ce777969c51" +
"9f09bb45e312e4109b3af0c3133ffa221d" +
"a9e3c9e03fa2fdb70df03e6c83ee71f106" +
"b8f24fd72bad5e4e68123dda656ddba8ee" +
"11f9106154d1e1370bff3ba22e3c25b7d9" +
"334d903e4dd79a7389da41e9437e79ddd8" +
"a3335d2c217f01059bde2f3450f8933f38" +
"be10cd59467e9c9332c7794ccb9d19cb65" +
"a179b0166cd0e583e17f8f312222259ae3" +
"1b13e61fcae4da5c5554e2355218a0eb07" +
"19"
);
private final static int[] sSshRsaSignatureInt = {
0x00, 0x00, 0x00, 0x07,
0x73, 0x73, 0x68, 0x2d, 0x72, 0x73, 0x61,
0x00, 0x00, 0x01, 0x00,
0x1c, 0x97, 0x5c, 0x37, 0xa4, 0x13, 0x7e, 0x9c, 0x86, 0x1d, 0x20, 0xd9, 0xd4, 0x0b, 0x6d, 0xb1, 0x6d,
0x1d, 0xa8, 0xb1, 0x7e, 0x36, 0x03, 0x11, 0xb6, 0xa4, 0xeb, 0xcb, 0x3f, 0x1f, 0xf5, 0x1d, 0x49, 0x06,
0x28, 0xb8, 0x0d, 0xe0, 0xde, 0xce, 0x08, 0xa1, 0xb5, 0xeb, 0xe8, 0xa5, 0x89, 0x4e, 0xa2, 0xfe, 0xa7,
0x40, 0x74, 0x1e, 0x7c, 0x83, 0xc2, 0x41, 0xa0, 0xd2, 0xbd, 0x9b, 0xdb, 0x3a, 0x2f, 0x39, 0x42, 0xca,
0xe8, 0xcc, 0xc3, 0xbd, 0xa7, 0xa1, 0x7b, 0x40, 0xb0, 0x0a, 0x0e, 0x21, 0x4a, 0x5d, 0xa7, 0x65, 0x42,
0x11, 0xf5, 0xfc, 0x49, 0xb4, 0x5d, 0x16, 0xb1, 0xe4, 0x6f, 0xa8, 0x0c, 0xe7, 0x77, 0x96, 0x9c, 0x51,
0x9f, 0x09, 0xbb, 0x45, 0xe3, 0x12, 0xe4, 0x10, 0x9b, 0x3a, 0xf0, 0xc3, 0x13, 0x3f, 0xfa, 0x22, 0x1d,
0xa9, 0xe3, 0xc9, 0xe0, 0x3f, 0xa2, 0xfd, 0xb7, 0x0d, 0xf0, 0x3e, 0x6c, 0x83, 0xee, 0x71, 0xf1, 0x06,
0xb8, 0xf2, 0x4f, 0xd7, 0x2b, 0xad, 0x5e, 0x4e, 0x68, 0x12, 0x3d, 0xda, 0x65, 0x6d, 0xdb, 0xa8, 0xee,
0x11, 0xf9, 0x10, 0x61, 0x54, 0xd1, 0xe1, 0x37, 0x0b, 0xff, 0x3b, 0xa2, 0x2e, 0x3c, 0x25, 0xb7, 0xd9,
0x33, 0x4d, 0x90, 0x3e, 0x4d, 0xd7, 0x9a, 0x73, 0x89, 0xda, 0x41, 0xe9, 0x43, 0x7e, 0x79, 0xdd, 0xd8,
0xa3, 0x33, 0x5d, 0x2c, 0x21, 0x7f, 0x01, 0x05, 0x9b, 0xde, 0x2f, 0x34, 0x50, 0xf8, 0x93, 0x3f, 0x38,
0xbe, 0x10, 0xcd, 0x59, 0x46, 0x7e, 0x9c, 0x93, 0x32, 0xc7, 0x79, 0x4c, 0xcb, 0x9d, 0x19, 0xcb, 0x65,
0xa1, 0x79, 0xb0, 0x16, 0x6c, 0xd0, 0xe5, 0x83, 0xe1, 0x7f, 0x8f, 0x31, 0x22, 0x22, 0x25, 0x9a, 0xe3,
0x1b, 0x13, 0xe6, 0x1f, 0xca, 0xe4, 0xda, 0x5c, 0x55, 0x54, 0xe2, 0x35, 0x52, 0x18, 0xa0, 0xeb, 0x07,
0x19
};
private final static byte[] SSH_RSA_SIGNATURE = Hex.decode(
"00000007" +
"7373682d727361" +
"00000100" +
"1c975c37a4137e9c861d20d9d40b6db16d" +
"1da8b17e360311b6a4ebcb3f1ff51d4906" +
"28b80de0dece08a1b5ebe8a5894ea2fea7" +
"40741e7c83c241a0d2bd9bdb3a2f3942ca" +
"e8ccc3bda7a17b40b00a0e214a5da76542" +
"11f5fc49b45d16b1e46fa80ce777969c51" +
"9f09bb45e312e4109b3af0c3133ffa221d" +
"a9e3c9e03fa2fdb70df03e6c83ee71f106" +
"b8f24fd72bad5e4e68123dda656ddba8ee" +
"11f9106154d1e1370bff3ba22e3c25b7d9" +
"334d903e4dd79a7389da41e9437e79ddd8" +
"a3335d2c217f01059bde2f3450f8933f38" +
"be10cd59467e9c9332c7794ccb9d19cb65" +
"a179b0166cd0e583e17f8f312222259ae3" +
"1b13e61fcae4da5c5554e2355218a0eb07" +
"19"
);
private final static int[] sRawEdDsaSignatureInt = {
0x55, 0x49, 0x46, 0xe8, 0x27, 0xc6, 0xfd, 0x4b, 0x21, 0xb7, 0xa8, 0x1a, 0x97, 0x7a, 0x74, 0x53, 0x31,
0x0e, 0x18, 0xc0, 0x05, 0x40, 0x3b, 0xfa, 0x4d, 0xdd, 0x87, 0x15, 0x8b, 0x56, 0xb1, 0x40, 0xfd, 0x61,
0x0b, 0xf1, 0x5d, 0x7f, 0x38, 0xa3, 0x2b, 0x55, 0x71, 0x3f, 0xd3, 0x80, 0x87, 0xac, 0x86, 0x12, 0xdc,
0x14, 0x56, 0xce, 0xc3, 0x15, 0xe4, 0x64, 0x3b, 0x6d, 0x24, 0x89, 0x07, 0x0a
};
private final static byte[] RAW_EDDSA_SIGNATURE = Hex.decode(
"554946e827c6fd4b21b7a81a977a745331" +
"0e18c005403bfa4ddd87158b56b140fd61" +
"0bf15d7f38a32b55713fd38087ac8612dc" +
"1456cec315e4643b6d2489070a"
);
private final static int[] sSshEdDsaSignatureInt = {
0x00, 0x00, 0x00, 0x0b,
0x73, 0x73, 0x68, 0x2d, 0x65, 0x64, 0x32, 0x35, 0x35, 0x31, 0x39,
0x00, 0x00, 0x00, 0x40,
0x55, 0x49, 0x46, 0xe8, 0x27, 0xc6, 0xfd, 0x4b, 0x21, 0xb7, 0xa8, 0x1a, 0x97, 0x7a, 0x74, 0x53, 0x31,
0x0e, 0x18, 0xc0, 0x05, 0x40, 0x3b, 0xfa, 0x4d, 0xdd, 0x87, 0x15, 0x8b, 0x56, 0xb1, 0x40, 0xfd, 0x61,
0x0b, 0xf1, 0x5d, 0x7f, 0x38, 0xa3, 0x2b, 0x55, 0x71, 0x3f, 0xd3, 0x80, 0x87, 0xac, 0x86, 0x12, 0xdc,
0x14, 0x56, 0xce, 0xc3, 0x15, 0xe4, 0x64, 0x3b, 0x6d, 0x24, 0x89, 0x07, 0x0a
};
private final static byte[] SSH_EDDSA_SIGNATURE = Hex.decode(
"0000000b" +
"7373682d65643235353139" +
"00000040" +
"554946e827c6fd4b21b7a81a977a745331" +
"0e18c005403bfa4ddd87158b56b140fd61" +
"0bf15d7f38a32b55713fd38087ac8612dc" +
"1456cec315e4643b6d2489070a"
);
private final static int[] sRawDsaSignatureInt = {
0x30, 0x46,
0x02, 0x21,
0x00, 0xde, 0xfd, 0xb8, 0xa2, 0x5f, 0xb8, 0x66, 0x0a, 0x3c, 0xab, 0x24, 0x51, 0x0a, 0x20, 0x0a, 0x01,
0x3e, 0xb9, 0xc6, 0x77, 0xe4, 0xca, 0xed, 0x19, 0xa3, 0x49, 0xa9, 0xaf, 0x3b, 0x8c, 0x97, 0x1a,
0x02, 0x21,
0x00, 0xe7, 0xe4, 0xd5, 0xb8, 0xf0, 0x8a, 0xb5, 0xcb, 0x4d, 0x44, 0x5f, 0x03, 0xc4, 0x58, 0xcc, 0xce,
0x3d, 0xff, 0x26, 0xa2, 0x0f, 0xb3, 0x14, 0x50, 0x86, 0x04, 0xd1, 0xca, 0x3e, 0x2c, 0x91, 0x25
};
private final static byte[] RAW_DSA_SIGNATURE = Hex.decode(
"3046" +
"0221" +
"00defdb8a25fb8660a3cab24510a200a01" +
"3eb9c677e4caed19a349a9af3b8c971a" +
"0221" +
"00e7e4d5b8f08ab5cb4d445f03c458ccce" +
"3dff26a20fb314508604d1ca3e2c9125"
);
private final static int[] sSshDsaSignatureInt = {
0x00, 0x00, 0x00, 0x07,
0x73, 0x73, 0x68, 0x2d, 0x64, 0x73, 0x73,
0x00, 0x00, 0x00, 0x40,
0xde, 0xfd, 0xb8, 0xa2, 0x5f, 0xb8, 0x66, 0x0a, 0x3c, 0xab, 0x24, 0x51, 0x0a, 0x20, 0x0a, 0x01, 0x3e,
0xb9, 0xc6, 0x77, 0xe4, 0xca, 0xed, 0x19, 0xa3, 0x49, 0xa9, 0xaf, 0x3b, 0x8c, 0x97, 0x1a, 0xe7, 0xe4,
0xd5, 0xb8, 0xf0, 0x8a, 0xb5, 0xcb, 0x4d, 0x44, 0x5f, 0x03, 0xc4, 0x58, 0xcc, 0xce, 0x3d, 0xff, 0x26,
0xa2, 0x0f, 0xb3, 0x14, 0x50, 0x86, 0x04, 0xd1, 0xca, 0x3e, 0x2c, 0x91, 0x25
};
private final static byte[] SSH_DSA_SIGNATURE = Hex.decode(
"00000007" +
"7373682d647373" +
"00000040" +
"defdb8a25fb8660a3cab24510a200a013e" +
"b9c677e4caed19a349a9af3b8c971ae7e4" +
"d5b8f08ab5cb4d445f03c458ccce3dff26" +
"a20fb314508604d1ca3e2c9125"
);
@Test
public void testEcDsa() throws Exception {
byte[] rawEcDsaSignature = convertArray(sRawEcDsaSignatureInt);
byte[] sshEcDsaSignature = convertArray(sSshEcDsaSignatureInt);
byte[] out = SshSignatureConverter.getSshSignatureEcDsa(RAW_ECDSA_SIGNATURE, CURVE_OID_NIST_P_256);
byte[] out = SshSignatureConverter.getSshSignatureEcDsa(rawEcDsaSignature, sCurveOidNistP256);
Assert.assertArrayEquals("Signature blobs must be equal", sshEcDsaSignature, out);
Assert.assertArrayEquals(SSH_ECDSA_SIGNATURE, out);
}
@Test
public void testRsa() throws Exception {
byte[] rawRsaSignature = convertArray(sRawRsaSignatureInt);
byte[] sshRsaSignature = convertArray(sSshRsaSignatureInt);
byte[] out = SshSignatureConverter.getSshSignature(RAW_RSA_SIGNATURE, PublicKeyAlgorithmTags.RSA_SIGN);
byte[] out = SshSignatureConverter.getSshSignature(rawRsaSignature, PublicKeyAlgorithmTags.RSA_SIGN);
Assert.assertArrayEquals("Signature blobs must be equal", sshRsaSignature, out);
Assert.assertArrayEquals(SSH_RSA_SIGNATURE, out);
}
@Test
public void testEdDsa() throws Exception {
byte[] rawEdDsaSignature = convertArray(sRawEdDsaSignatureInt);
byte[] sshEdDsaSignature = convertArray(sSshEdDsaSignatureInt);
byte[] out = SshSignatureConverter.getSshSignature(RAW_EDDSA_SIGNATURE, PublicKeyAlgorithmTags.EDDSA);
byte[] out = SshSignatureConverter.getSshSignature(rawEdDsaSignature, PublicKeyAlgorithmTags.EDDSA);
Assert.assertArrayEquals("Signature blobs must be equal", sshEdDsaSignature, out);
Assert.assertArrayEquals(SSH_EDDSA_SIGNATURE, out);
}
@Test
public void testDsa() throws Exception {
byte[] rawDsaSignature = convertArray(sRawDsaSignatureInt);
byte[] sshDsaSignature = convertArray(sSshDsaSignatureInt);
byte[] out = SshSignatureConverter.getSshSignature(RAW_DSA_SIGNATURE, PublicKeyAlgorithmTags.DSA);
byte[] out = SshSignatureConverter.getSshSignature(rawDsaSignature, PublicKeyAlgorithmTags.DSA);
Assert.assertArrayEquals("Signature blobs must be equal", sshDsaSignature, out);
}
private byte[] convertArray(int[] array) {
byte[] out = new byte[array.length];
for (int i = 0; i < array.length; i++) {
out[i] = (byte) array[i];
}
return out;
Assert.assertArrayEquals(SSH_DSA_SIGNATURE, out);
}
}