cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add test for cv25519 encryption

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-02-14 02:33:23 +01:00
parent cb58f75f68
commit 9a9c4408ce
1 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/Cv25519Test.java
View File

@@ -22,6 +22,7 @@ import java.io.ByteArrayOutputStream;
import java.io.InputStream; import java.io.InputStream;
import android.app.Application; import android.app.Application;
import android.support.annotation.NonNull;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
@@ -33,9 +34,13 @@ import org.robolectric.shadows.ShadowLog;
import org.robolectric.util.Util; import org.robolectric.util.Util;
import org.sufficientlysecure.keychain.KeychainTestRunner; import org.sufficientlysecure.keychain.KeychainTestRunner;
import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult; import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
import org.sufficientlysecure.keychain.operations.results.PgpSignEncryptResult;
import org.sufficientlysecure.keychain.operations.results.SaveKeyringResult; import org.sufficientlysecure.keychain.operations.results.SaveKeyringResult;
import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyInputParcel; import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyInputParcel;
import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyOperation; import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyOperation;
import org.sufficientlysecure.keychain.pgp.PgpSignEncryptData;
import org.sufficientlysecure.keychain.pgp.PgpSignEncryptInputParcel;
import org.sufficientlysecure.keychain.pgp.PgpSignEncryptOperation;
import org.sufficientlysecure.keychain.pgp.UncachedKeyRing; import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel; import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
@@ -48,7 +53,7 @@ import static org.junit.Assert.assertArrayEquals;
@SuppressWarnings("WeakerAccess") @SuppressWarnings("WeakerAccess")
@RunWith(KeychainTestRunner.class) @RunWith(KeychainTestRunner.class)
public class Cv25519Test { public class Cv25519Test {
public static final String ENCRYPTED_PLAINTEXT = "hi\n"; public static final byte[] ENCRYPTED_PLAINTEXT = "hi\n".getBytes();
private KeyWritableRepository keyRepository; private KeyWritableRepository keyRepository;
private Application context; private Application context;
@@ -70,15 +75,30 @@ public class Cv25519Test {
loadSecretKeyringFromResource("/test-keys/cv25519-key.sec.asc"); loadSecretKeyringFromResource("/test-keys/cv25519-key.sec.asc");
byte[] encryptedText = readBytesFromResource("/test-keys/cv25519-encrypted.asc"); byte[] encryptedText = readBytesFromResource("/test-keys/cv25519-encrypted.asc");
PgpDecryptVerifyInputParcel pgpDecryptVerifyInputParcel = DecryptVerifyResult result = simpleDecryptText(encryptedText);
PgpDecryptVerifyInputParcel.builder().setInputBytes(encryptedText).build();
PgpDecryptVerifyOperation decryptVerifyOperation = new PgpDecryptVerifyOperation(context, keyRepository, null); assertArrayEquals(ENCRYPTED_PLAINTEXT, result.getOutputBytes());
DecryptVerifyResult result = decryptVerifyOperation.execute(pgpDecryptVerifyInputParcel, CryptoInputParcel.createCryptoInputParcel()); }
@Test
public void testEncryptX25519() throws Exception {
UncachedKeyRing uncachedKeyRing = loadSecretKeyringFromResource("/test-keys/cv25519-key.sec.asc");
PgpSignEncryptData data = PgpSignEncryptData.builder()
.setEncryptionMasterKeyIds(new long[] { uncachedKeyRing.getMasterKeyId() })
.build();
PgpSignEncryptInputParcel inputParcel = PgpSignEncryptInputParcel.createForBytes(
data, null, ENCRYPTED_PLAINTEXT);
PgpSignEncryptOperation op = new PgpSignEncryptOperation(context, keyRepository, null);
PgpSignEncryptResult result = op.execute(inputParcel, CryptoInputParcel.createCryptoInputParcel());
assertTrue(result.success()); assertTrue(result.success());
assertEquals(OpenPgpSignatureResult.RESULT_NO_SIGNATURE, result.getSignatureResult().getResult());
assertArrayEquals(ENCRYPTED_PLAINTEXT.getBytes(), result.getOutputBytes()); DecryptVerifyResult decryptResult = simpleDecryptText(result.getOutputBytes());
assertTrue(decryptResult.success());
assertArrayEquals(ENCRYPTED_PLAINTEXT, decryptResult.getOutputBytes());
} }
private UncachedKeyRing loadSecretKeyringFromResource(String name) throws Exception { private UncachedKeyRing loadSecretKeyringFromResource(String name) throws Exception {
@@ -89,6 +109,19 @@ public class Cv25519Test {
return ring; return ring;
} }
@NonNull
private DecryptVerifyResult simpleDecryptText(byte[] encryptedText) {
PgpDecryptVerifyInputParcel pgpDecryptVerifyInputParcel =
PgpDecryptVerifyInputParcel.builder().setInputBytes(encryptedText).build();
PgpDecryptVerifyOperation decryptVerifyOperation = new PgpDecryptVerifyOperation(context, keyRepository, null);
DecryptVerifyResult result = decryptVerifyOperation.execute(pgpDecryptVerifyInputParcel, CryptoInputParcel.createCryptoInputParcel());
assertTrue(result.success());
assertEquals(OpenPgpSignatureResult.RESULT_NO_SIGNATURE, result.getSignatureResult().getResult());
return result;
}
private byte[] readBytesFromResource(String name) throws Exception { private byte[] readBytesFromResource(String name) throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
InputStream input = Cv25519Test.class.getResourceAsStream(name); InputStream input = Cv25519Test.class.getResourceAsStream(name);