PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2025-09-13 20:29:39 +02:00
Code Issues Releases Wiki Activity

Clean up BCUtils class

Browse source
This commit is contained in:
Paul Schaub 2021-05-29 12:43:31 +02:00
parent 13c7572c8c
commit 1a5baa0fa4
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
9 changed files with 137 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pgpainless-core/src/test/java/org/pgpainless/encryption_signing/EncryptDecryptTest.java
View file

@ -58,7 +58,6 @@ import org.pgpainless.key.protection.SecretKeyRingProtector;
import org.pgpainless.key.protection.UnprotectedKeysProtector;
import org.pgpainless.key.util.KeyRingUtils;
import org.pgpainless.util.ArmoredOutputStreamFactory;
import org.pgpainless.util.BCUtil;
public class EncryptDecryptTest {
@ -169,7 +168,7 @@ public class EncryptDecryptTest {
assertFalse(encryptionResult.getRecipients().isEmpty());
for (SubkeyIdentifier encryptionKey : encryptionResult.getRecipients()) {
assertTrue(BCUtil.keyRingContainsKeyWithId(recipientPub, encryptionKey.getKeyId()));
assertTrue(KeyRingUtils.keyRingContainsKeyWithId(recipientPub, encryptionKey.getKeyId()));
}
assertEquals(SymmetricKeyAlgorithm.AES_256, encryptionResult.getSymmetricKeyAlgorithm());
@ -179,8 +178,8 @@ public class EncryptDecryptTest {
ByteArrayInputStream envelopeIn = new ByteArrayInputStream(encryptedSecretMessage);
DecryptionStream decryptor = PGPainless.decryptAndOrVerify()
.onInputStream(envelopeIn)
.decryptWith(keyDecryptor, BCUtil.keyRingsToKeyRingCollection(recipientSec))
.verifyWith(BCUtil.keyRingsToKeyRingCollection(senderPub))
.decryptWith(keyDecryptor, KeyRingUtils.keyRingsToKeyRingCollection(recipientSec))
.verifyWith(KeyRingUtils.keyRingsToKeyRingCollection(senderPub))
.ignoreMissingPublicKeys()
.build();

5
pgpainless-core/src/test/java/org/pgpainless/signature/BindingSignatureSubpacketsTest.java
View file

@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test;
import org.pgpainless.PGPainless;
import org.pgpainless.exception.SignatureValidationException;
import org.pgpainless.policy.Policy;
import org.pgpainless.util.BCUtil;
/**
* Explores how subpackets on binding sigs are handled.
@ -1918,7 +1917,7 @@ public class BindingSignatureSubpacketsTest {
private void expectSignatureValidationSucceeds(String key, String message) throws IOException {
PGPPublicKeyRing publicKeys = PGPainless.readKeyRing().publicKeyRing(key);
PGPSignature signature = BCUtil.readSignatures(sig).get(0);
PGPSignature signature = SignatureUtils.readSignatures(sig).get(0);
try {
SignatureChainValidator.validateSignatureChain(signature, getSignedData(data), publicKeys, policy, validationDate);
@ -1932,7 +1931,7 @@ public class BindingSignatureSubpacketsTest {
private void expectSignatureValidationFails(String key, String message) throws IOException {
PGPPublicKeyRing publicKeys = PGPainless.readKeyRing().publicKeyRing(key);
PGPSignature signature = BCUtil.readSignatures(sig).get(0);
PGPSignature signature = SignatureUtils.readSignatures(sig).get(0);
assertThrows(SignatureValidationException.class, () ->
SignatureChainValidator.validateSignatureChain(

3
pgpainless-core/src/test/java/org/pgpainless/signature/IgnoreMarkerPackets.java
View file

@ -38,7 +38,6 @@ import org.pgpainless.decryption_verification.OpenPgpMetadata;
import org.pgpainless.key.OpenPgpV4Fingerprint;
import org.pgpainless.key.protection.SecretKeyRingProtector;
import org.pgpainless.key.util.KeyRingUtils;
import org.pgpainless.util.BCUtil;
/**
* Test if marker packets are being ignored properly.
@ -151,7 +150,7 @@ public class IgnoreMarkerPackets {
PGPSecretKeyRing secretKeys = PGPainless.readKeyRing().secretKeyRing(KEY);
PGPPublicKeyRing publicKeys = KeyRingUtils.publicKeyRingFrom(secretKeys);
String data = "Marker + Detached signature";
PGPSignature signature = BCUtil.readSignatures(sig).get(0);
PGPSignature signature = SignatureUtils.readSignatures(sig).get(0);
DecryptionStream decryptionStream = PGPainless.decryptAndOrVerify().onInputStream(new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8)))
.doNotDecrypt()

11
pgpainless-core/src/test/java/org/pgpainless/signature/KeyRevocationTest.java
View file

@ -27,7 +27,6 @@ import org.bouncycastle.openpgp.PGPSignature;
import org.junit.jupiter.api.Test;
import org.pgpainless.PGPainless;
import org.pgpainless.exception.SignatureValidationException;
import org.pgpainless.util.BCUtil;
public class KeyRevocationTest {
@ -154,10 +153,10 @@ public class KeyRevocationTest {
"-----END PGP ARMORED FILE-----\n";
PGPPublicKeyRing publicKeys = PGPainless.readKeyRing().publicKeyRing(key);
PGPSignature t0 = BCUtil.readSignatures(sigT0).get(0);
PGPSignature t1t2 = BCUtil.readSignatures(sigT1T2).get(0);
PGPSignature t2t3 = BCUtil.readSignatures(sigT2T3).get(0);
PGPSignature t3now = BCUtil.readSignatures(sigT3Now).get(0);
PGPSignature t0 = SignatureUtils.readSignatures(sigT0).get(0);
PGPSignature t1t2 = SignatureUtils.readSignatures(sigT1T2).get(0);
PGPSignature t2t3 = SignatureUtils.readSignatures(sigT2T3).get(0);
PGPSignature t3now = SignatureUtils.readSignatures(sigT3Now).get(0);
assertThrows(SignatureValidationException.class, () -> SignatureChainValidator.validateSignatureChain(t0,
new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8)),
@ -257,7 +256,7 @@ public class KeyRevocationTest {
"-----END PGP ARMORED FILE-----\n";
PGPPublicKeyRing publicKeys = PGPainless.readKeyRing().publicKeyRing(key);
PGPSignature signature = BCUtil.readSignatures(sig).get(0);
PGPSignature signature = SignatureUtils.readSignatures(sig).get(0);
SignatureChainValidator.validateSignatureChain(signature,
new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8)),

73
pgpainless-core/src/test/java/org/pgpainless/signature/SignatureChainValidatorTest.java
View file

@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test;
import org.pgpainless.PGPainless;
import org.pgpainless.exception.SignatureValidationException;
import org.pgpainless.policy.Policy;
import org.pgpainless.util.BCUtil;
public class SignatureChainValidatorTest {
@ -161,10 +160,10 @@ public class SignatureChainValidatorTest {
"-----END PGP ARMORED FILE-----\n";
PGPPublicKeyRing publicKeys = PGPainless.readKeyRing().publicKeyRing(key);
PGPSignature predatesPrimaryKey = BCUtil.readSignatures(sigPredatesPrimaryKey).get(0);
PGPSignature unboundSubkey = BCUtil.readSignatures(sigSubkeyNotBound).get(0);
PGPSignature primaryKeyRevoked = BCUtil.readSignatures(sigPrimaryKeyRevoked).get(0);
PGPSignature primaryKeyRevalidated = BCUtil.readSignatures(sigPrimaryKeyRevalidated).get(0);
PGPSignature predatesPrimaryKey = SignatureUtils.readSignatures(sigPredatesPrimaryKey).get(0);
PGPSignature unboundSubkey = SignatureUtils.readSignatures(sigSubkeyNotBound).get(0);
PGPSignature primaryKeyRevoked = SignatureUtils.readSignatures(sigPrimaryKeyRevoked).get(0);
PGPSignature primaryKeyRevalidated = SignatureUtils.readSignatures(sigPrimaryKeyRevalidated).get(0);
Policy policy = PGPainless.getPolicy();
Date validationDate = new Date();
@ -310,10 +309,10 @@ public class SignatureChainValidatorTest {
"-----END PGP ARMORED FILE-----\n";
PGPPublicKeyRing publicKeys = PGPainless.readKeyRing().publicKeyRing(key);
PGPSignature predatesPrimaryKey = BCUtil.readSignatures(sigPredatesPrimaryKey).get(0);
PGPSignature unboundSubkey = BCUtil.readSignatures(sigSigningKeyUnbound).get(0);
PGPSignature revokedSubkey = BCUtil.readSignatures(sigSubkeyRevoked).get(0);
PGPSignature revalidatedSubkey = BCUtil.readSignatures(sigSubkeyRevalidated).get(0);
PGPSignature predatesPrimaryKey = SignatureUtils.readSignatures(sigPredatesPrimaryKey).get(0);
PGPSignature unboundSubkey = SignatureUtils.readSignatures(sigSigningKeyUnbound).get(0);
PGPSignature revokedSubkey = SignatureUtils.readSignatures(sigSubkeyRevoked).get(0);
PGPSignature revalidatedSubkey = SignatureUtils.readSignatures(sigSubkeyRevalidated).get(0);
Policy policy = PGPainless.getPolicy();
Date validationDate = new Date();
@ -460,10 +459,10 @@ public class SignatureChainValidatorTest {
"=lkHs\n" +
"-----END PGP ARMORED FILE-----\n";
PGPSignature predatesPrimaryKey = BCUtil.readSignatures(sigPredatesPrimaryKey).get(0);
PGPSignature unboundKey = BCUtil.readSignatures(sigUnboundBeforeHardRevocation).get(0);
PGPSignature afterHardRevocation = BCUtil.readSignatures(sigAfterHardRevocation).get(0);
PGPSignature afterRevalidation = BCUtil.readSignatures(sigAfterRevalidation).get(0);
PGPSignature predatesPrimaryKey = SignatureUtils.readSignatures(sigPredatesPrimaryKey).get(0);
PGPSignature unboundKey = SignatureUtils.readSignatures(sigUnboundBeforeHardRevocation).get(0);
PGPSignature afterHardRevocation = SignatureUtils.readSignatures(sigAfterHardRevocation).get(0);
PGPSignature afterRevalidation = SignatureUtils.readSignatures(sigAfterRevalidation).get(0);
Policy policy = PGPainless.getPolicy();
Date validationDate = new Date();
@ -610,10 +609,10 @@ public class SignatureChainValidatorTest {
"-----END PGP ARMORED FILE-----\n";
PGPPublicKeyRing publicKeys = PGPainless.readKeyRing().publicKeyRing(keyWithSoftRev);
PGPSignature predatesPrimaryKey = BCUtil.readSignatures(sigPredatesPrimaryKey).get(0);
PGPSignature keyIsValid = BCUtil.readSignatures(sigKeyIsValid).get(0);
PGPSignature keyIsRevoked = BCUtil.readSignatures(sigKeyIsRevoked).get(0);
PGPSignature keyIsRevalidated = BCUtil.readSignatures(sigKeyIsRevalidated).get(0);
PGPSignature predatesPrimaryKey = SignatureUtils.readSignatures(sigPredatesPrimaryKey).get(0);
PGPSignature keyIsValid = SignatureUtils.readSignatures(sigKeyIsValid).get(0);
PGPSignature keyIsRevoked = SignatureUtils.readSignatures(sigKeyIsRevoked).get(0);
PGPSignature keyIsRevalidated = SignatureUtils.readSignatures(sigKeyIsRevalidated).get(0);
Policy policy = PGPainless.getPolicy();
String data = "Hello, World";
@ -765,10 +764,10 @@ public class SignatureChainValidatorTest {
"-----END PGP ARMORED FILE-----\n";
PGPPublicKeyRing publicKeys = PGPainless.readKeyRing().publicKeyRing(key);
PGPSignature predatesPrimaryKey = BCUtil.readSignatures(sigPredatesPrimaryKey).get(0);
PGPSignature keyNotBound = BCUtil.readSignatures(sigSubkeyNotBound).get(0);
PGPSignature keyRevoked = BCUtil.readSignatures(sigKeyRevoked).get(0);
PGPSignature valid = BCUtil.readSignatures(sigKeyValid).get(0);
PGPSignature predatesPrimaryKey = SignatureUtils.readSignatures(sigPredatesPrimaryKey).get(0);
PGPSignature keyNotBound = SignatureUtils.readSignatures(sigSubkeyNotBound).get(0);
PGPSignature keyRevoked = SignatureUtils.readSignatures(sigKeyRevoked).get(0);
PGPSignature valid = SignatureUtils.readSignatures(sigKeyValid).get(0);
Policy policy = PGPainless.getPolicy();
String data = "Hello, World";
@ -916,10 +915,10 @@ public class SignatureChainValidatorTest {
"-----END PGP ARMORED FILE-----\n";
PGPPublicKeyRing publicKeys = PGPainless.readKeyRing().publicKeyRing(key);
PGPSignature predatesPrimaryKey = BCUtil.readSignatures(sigPredatesPrimaryKey).get(0);
PGPSignature valid = BCUtil.readSignatures(sigValid).get(0);
PGPSignature revoked = BCUtil.readSignatures(sigRevoked).get(0);
PGPSignature revalidated = BCUtil.readSignatures(sigReLegitimized).get(0);
PGPSignature predatesPrimaryKey = SignatureUtils.readSignatures(sigPredatesPrimaryKey).get(0);
PGPSignature valid = SignatureUtils.readSignatures(sigValid).get(0);
PGPSignature revoked = SignatureUtils.readSignatures(sigRevoked).get(0);
PGPSignature revalidated = SignatureUtils.readSignatures(sigReLegitimized).get(0);
Policy policy = PGPainless.getPolicy();
Date validationDate = new Date();
@ -1246,18 +1245,18 @@ public class SignatureChainValidatorTest {
PGPPublicKeyRing keysB = PGPainless.readKeyRing().publicKeyRing(keyB);
PGPPublicKeyRing keysC = PGPainless.readKeyRing().publicKeyRing(keyC);
PGPSignature sigAT0 = BCUtil.readSignatures(keyASigT0).get(0);
PGPSignature sigAT1_T2 = BCUtil.readSignatures(keyASigT1_T2).get(0);
PGPSignature sigAT2_T3 = BCUtil.readSignatures(keyASigT2_T3).get(0);
PGPSignature sigAT3_now = BCUtil.readSignatures(keyASigT3_now).get(0);
PGPSignature sigBT0 = BCUtil.readSignatures(keyBSigT0).get(0);
PGPSignature sigBT1_T2 = BCUtil.readSignatures(keyBSigT1_T2).get(0);
PGPSignature sigBT2_T3 = BCUtil.readSignatures(keyBSigT2_T3).get(0);
PGPSignature sigBT3_now = BCUtil.readSignatures(keyBSigT3_now).get(0);
PGPSignature sigCT0 = BCUtil.readSignatures(keyCSigT0).get(0);
PGPSignature sigCT1_T2 = BCUtil.readSignatures(keyCSigT1_T2).get(0);
PGPSignature sigCT2_T3 = BCUtil.readSignatures(keyCSigT2_T3).get(0);
PGPSignature sigCT3_now = BCUtil.readSignatures(keyCSigT3_now).get(0);
PGPSignature sigAT0 = SignatureUtils.readSignatures(keyASigT0).get(0);
PGPSignature sigAT1_T2 = SignatureUtils.readSignatures(keyASigT1_T2).get(0);
PGPSignature sigAT2_T3 = SignatureUtils.readSignatures(keyASigT2_T3).get(0);
PGPSignature sigAT3_now = SignatureUtils.readSignatures(keyASigT3_now).get(0);
PGPSignature sigBT0 = SignatureUtils.readSignatures(keyBSigT0).get(0);
PGPSignature sigBT1_T2 = SignatureUtils.readSignatures(keyBSigT1_T2).get(0);
PGPSignature sigBT2_T3 = SignatureUtils.readSignatures(keyBSigT2_T3).get(0);
PGPSignature sigBT3_now = SignatureUtils.readSignatures(keyBSigT3_now).get(0);
PGPSignature sigCT0 = SignatureUtils.readSignatures(keyCSigT0).get(0);
PGPSignature sigCT1_T2 = SignatureUtils.readSignatures(keyCSigT1_T2).get(0);
PGPSignature sigCT2_T3 = SignatureUtils.readSignatures(keyCSigT2_T3).get(0);
PGPSignature sigCT3_now = SignatureUtils.readSignatures(keyCSigT3_now).get(0);
Policy policy = PGPainless.getPolicy();
Date validationDate = new Date();

18
pgpainless-core/src/test/java/org/pgpainless/util/BCUtilTest.java
View file

@ -36,8 +36,6 @@ import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
import org.junit.jupiter.api.Test;
import org.pgpainless.PGPainless;
import org.pgpainless.algorithm.KeyFlag;
import org.pgpainless.key.OpenPgpV4Fingerprint;
import org.pgpainless.key.TestKeys;
import org.pgpainless.key.generation.KeySpec;
import org.pgpainless.key.generation.type.KeyType;
import org.pgpainless.key.generation.type.rsa.RsaLength;
@ -83,7 +81,7 @@ public class BCUtilTest {
assertEquals(secSize, pubSize);
PGPSecretKeyRingCollection secCol = BCUtil.keyRingsToKeyRingCollection(sec);
PGPSecretKeyRingCollection secCol = KeyRingUtils.keyRingsToKeyRingCollection(sec);
int secColSize = 0;
Iterator<PGPSecretKeyRing> secColIt = secCol.getKeyRings();
@ -95,7 +93,7 @@ public class BCUtilTest {
LOGGER.log(Level.FINER, "SecCol: " + secColSize);
PGPPublicKeyRingCollection pubCol = BCUtil.keyRingsToKeyRingCollection(pub);
PGPPublicKeyRingCollection pubCol = KeyRingUtils.keyRingsToKeyRingCollection(pub);
int pubColSize = 0;
Iterator<PGPPublicKeyRing> pubColIt = pubCol.getKeyRings();
@ -132,17 +130,7 @@ public class BCUtilTest {
// Check, if alice_mallory contains mallory's key
assertNotNull(alice_mallory.getSecretKey(subKey.getKeyID()));
PGPSecretKeyRing cleaned = BCUtil.removeUnassociatedKeysFromKeyRing(alice_mallory, alice.getPublicKey());
PGPSecretKeyRing cleaned = KeyRingUtils.removeUnassociatedKeysFromKeyRing(alice_mallory, alice.getPublicKey());
assertNull(cleaned.getSecretKey(subKey.getKeyID()));
}
@Test
public void getMasterKeyFromRingTest() throws IOException, PGPException {
PGPSecretKeyRing secretKeys = TestKeys.getCryptieSecretKeyRing();
PGPPublicKey primaryKey = BCUtil.getMasterKeyFrom(secretKeys);
assertNotNull(primaryKey);
assertEquals(TestKeys.CRYPTIE_FINGERPRINT, new OpenPgpV4Fingerprint(primaryKey));
}
}