mirror of
https://github.com/pgpainless/pgpainless.git
synced 2025-09-13 04:09:38 +02:00
Remove unused Selection classes
This commit is contained in:
parent
e7f685e63b
commit
3c37072774
GPG key ID:
62BEE9264BF17311
15 changed files with 3 additions and 879 deletions
|
|
@ -45,10 +45,10 @@ import org.pgpainless.decryption_verification.OpenPgpMetadata;
|
|||
import org.pgpainless.exception.KeyValidationException;
|
||||
import org.pgpainless.implementation.ImplementationFactory;
|
||||
import org.pgpainless.key.TestKeys;
|
||||
import org.pgpainless.key.info.KeyRingInfo;
|
||||
import org.pgpainless.key.protection.SecretKeyRingProtector;
|
||||
import org.pgpainless.key.util.KeyRingUtils;
|
||||
import org.pgpainless.util.Passphrase;
|
||||
import org.pgpainless.util.selection.key.impl.SignatureKeySelectionStrategy;
|
||||
|
||||
public class SigningTest {
|
||||
|
||||
|
|
@ -61,9 +61,8 @@ public class SigningTest {
|
|||
PGPPublicKeyRing romeoKeys = TestKeys.getRomeoPublicKeyRing();
|
||||
|
||||
PGPSecretKeyRing cryptieKeys = TestKeys.getCryptieSecretKeyRing();
|
||||
PGPSecretKey cryptieSigningKey = new SignatureKeySelectionStrategy()
|
||||
.selectKeysFromKeyRing(cryptieKeys)
|
||||
.iterator().next();
|
||||
KeyRingInfo cryptieInfo = new KeyRingInfo(cryptieKeys);
|
||||
PGPSecretKey cryptieSigningKey = cryptieKeys.getSecretKey(cryptieInfo.getSigningSubkeys().get(0).getKeyID());
|
||||
|
||||
PGPPublicKeyRingCollection keys = new PGPPublicKeyRingCollection(Arrays.asList(julietKeys, romeoKeys));
|
||||
|
||||
|
|
|
|||
|
|
@ -16,8 +16,6 @@
|
|||
package org.pgpainless.util;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.security.InvalidAlgorithmParameterException;
|
||||
|
|
@ -30,7 +28,6 @@ import org.bouncycastle.openpgp.PGPException;
|
|||
import org.bouncycastle.openpgp.PGPPublicKey;
|
||||
import org.bouncycastle.openpgp.PGPPublicKeyRing;
|
||||
import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
|
||||
import org.bouncycastle.openpgp.PGPSecretKey;
|
||||
import org.bouncycastle.openpgp.PGPSecretKeyRing;
|
||||
import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
|
@ -105,32 +102,4 @@ public class BCUtilTest {
|
|||
|
||||
LOGGER.log(Level.FINER, "PubCol: " + pubColSize);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void removeUnsignedKeysTest()
|
||||
throws PGPException, NoSuchAlgorithmException, InvalidAlgorithmParameterException {
|
||||
@SuppressWarnings("deprecation")
|
||||
PGPSecretKeyRing alice = PGPainless.generateKeyRing().simpleRsaKeyRing("alice@wonderland.lit", RsaLength._1024);
|
||||
PGPSecretKeyRing mallory = PGPainless.generateKeyRing().simpleEcKeyRing("mallory@mall.ory");
|
||||
|
||||
PGPSecretKey subKey = null;
|
||||
Iterator<PGPSecretKey> sit = mallory.getSecretKeys();
|
||||
while (sit.hasNext()) {
|
||||
PGPSecretKey s = sit.next();
|
||||
if (!s.isMasterKey()) {
|
||||
subKey = s;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
assertNotNull(subKey);
|
||||
|
||||
PGPSecretKeyRing alice_mallory = PGPSecretKeyRing.insertSecretKey(alice, subKey);
|
||||
|
||||
// Check, if alice_mallory contains mallory's key
|
||||
assertNotNull(alice_mallory.getSecretKey(subKey.getKeyID()));
|
||||
|
||||
PGPSecretKeyRing cleaned = KeyRingUtils.removeUnassociatedKeysFromKeyRing(alice_mallory, alice.getPublicKey());
|
||||
assertNull(cleaned.getSecretKey(subKey.getKeyID()));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,62 +0,0 @@
|
|||
/*
|
||||
* Copyright 2021 Paul Schaub.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.pgpainless.util.selection.key;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Iterator;
|
||||
|
||||
import org.bouncycastle.openpgp.PGPException;
|
||||
import org.bouncycastle.openpgp.PGPPublicKey;
|
||||
import org.bouncycastle.openpgp.PGPSecretKey;
|
||||
import org.bouncycastle.openpgp.PGPSecretKeyRing;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.pgpainless.algorithm.KeyFlag;
|
||||
import org.pgpainless.key.TestKeys;
|
||||
import org.pgpainless.util.selection.key.impl.EncryptionKeySelectionStrategy;
|
||||
import org.pgpainless.util.selection.key.impl.HasAnyKeyFlagSelectionStrategy;
|
||||
import org.pgpainless.util.selection.key.impl.Or;
|
||||
|
||||
public class AndOrSelectionStrategyTest {
|
||||
|
||||
@Test
|
||||
public void testOr() throws IOException, PGPException {
|
||||
PGPSecretKeyRing ring = TestKeys.getEmilSecretKeyRing();
|
||||
Iterator<PGPSecretKey> secretKeys = ring.getSecretKeys();
|
||||
Or.SecKeySelectionStrategy secStrategy = new Or.SecKeySelectionStrategy(
|
||||
new HasAnyKeyFlagSelectionStrategy.SecretKey(KeyFlag.ENCRYPT_COMMS),
|
||||
new HasAnyKeyFlagSelectionStrategy.SecretKey(KeyFlag.ENCRYPT_STORAGE)
|
||||
);
|
||||
PGPSecretKey certSecKey = secretKeys.next();
|
||||
PGPSecretKey cryptSecKey = secretKeys.next();
|
||||
|
||||
assertFalse(secStrategy.accept(certSecKey));
|
||||
assertTrue(secStrategy.accept(cryptSecKey));
|
||||
|
||||
Iterator<PGPPublicKey> publicKeys = ring.getPublicKeys();
|
||||
Or.PubKeySelectionStrategy pubStrategy = new Or.PubKeySelectionStrategy(
|
||||
new EncryptionKeySelectionStrategy(KeyFlag.ENCRYPT_COMMS),
|
||||
new EncryptionKeySelectionStrategy(KeyFlag.ENCRYPT_STORAGE)
|
||||
);
|
||||
PGPPublicKey certPubKey = publicKeys.next();
|
||||
PGPPublicKey cryptPubKey = publicKeys.next();
|
||||
|
||||
assertFalse(pubStrategy.accept(certPubKey));
|
||||
assertTrue(pubStrategy.accept(cryptPubKey));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
/*
|
||||
* Copyright 2021 Paul Schaub.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.pgpainless.util.selection.key;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.security.InvalidAlgorithmParameterException;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.util.Iterator;
|
||||
|
||||
import org.bouncycastle.openpgp.PGPException;
|
||||
import org.bouncycastle.openpgp.PGPPublicKey;
|
||||
import org.bouncycastle.openpgp.PGPSecretKeyRing;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.pgpainless.PGPainless;
|
||||
import org.pgpainless.key.TestKeys;
|
||||
import org.pgpainless.util.selection.key.impl.KeyBelongsToKeyRing;
|
||||
|
||||
public class KeyBelongsToKeyRingTest {
|
||||
|
||||
@Test
|
||||
public void testStrategyOnlyAcceptsKeysThatBelongToKeyRing() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, PGPException, IOException {
|
||||
PGPSecretKeyRing secretKeys = PGPainless.generateKeyRing().simpleEcKeyRing("test@test.test");
|
||||
Iterator<PGPPublicKey> iterator = secretKeys.getPublicKeys();
|
||||
PGPPublicKey primaryKey = iterator.next();
|
||||
PGPPublicKey subKey = iterator.next();
|
||||
|
||||
KeyBelongsToKeyRing.PubkeySelectionStrategy strategy = new KeyBelongsToKeyRing.PubkeySelectionStrategy(primaryKey);
|
||||
assertTrue(strategy.accept(primaryKey));
|
||||
assertTrue(strategy.accept(subKey));
|
||||
|
||||
PGPSecretKeyRing unrelatedKeys = TestKeys.getEmilSecretKeyRing();
|
||||
Iterator<PGPPublicKey> unrelated = unrelatedKeys.getPublicKeys();
|
||||
while (unrelated.hasNext()) {
|
||||
PGPPublicKey unrelatedKey = unrelated.next();
|
||||
assertFalse(strategy.accept(unrelatedKey));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,169 +0,0 @@
|
|||
/*
|
||||
* Copyright 2021 Paul Schaub.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.pgpainless.util.selection.key;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
import java.security.InvalidAlgorithmParameterException;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.bouncycastle.openpgp.PGPException;
|
||||
import org.bouncycastle.openpgp.PGPPublicKey;
|
||||
import org.bouncycastle.openpgp.PGPPublicKeyRing;
|
||||
import org.bouncycastle.openpgp.PGPSecretKey;
|
||||
import org.bouncycastle.openpgp.PGPSecretKeyRing;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.pgpainless.PGPainless;
|
||||
import org.pgpainless.algorithm.KeyFlag;
|
||||
import org.pgpainless.key.generation.KeySpec;
|
||||
import org.pgpainless.key.generation.type.KeyType;
|
||||
import org.pgpainless.key.generation.type.ecc.EllipticCurve;
|
||||
import org.pgpainless.key.generation.type.eddsa.EdDSACurve;
|
||||
import org.pgpainless.key.generation.type.xdh.XDHSpec;
|
||||
import org.pgpainless.util.selection.key.impl.HasAllKeyFlagSelectionStrategy;
|
||||
import org.pgpainless.util.selection.key.impl.HasAnyKeyFlagSelectionStrategy;
|
||||
import org.pgpainless.key.util.KeyRingUtils;
|
||||
|
||||
public class KeyFlagBasedSelectionStrategyTest {
|
||||
|
||||
@Test
|
||||
public void testKeyFlagSelectors() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, PGPException {
|
||||
PGPSecretKeyRing secretKeys = PGPainless.generateKeyRing()
|
||||
.withSubKey(KeySpec.getBuilder(KeyType.ECDSA(EllipticCurve._P256))
|
||||
.withKeyFlags(KeyFlag.SIGN_DATA)
|
||||
.withDefaultAlgorithms())
|
||||
.withSubKey(KeySpec.getBuilder(KeyType.XDH(XDHSpec._X25519))
|
||||
.withKeyFlags(KeyFlag.ENCRYPT_COMMS)
|
||||
.withDefaultAlgorithms())
|
||||
.withPrimaryKey(KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519))
|
||||
.withKeyFlags(KeyFlag.CERTIFY_OTHER, KeyFlag.AUTHENTICATION)
|
||||
.withDefaultAlgorithms())
|
||||
.withPrimaryUserId("test@test.test")
|
||||
.withoutPassphrase().build();
|
||||
|
||||
Iterator<PGPSecretKey> iterator = secretKeys.iterator();
|
||||
// CERTIFY_OTHER and AUTHENTICATION
|
||||
PGPSecretKey s_primaryKey = iterator.next();
|
||||
// SIGN_DATA
|
||||
PGPSecretKey s_signingKey = iterator.next();
|
||||
// ENCRYPT_COMMS
|
||||
PGPSecretKey s_encryptionKey = iterator.next();
|
||||
|
||||
HasAllKeyFlagSelectionStrategy.SecretKey s_certifyOther =
|
||||
new HasAllKeyFlagSelectionStrategy.SecretKey(KeyFlag.CERTIFY_OTHER);
|
||||
HasAllKeyFlagSelectionStrategy.SecretKey s_encryptComms =
|
||||
new HasAllKeyFlagSelectionStrategy.SecretKey(KeyFlag.ENCRYPT_COMMS);
|
||||
HasAllKeyFlagSelectionStrategy.SecretKey s_encryptCommsEncryptStorage =
|
||||
new HasAllKeyFlagSelectionStrategy.SecretKey(KeyFlag.ENCRYPT_COMMS, KeyFlag.ENCRYPT_STORAGE);
|
||||
HasAnyKeyFlagSelectionStrategy.SecretKey s_anyEncryptCommsEncryptStorage =
|
||||
new HasAnyKeyFlagSelectionStrategy.SecretKey(KeyFlag.ENCRYPT_COMMS, KeyFlag.ENCRYPT_STORAGE);
|
||||
|
||||
assertTrue(s_certifyOther.accept(s_primaryKey));
|
||||
assertFalse(s_certifyOther.accept(s_encryptionKey));
|
||||
assertFalse(s_certifyOther.accept(s_signingKey));
|
||||
|
||||
assertTrue(s_encryptComms.accept(s_encryptionKey));
|
||||
assertFalse(s_encryptComms.accept(s_primaryKey));
|
||||
assertFalse(s_encryptComms.accept(s_signingKey));
|
||||
|
||||
assertFalse(s_encryptCommsEncryptStorage.accept(s_encryptionKey),
|
||||
"Must not accept the key, as it only carries ENCRYPT_COMMS, but not ENCRYPT_STORAGE");
|
||||
assertFalse(s_encryptCommsEncryptStorage.accept(s_primaryKey));
|
||||
assertFalse(s_encryptCommsEncryptStorage.accept(s_signingKey));
|
||||
|
||||
assertTrue(s_anyEncryptCommsEncryptStorage.accept(s_encryptionKey));
|
||||
assertFalse(s_anyEncryptCommsEncryptStorage.accept(s_primaryKey));
|
||||
assertFalse(s_anyEncryptCommsEncryptStorage.accept(s_signingKey));
|
||||
|
||||
PGPPublicKey p_primaryKey = s_primaryKey.getPublicKey();
|
||||
PGPPublicKey p_encryptionKey = s_encryptionKey.getPublicKey();
|
||||
PGPPublicKey p_signingKey = s_signingKey.getPublicKey();
|
||||
|
||||
HasAllKeyFlagSelectionStrategy.PublicKey p_certifyOther =
|
||||
new HasAllKeyFlagSelectionStrategy.PublicKey(KeyFlag.CERTIFY_OTHER);
|
||||
HasAllKeyFlagSelectionStrategy.PublicKey p_encryptComms =
|
||||
new HasAllKeyFlagSelectionStrategy.PublicKey(KeyFlag.ENCRYPT_COMMS);
|
||||
HasAllKeyFlagSelectionStrategy.PublicKey p_encryptCommsEncryptStorage =
|
||||
new HasAllKeyFlagSelectionStrategy.PublicKey(KeyFlag.ENCRYPT_COMMS, KeyFlag.ENCRYPT_STORAGE);
|
||||
HasAnyKeyFlagSelectionStrategy.PublicKey p_anyEncryptCommsEncryptStorage =
|
||||
new HasAnyKeyFlagSelectionStrategy.PublicKey(KeyFlag.ENCRYPT_COMMS, KeyFlag.ENCRYPT_STORAGE);
|
||||
|
||||
assertTrue(p_certifyOther.accept(p_primaryKey));
|
||||
assertFalse(p_certifyOther.accept(p_encryptionKey));
|
||||
assertFalse(p_certifyOther.accept(p_signingKey));
|
||||
|
||||
assertTrue(p_encryptComms.accept(p_encryptionKey));
|
||||
assertFalse(p_encryptComms.accept(p_primaryKey));
|
||||
assertFalse(p_encryptComms.accept(p_signingKey));
|
||||
|
||||
assertFalse(p_encryptCommsEncryptStorage.accept(p_encryptionKey),
|
||||
"Must not accept the key, as it only carries ENCRYPT_COMMS, but not ENCRYPT_STORAGE");
|
||||
assertFalse(p_encryptCommsEncryptStorage.accept(p_primaryKey));
|
||||
assertFalse(p_encryptCommsEncryptStorage.accept(p_signingKey));
|
||||
|
||||
assertTrue(p_anyEncryptCommsEncryptStorage.accept(p_encryptionKey));
|
||||
assertFalse(p_anyEncryptCommsEncryptStorage.accept(p_primaryKey));
|
||||
assertFalse(p_anyEncryptCommsEncryptStorage.accept(p_signingKey));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSelectKeysFromKeyRing() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, PGPException {
|
||||
PGPSecretKeyRing secretKeys = PGPainless.generateKeyRing()
|
||||
.withSubKey(KeySpec.getBuilder(KeyType.ECDSA(EllipticCurve._P256))
|
||||
.withKeyFlags(KeyFlag.SIGN_DATA)
|
||||
.withDefaultAlgorithms())
|
||||
.withSubKey(KeySpec.getBuilder(KeyType.XDH(XDHSpec._X25519))
|
||||
.withKeyFlags(KeyFlag.ENCRYPT_COMMS)
|
||||
.withDefaultAlgorithms())
|
||||
.withPrimaryKey(KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519))
|
||||
.withKeyFlags(KeyFlag.CERTIFY_OTHER, KeyFlag.SIGN_DATA, KeyFlag.AUTHENTICATION)
|
||||
.withDefaultAlgorithms())
|
||||
.withPrimaryUserId("test@test.test")
|
||||
.withoutPassphrase().build();
|
||||
|
||||
HasAnyKeyFlagSelectionStrategy.SecretKey secSelection =
|
||||
new HasAnyKeyFlagSelectionStrategy.SecretKey(KeyFlag.SIGN_DATA);
|
||||
|
||||
Set<PGPSecretKey> secSigningKeys = secSelection.selectKeysFromKeyRing(secretKeys);
|
||||
assertEquals(2, secSigningKeys.size());
|
||||
|
||||
PGPPublicKeyRing publicKeys = KeyRingUtils.publicKeyRingFrom(secretKeys);
|
||||
|
||||
HasAnyKeyFlagSelectionStrategy.PublicKey pubSelection =
|
||||
new HasAnyKeyFlagSelectionStrategy.PublicKey(KeyFlag.SIGN_DATA);
|
||||
|
||||
Set<PGPPublicKey> pubSigningKeys = pubSelection.selectKeysFromKeyRing(publicKeys);
|
||||
assertEquals(2, pubSigningKeys.size());
|
||||
|
||||
List<Long> ids = new ArrayList<>();
|
||||
for (PGPSecretKey secretKey : secSigningKeys) {
|
||||
ids.add(secretKey.getKeyID());
|
||||
}
|
||||
|
||||
for (PGPPublicKey publicKey : pubSigningKeys) {
|
||||
assertTrue(ids.contains(publicKey.getKeyID()));
|
||||
}
|
||||
|
||||
secSelection = new HasAnyKeyFlagSelectionStrategy.SecretKey(KeyFlag.ENCRYPT_STORAGE);
|
||||
assertTrue(secSelection.selectKeysFromKeyRing(secretKeys).isEmpty());
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue