diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/generation/KeyRingBuilder.java b/pgpainless-core/src/main/java/org/pgpainless/key/generation/KeyRingBuilder.java index a4d4f799..463483a1 100644 --- a/pgpainless-core/src/main/java/org/pgpainless/key/generation/KeyRingBuilder.java +++ b/pgpainless-core/src/main/java/org/pgpainless/key/generation/KeyRingBuilder.java @@ -123,7 +123,7 @@ public class KeyRingBuilder implements KeyRingBuilderInterface { public PGPSecretKeyRing simpleRsaKeyRing(@Nonnull String userId, @Nonnull RsaLength length, String password) throws PGPException, NoSuchAlgorithmException, InvalidAlgorithmParameterException { WithAdditionalUserIdOrPassphrase builder = this - .withMasterKey( + .withPrimaryKey( KeySpec.getBuilder(KeyType.RSA(length)) .withKeyFlags(KeyFlag.CERTIFY_OTHER, KeyFlag.SIGN_DATA, KeyFlag.ENCRYPT_COMMS) .withDefaultAlgorithms()) @@ -196,7 +196,7 @@ public class KeyRingBuilder implements KeyRingBuilderInterface { KeySpec.getBuilder(KeyType.XDH(XDHCurve._X25519)) .withKeyFlags(KeyFlag.ENCRYPT_STORAGE, KeyFlag.ENCRYPT_COMMS) .withDefaultAlgorithms()) - .withMasterKey( + .withPrimaryKey( KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) .withKeyFlags(KeyFlag.CERTIFY_OTHER, KeyFlag.SIGN_DATA) .withDefaultAlgorithms()) @@ -228,7 +228,7 @@ public class KeyRingBuilder implements KeyRingBuilderInterface { KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) .withKeyFlags(KeyFlag.SIGN_DATA) .withDefaultAlgorithms()) - .withMasterKey( + .withPrimaryKey( KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) .withKeyFlags(KeyFlag.CERTIFY_OTHER) .withDefaultAlgorithms()) @@ -248,7 +248,7 @@ public class KeyRingBuilder implements KeyRingBuilderInterface { } @Override - public WithPrimaryUserId withMasterKey(@Nonnull KeySpec spec) { + public WithPrimaryUserId withPrimaryKey(@Nonnull KeySpec spec) { verifyMasterKeyCanCertify(spec); KeyRingBuilder.this.keySpecs.add(0, spec); diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/generation/KeyRingBuilderInterface.java b/pgpainless-core/src/main/java/org/pgpainless/key/generation/KeyRingBuilderInterface.java index d97fd997..f4f2ff29 100644 --- a/pgpainless-core/src/main/java/org/pgpainless/key/generation/KeyRingBuilderInterface.java +++ b/pgpainless-core/src/main/java/org/pgpainless/key/generation/KeyRingBuilderInterface.java @@ -28,7 +28,19 @@ public interface KeyRingBuilderInterface { KeyRingBuilderInterface withSubKey(@Nonnull KeySpec keySpec); - WithPrimaryUserId withMasterKey(@Nonnull KeySpec keySpec); + /** + * Define the primary key spec. + * + * @deprecated use {@link #withPrimaryKey(KeySpec)} instead. + * @param keySpec key spec + * @return builder step + */ + @Deprecated + default WithPrimaryUserId withMasterKey(@Nonnull KeySpec keySpec) { + return withPrimaryKey(keySpec); + } + + WithPrimaryUserId withPrimaryKey(@Nonnull KeySpec keySpec); interface WithPrimaryUserId { diff --git a/pgpainless-core/src/test/java/org/pgpainless/encryption_signing/EncryptDecryptTest.java b/pgpainless-core/src/test/java/org/pgpainless/encryption_signing/EncryptDecryptTest.java index a06022ed..dcb25efb 100644 --- a/pgpainless-core/src/test/java/org/pgpainless/encryption_signing/EncryptDecryptTest.java +++ b/pgpainless-core/src/test/java/org/pgpainless/encryption_signing/EncryptDecryptTest.java @@ -74,7 +74,7 @@ public class EncryptDecryptTest { PGPSecretKeyRing sender = PGPainless.generateKeyRing().simpleRsaKeyRing("romeo@montague.lit", RsaLength._3072); PGPSecretKeyRing recipient = PGPainless.generateKeyRing() .withSubKey(KeySpec.getBuilder(ElGamal.withLength(ElGamalLength._3072)).withKeyFlags(KeyFlag.ENCRYPT_STORAGE, KeyFlag.ENCRYPT_COMMS).withDefaultAlgorithms()) - .withMasterKey(KeySpec.getBuilder(KeyType.RSA(RsaLength._4096)).withKeyFlags(KeyFlag.SIGN_DATA, KeyFlag.CERTIFY_OTHER).withDefaultAlgorithms()) + .withPrimaryKey(KeySpec.getBuilder(KeyType.RSA(RsaLength._4096)).withKeyFlags(KeyFlag.SIGN_DATA, KeyFlag.CERTIFY_OTHER).withDefaultAlgorithms()) .withPrimaryUserId("juliet@capulet.lit").withoutPassphrase().build(); encryptDecryptForSecretKeyRings(sender, recipient); diff --git a/pgpainless-core/src/test/java/org/pgpainless/key/generation/BrainpoolKeyGeneration.java b/pgpainless-core/src/test/java/org/pgpainless/key/generation/BrainpoolKeyGeneration.java index f3f61fb9..106298f4 100644 --- a/pgpainless-core/src/test/java/org/pgpainless/key/generation/BrainpoolKeyGeneration.java +++ b/pgpainless-core/src/test/java/org/pgpainless/key/generation/BrainpoolKeyGeneration.java @@ -55,7 +55,7 @@ public class BrainpoolKeyGeneration { public PGPSecretKeyRing generateKey(KeySpec primaryKey, KeySpec subKey, String userId) throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, PGPException { PGPSecretKeyRing secretKeys = PGPainless.generateKeyRing() .withSubKey(subKey) - .withMasterKey(primaryKey) + .withPrimaryKey(primaryKey) .withPrimaryUserId(userId) .withoutPassphrase() .build(); diff --git a/pgpainless-core/src/test/java/org/pgpainless/key/generation/CertificationKeyMustBeAbleToCertifyTest.java b/pgpainless-core/src/test/java/org/pgpainless/key/generation/CertificationKeyMustBeAbleToCertifyTest.java index 960ae754..15752d6e 100644 --- a/pgpainless-core/src/test/java/org/pgpainless/key/generation/CertificationKeyMustBeAbleToCertifyTest.java +++ b/pgpainless-core/src/test/java/org/pgpainless/key/generation/CertificationKeyMustBeAbleToCertifyTest.java @@ -42,7 +42,7 @@ public class CertificationKeyMustBeAbleToCertifyTest { for (KeyType type : typesIncapableOfCreatingVerifications) { assertThrows(IllegalArgumentException.class, () -> PGPainless .generateKeyRing() - .withMasterKey(KeySpec + .withPrimaryKey(KeySpec .getBuilder(type) .withKeyFlags(KeyFlag.CERTIFY_OTHER, KeyFlag.SIGN_DATA) .withDefaultAlgorithms()) diff --git a/pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateEllipticCurveKeyTest.java b/pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateEllipticCurveKeyTest.java index cae2bd0a..dcee18e9 100644 --- a/pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateEllipticCurveKeyTest.java +++ b/pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateEllipticCurveKeyTest.java @@ -38,7 +38,7 @@ public class GenerateEllipticCurveKeyTest { .withSubKey(KeySpec.getBuilder(KeyType.XDH(XDHCurve._X25519)) .withKeyFlags(KeyFlag.ENCRYPT_COMMS) .withDefaultAlgorithms()) - .withMasterKey(KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) + .withPrimaryKey(KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) .withKeyFlags(KeyFlag.CERTIFY_OTHER, KeyFlag.SIGN_DATA) .withDefaultAlgorithms()) .withPrimaryUserId(UserId.onlyEmail("alice@wonderland.lit").toString()) diff --git a/pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateKeyWithAdditionalUserIdTest.java b/pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateKeyWithAdditionalUserIdTest.java index e2588231..0ced3b71 100644 --- a/pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateKeyWithAdditionalUserIdTest.java +++ b/pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateKeyWithAdditionalUserIdTest.java @@ -40,7 +40,7 @@ public class GenerateKeyWithAdditionalUserIdTest { @Test public void test() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, PGPException, IOException { PGPSecretKeyRing secretKeys = PGPainless.generateKeyRing() - .withMasterKey(KeySpec.getBuilder(KeyType.RSA(RsaLength._3072)) + .withPrimaryKey(KeySpec.getBuilder(KeyType.RSA(RsaLength._3072)) .withKeyFlags(KeyFlag.CERTIFY_OTHER, KeyFlag.SIGN_DATA, KeyFlag.ENCRYPT_COMMS) .withDefaultAlgorithms()) .withPrimaryUserId("primary@user.id") diff --git a/pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateWithEmptyPassphrase.java b/pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateWithEmptyPassphrase.java index 56345c5a..3c829eeb 100644 --- a/pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateWithEmptyPassphrase.java +++ b/pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateWithEmptyPassphrase.java @@ -41,7 +41,7 @@ public class GenerateWithEmptyPassphrase { @Test public void testGeneratingKeyWithEmptyPassphraseDoesNotThrow() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, PGPException, IOException { assertNotNull(PGPainless.generateKeyRing() - .withMasterKey(KeySpec.getBuilder(KeyType.RSA(RsaLength._3072)) + .withPrimaryKey(KeySpec.getBuilder(KeyType.RSA(RsaLength._3072)) .withKeyFlags(KeyFlag.CERTIFY_OTHER, KeyFlag.SIGN_DATA, KeyFlag.ENCRYPT_COMMS) .withDefaultAlgorithms()) .withPrimaryUserId("primary@user.id") diff --git a/pgpainless-core/src/test/java/org/pgpainless/key/generation/IllegalKeyFlagsTest.java b/pgpainless-core/src/test/java/org/pgpainless/key/generation/IllegalKeyFlagsTest.java index 852d6068..8d043755 100644 --- a/pgpainless-core/src/test/java/org/pgpainless/key/generation/IllegalKeyFlagsTest.java +++ b/pgpainless-core/src/test/java/org/pgpainless/key/generation/IllegalKeyFlagsTest.java @@ -29,27 +29,27 @@ public class IllegalKeyFlagsTest { @Test public void testKeyCannotCarryFlagsTest() { assertThrows(IllegalArgumentException.class, () -> PGPainless.generateKeyRing() - .withMasterKey(KeySpec.getBuilder(KeyType.XDH(XDHCurve._X25519)) + .withPrimaryKey(KeySpec.getBuilder(KeyType.XDH(XDHCurve._X25519)) .withKeyFlags(KeyFlag.SIGN_DATA) // <- should throw .withDefaultAlgorithms())); assertThrows(IllegalArgumentException.class, () -> PGPainless.generateKeyRing() - .withMasterKey(KeySpec.getBuilder(KeyType.XDH(XDHCurve._X25519)) + .withPrimaryKey(KeySpec.getBuilder(KeyType.XDH(XDHCurve._X25519)) .withKeyFlags(KeyFlag.CERTIFY_OTHER) // <- should throw .withDefaultAlgorithms())); assertThrows(IllegalArgumentException.class, () -> PGPainless.generateKeyRing() - .withMasterKey(KeySpec.getBuilder(KeyType.XDH(XDHCurve._X25519)) + .withPrimaryKey(KeySpec.getBuilder(KeyType.XDH(XDHCurve._X25519)) .withKeyFlags(KeyFlag.AUTHENTICATION) // <- should throw .withDefaultAlgorithms())); assertThrows(IllegalArgumentException.class, () -> PGPainless.generateKeyRing() - .withMasterKey(KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) + .withPrimaryKey(KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) .withKeyFlags(KeyFlag.ENCRYPT_COMMS) // <- should throw .withDefaultAlgorithms())); assertThrows(IllegalArgumentException.class, () -> PGPainless.generateKeyRing() - .withMasterKey(KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) + .withPrimaryKey(KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) .withKeyFlags(KeyFlag.ENCRYPT_STORAGE) // <- should throw as well .withDefaultAlgorithms())); } diff --git a/pgpainless-core/src/test/java/org/pgpainless/key/info/UserIdRevocationTest.java b/pgpainless-core/src/test/java/org/pgpainless/key/info/UserIdRevocationTest.java index f758955b..7df59ec4 100644 --- a/pgpainless-core/src/test/java/org/pgpainless/key/info/UserIdRevocationTest.java +++ b/pgpainless-core/src/test/java/org/pgpainless/key/info/UserIdRevocationTest.java @@ -55,7 +55,7 @@ public class UserIdRevocationTest { .withSubKey(KeySpec.getBuilder(KeyType.XDH(XDHCurve._X25519)) .withKeyFlags(KeyFlag.ENCRYPT_COMMS) .withDefaultAlgorithms()) - .withMasterKey(KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) + .withPrimaryKey(KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) .withKeyFlags(KeyFlag.SIGN_DATA, KeyFlag.CERTIFY_OTHER) .withDefaultAlgorithms()) .withPrimaryUserId("primary@key.id") @@ -97,7 +97,7 @@ public class UserIdRevocationTest { .withSubKey(KeySpec.getBuilder(KeyType.XDH(XDHCurve._X25519)) .withKeyFlags(KeyFlag.ENCRYPT_COMMS) .withDefaultAlgorithms()) - .withMasterKey(KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) + .withPrimaryKey(KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) .withKeyFlags(KeyFlag.SIGN_DATA, KeyFlag.CERTIFY_OTHER) .withDefaultAlgorithms()) .withPrimaryUserId("primary@key.id") diff --git a/pgpainless-core/src/test/java/org/pgpainless/util/BCUtilTest.java b/pgpainless-core/src/test/java/org/pgpainless/util/BCUtilTest.java index 453e7e56..7553a36e 100644 --- a/pgpainless-core/src/test/java/org/pgpainless/util/BCUtilTest.java +++ b/pgpainless-core/src/test/java/org/pgpainless/util/BCUtilTest.java @@ -55,7 +55,7 @@ public class BCUtilTest { .withSubKey(KeySpec.getBuilder(KeyType.RSA(RsaLength._3072)) .withKeyFlags(KeyFlag.ENCRYPT_COMMS) .withDefaultAlgorithms()) - .withMasterKey(KeySpec.getBuilder(KeyType.RSA(RsaLength._3072)) + .withPrimaryKey(KeySpec.getBuilder(KeyType.RSA(RsaLength._3072)) .withKeyFlags(KeyFlag.CERTIFY_OTHER, KeyFlag.SIGN_DATA) .withDefaultAlgorithms()) .withPrimaryUserId("donald@duck.tails").withoutPassphrase().build(); diff --git a/pgpainless-core/src/test/java/org/pgpainless/util/GuessPreferredHashAlgorithmTest.java b/pgpainless-core/src/test/java/org/pgpainless/util/GuessPreferredHashAlgorithmTest.java index 2ec90228..68320c14 100644 --- a/pgpainless-core/src/test/java/org/pgpainless/util/GuessPreferredHashAlgorithmTest.java +++ b/pgpainless-core/src/test/java/org/pgpainless/util/GuessPreferredHashAlgorithmTest.java @@ -41,7 +41,7 @@ public class GuessPreferredHashAlgorithmTest { @Test public void test() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, PGPException, IOException { PGPSecretKeyRing secretKeys = PGPainless.generateKeyRing() - .withMasterKey(KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) + .withPrimaryKey(KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) .withKeyFlags(KeyFlag.CERTIFY_OTHER, KeyFlag.SIGN_DATA) .withDetailedConfiguration() // Do not specify preferred algorithms diff --git a/pgpainless-core/src/test/java/org/pgpainless/util/selection/key/KeyFlagBasedSelectionStrategyTest.java b/pgpainless-core/src/test/java/org/pgpainless/util/selection/key/KeyFlagBasedSelectionStrategyTest.java index 109a1460..c22add8a 100644 --- a/pgpainless-core/src/test/java/org/pgpainless/util/selection/key/KeyFlagBasedSelectionStrategyTest.java +++ b/pgpainless-core/src/test/java/org/pgpainless/util/selection/key/KeyFlagBasedSelectionStrategyTest.java @@ -54,7 +54,7 @@ public class KeyFlagBasedSelectionStrategyTest { .withSubKey(KeySpec.getBuilder(KeyType.XDH(XDHCurve._X25519)) .withKeyFlags(KeyFlag.ENCRYPT_COMMS) .withDefaultAlgorithms()) - .withMasterKey(KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) + .withPrimaryKey(KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) .withKeyFlags(KeyFlag.CERTIFY_OTHER, KeyFlag.AUTHENTICATION) .withDefaultAlgorithms()) .withPrimaryUserId("test@test.test") @@ -134,7 +134,7 @@ public class KeyFlagBasedSelectionStrategyTest { .withSubKey(KeySpec.getBuilder(KeyType.XDH(XDHCurve._X25519)) .withKeyFlags(KeyFlag.ENCRYPT_COMMS) .withDefaultAlgorithms()) - .withMasterKey(KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) + .withPrimaryKey(KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) .withKeyFlags(KeyFlag.CERTIFY_OTHER, KeyFlag.SIGN_DATA, KeyFlag.AUTHENTICATION) .withDefaultAlgorithms()) .withPrimaryUserId("test@test.test") diff --git a/pgpainless-core/src/test/java/org/pgpainless/weird_keys/TestEncryptCommsStorageFlagsDifferentiated.java b/pgpainless-core/src/test/java/org/pgpainless/weird_keys/TestEncryptCommsStorageFlagsDifferentiated.java index a6a695cd..e584ada6 100644 --- a/pgpainless-core/src/test/java/org/pgpainless/weird_keys/TestEncryptCommsStorageFlagsDifferentiated.java +++ b/pgpainless-core/src/test/java/org/pgpainless/weird_keys/TestEncryptCommsStorageFlagsDifferentiated.java @@ -40,7 +40,7 @@ public class TestEncryptCommsStorageFlagsDifferentiated { @Test public void testThatEncryptionDifferentiatesBetweenPurposeKeyFlags() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, PGPException, IOException { PGPSecretKeyRing secretKeys = PGPainless.generateKeyRing() - .withMasterKey(KeySpec.getBuilder(KeyType.RSA(RsaLength._3072)) + .withPrimaryKey(KeySpec.getBuilder(KeyType.RSA(RsaLength._3072)) .withKeyFlags(KeyFlag.CERTIFY_OTHER, KeyFlag.SIGN_DATA, KeyFlag.ENCRYPT_STORAGE // no ENCRYPT_COMMS