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

improve tests, get rid of some redundant checks

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-10-08 19:55:28 +02:00
parent 81a462c2ac
commit 3bf653775b
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java
View File

@@ -502,11 +502,6 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp
log.add(LogType.MSG_DC_ASKIP_NO_KEY, indent + 1); log.add(LogType.MSG_DC_ASKIP_NO_KEY, indent + 1);
continue; continue;
} }
if (secretKeyRing == null) {
// continue with the next packet in the while loop
log.add(LogType.MSG_DC_ASKIP_NO_KEY, indent + 1);
continue;
}
// allow only specific keys for decryption? // allow only specific keys for decryption?
if (input.getAllowedKeyIds() != null) { if (input.getAllowedKeyIds() != null) {
@@ -526,11 +521,6 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp
// get subkey which has been used for this encryption packet // get subkey which has been used for this encryption packet
secretEncryptionKey = secretKeyRing.getSecretKey(subKeyId); secretEncryptionKey = secretKeyRing.getSecretKey(subKeyId);
if (secretEncryptionKey == null) {
// should actually never happen, so no need to be more specific.
log.add(LogType.MSG_DC_ASKIP_NO_KEY, indent + 1);
continue;
}
/* secret key exists in database and is allowed! */ /* secret key exists in database and is allowed! */
asymmetricPacketFound = true; asymmetricPacketFound = true;

11
OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java
View File

@@ -344,7 +344,7 @@ public class PgpEncryptDecryptTest {
@Test @Test
public void testAsymmetricSignCleartext() { public void testAsymmetricSignCleartext() {
String plaintext = "dies ist ein plaintext ☭" + TestingUtils.genPassphrase(true); String plaintext = "dies ist ein\r\nplaintext\n ☭" + TestingUtils.genPassphrase(true);
byte[] ciphertext; byte[] ciphertext;
{ // encrypt data with key { // encrypt data with key
@@ -370,7 +370,8 @@ public class PgpEncryptDecryptTest {
ciphertext = out.toByteArray(); ciphertext = out.toByteArray();
} }
Assert.assertTrue("clearsigned text must contain plaintext", new String(ciphertext).contains(plaintext)); Assert.assertTrue("clearsigned text must contain plaintext (ignoring newlines)",
new String(ciphertext).replace("\r\n", "").contains(plaintext.replace("\r", "").replace("\n", "")));
{ // verification should succeed { // verification should succeed
@@ -383,8 +384,10 @@ public class PgpEncryptDecryptTest {
DecryptVerifyResult result = op.execute(input, new CryptoInputParcel(), data, out); DecryptVerifyResult result = op.execute(input, new CryptoInputParcel(), data, out);
Assert.assertTrue("verification must succeed", result.success()); Assert.assertTrue("verification must succeed", result.success());
Assert.assertArrayEquals("verification text should equal plaintext (save for a newline)",
(plaintext + StringUtils.LINE_SEP).getBytes(), out.toByteArray()); Assert.assertTrue("verification text should equal plaintext (ignoring newlines)",
new String(out.toByteArray()).replace(StringUtils.LINE_SEP, "")
.equals(plaintext.replace("\r", "").replace("\n", "")));
Assert.assertEquals("decryptionResult should be RESULT_NOT_ENCRYPTED", Assert.assertEquals("decryptionResult should be RESULT_NOT_ENCRYPTED",
OpenPgpDecryptionResult.RESULT_NOT_ENCRYPTED, result.getDecryptionResult().getResult()); OpenPgpDecryptionResult.RESULT_NOT_ENCRYPTED, result.getDecryptionResult().getResult());
Assert.assertEquals("signatureResult should be RESULT_VALID_CONFIRMED", Assert.assertEquals("signatureResult should be RESULT_VALID_CONFIRMED",