From 992bff6b3f38ea3a4a5624133de10d990c3dcd05 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Thu, 28 Jun 2018 18:25:11 +0200 Subject: [PATCH] Rename package to org.pgpainless.pgpainless --- build.gradle | 2 +- .../pgpainless}/pgpainless/KeyFilter.java | 2 +- .../pgpainless}/pgpainless/PGPainless.java | 14 ++++----- .../pgpainless/PGPv4Fingerprint.java | 2 +- .../pgpainless/PainlessStream.java | 2 +- .../PublicKeyNotFoundException.java | 2 +- .../SecretKeyNotFoundException.java | 2 +- .../pgpainless/algorithm/AlgorithmSuite.java | 2 +- .../algorithm/CompressionAlgorithm.java | 2 +- .../pgpainless/algorithm/Feature.java | 2 +- .../pgpainless/algorithm/HashAlgorithm.java | 2 +- .../pgpainless/algorithm/KeyFlag.java | 2 +- .../algorithm/PublicKeyAlgorithm.java | 2 +- .../algorithm/SymmetricKeyAlgorithm.java | 2 +- .../DecryptionBuilder.java | 7 ++--- .../DecryptionBuilderInterface.java | 4 +-- .../DecryptionStream.java | 2 +- .../DecryptionStreamFactory.java | 9 +++--- .../MissingPublicKeyCallback.java | 2 +- .../PainlessResult.java | 6 ++-- .../SignatureVerifyingInputStream.java | 4 +-- .../encryption_signing/EncryptionBuilder.java | 31 +++++++++---------- .../EncryptionBuilderInterface.java | 20 ++++++------ .../encryption_signing/EncryptionStream.java | 11 +++---- .../key/KeyRingProtectionSettings.java | 6 ++-- .../key/PassphraseMapKeyRingProtector.java | 2 +- .../key/SecretKeyRingProtector.java | 2 +- .../key/UnprotectedKeysProtector.java | 2 +- .../key/generation/KeyRingBuilder.java | 17 +++++----- .../generation/KeyRingBuilderInterface.java | 2 +- .../pgpainless/key/generation/KeySpec.java | 4 +-- .../key/generation/KeySpecBuilder.java | 16 +++++----- .../generation/KeySpecBuilderInterface.java | 12 +++---- .../pgpainless/key/generation/type/ECDH.java | 6 ++-- .../pgpainless/key/generation/type/ECDSA.java | 6 ++-- .../key/generation/type/ElGamal_ENCRYPT.java | 6 ++-- .../key/generation/type/ElGamal_GENERAL.java | 7 ++--- .../key/generation/type/KeyType.java | 4 +-- .../key/generation/type/RSA_ENCRYPT.java | 6 ++-- .../key/generation/type/RSA_GENERAL.java | 6 ++-- .../key/generation/type/RSA_SIGN.java | 6 ++-- .../generation/type/curve/EllipticCurve.java | 2 +- .../type/length/DiffieHellmanLength.java | 2 +- .../generation/type/length/ElGamalLength.java | 2 +- .../key/generation/type/length/KeyLength.java | 2 +- .../key/generation/type/length/RsaLength.java | 2 +- .../selection/key/KeySelectionStrategy.java | 5 +-- .../key/PublicKeySelectionStrategy.java | 4 +-- .../key/SecretKeySelectionStrategy.java | 4 +-- .../key/selection/key/impl/And.java | 6 ++-- .../impl/EncryptionKeySelectionStrategy.java | 4 +-- .../key/selection/key/impl/NoRevocation.java | 6 ++-- .../pgpainless/key/selection/key/impl/Or.java | 6 ++-- .../impl/SignatureKeySelectionStrategy.java | 4 +-- .../keyring/KeyRingSelectionStrategy.java | 4 +-- .../PublicKeyRingSelectionStrategy.java | 4 +-- .../SecretKeyRingSelectionStrategy.java | 4 +-- .../key/selection/keyring/impl/Email.java | 2 +- .../selection/keyring/impl/ExactUserId.java | 6 ++-- .../selection/keyring/impl/PartialUserId.java | 6 ++-- .../key/selection/keyring/impl/Whitelist.java | 8 ++--- .../key/selection/keyring/impl/Wildcard.java | 6 ++-- .../key/selection/keyring/impl/XMPP.java | 2 +- .../SymmetricEncryptorDecryptor.java | 6 ++-- .../pgpainless}/pgpainless/util/BCUtil.java | 6 ++-- .../pgpainless}/pgpainless/util/MultiMap.java | 8 ++--- .../pgpainless/AbstractPGPainlessTest.java | 2 +- .../pgpainless}/pgpainless/BCUtilTest.java | 6 ++-- .../pgpainless/EncryptDecryptTest.java | 30 +++++++++--------- .../pgpainless}/pgpainless/LengthTest.java | 11 +++---- .../pgpainless}/pgpainless/SymmetricTest.java | 4 +-- .../pgpainless}/pgpainless/TestKeys.java | 2 +- .../pgpainless}/pgpainless/TestKeysTest.java | 8 ++--- 73 files changed, 200 insertions(+), 220 deletions(-) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/KeyFilter.java (97%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/PGPainless.java (83%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/PGPv4Fingerprint.java (97%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/PainlessStream.java (97%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/PublicKeyNotFoundException.java (96%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/SecretKeyNotFoundException.java (95%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/algorithm/AlgorithmSuite.java (98%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/algorithm/CompressionAlgorithm.java (96%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/algorithm/Feature.java (96%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/algorithm/HashAlgorithm.java (97%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/algorithm/KeyFlag.java (96%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/algorithm/PublicKeyAlgorithm.java (97%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/algorithm/SymmetricKeyAlgorithm.java (97%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/decryption_verification/DecryptionBuilder.java (94%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/decryption_verification/DecryptionBuilderInterface.java (92%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/decryption_verification/DecryptionStream.java (95%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/decryption_verification/DecryptionStreamFactory.java (97%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/decryption_verification/MissingPublicKeyCallback.java (91%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/decryption_verification/PainlessResult.java (95%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/decryption_verification/SignatureVerifyingInputStream.java (97%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/encryption_signing/EncryptionBuilder.java (90%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/encryption_signing/EncryptionBuilderInterface.java (78%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/encryption_signing/EncryptionStream.java (96%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/KeyRingProtectionSettings.java (87%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/PassphraseMapKeyRingProtector.java (98%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/SecretKeyRingProtector.java (96%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/UnprotectedKeysProtector.java (96%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/generation/KeyRingBuilder.java (93%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/generation/KeyRingBuilderInterface.java (96%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/generation/KeySpec.java (92%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/generation/KeySpecBuilder.java (92%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/generation/KeySpecBuilderInterface.java (82%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/generation/type/ECDH.java (85%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/generation/type/ECDSA.java (81%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/generation/type/ElGamal_ENCRYPT.java (79%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/generation/type/ElGamal_GENERAL.java (82%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/generation/type/KeyType.java (85%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/generation/type/RSA_ENCRYPT.java (79%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/generation/type/RSA_GENERAL.java (86%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/generation/type/RSA_SIGN.java (79%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/generation/type/curve/EllipticCurve.java (92%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/generation/type/length/DiffieHellmanLength.java (92%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/generation/type/length/ElGamalLength.java (99%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/generation/type/length/KeyLength.java (90%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/generation/type/length/RsaLength.java (93%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/selection/key/KeySelectionStrategy.java (89%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/selection/key/PublicKeySelectionStrategy.java (94%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/selection/key/SecretKeySelectionStrategy.java (94%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/selection/key/impl/And.java (89%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/selection/key/impl/EncryptionKeySelectionStrategy.java (87%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/selection/key/impl/NoRevocation.java (87%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/selection/key/impl/Or.java (89%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/selection/key/impl/SignatureKeySelectionStrategy.java (87%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/selection/keyring/KeyRingSelectionStrategy.java (87%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/selection/keyring/PublicKeyRingSelectionStrategy.java (93%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/selection/keyring/SecretKeyRingSelectionStrategy.java (93%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/selection/keyring/impl/Email.java (95%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/selection/keyring/impl/ExactUserId.java (86%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/selection/keyring/impl/PartialUserId.java (87%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/selection/keyring/impl/Whitelist.java (87%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/selection/keyring/impl/Wildcard.java (81%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/key/selection/keyring/impl/XMPP.java (94%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/symmetric_encryption/SymmetricEncryptorDecryptor.java (96%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/util/BCUtil.java (97%) rename src/main/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/util/MultiMap.java (93%) rename src/test/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/AbstractPGPainlessTest.java (95%) rename src/test/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/BCUtilTest.java (96%) rename src/test/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/EncryptDecryptTest.java (88%) rename src/test/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/LengthTest.java (94%) rename src/test/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/SymmetricTest.java (95%) rename src/test/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/TestKeys.java (99%) rename src/test/java/{de/vanitasvitae/crypto => org/pgpainless}/pgpainless/TestKeysTest.java (91%) diff --git a/build.gradle b/build.gradle index 6b3d51df..e082c632 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ animalsniffer { sourceSets = [sourceSets.main] } -group 'de.vanitasvitae.crypto' +group 'org.pgpainless' version '0.1-SNAPSHOT' sourceCompatibility = 1.8 diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/KeyFilter.java b/src/main/java/org/pgpainless/pgpainless/KeyFilter.java similarity index 97% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/KeyFilter.java rename to src/main/java/org/pgpainless/pgpainless/KeyFilter.java index e98c3225..54f931f7 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/KeyFilter.java +++ b/src/main/java/org/pgpainless/pgpainless/KeyFilter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless; +package org.pgpainless.pgpainless; import java.util.HashSet; import java.util.Iterator; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/PGPainless.java b/src/main/java/org/pgpainless/pgpainless/PGPainless.java similarity index 83% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/PGPainless.java rename to src/main/java/org/pgpainless/pgpainless/PGPainless.java index d47522c5..7d84dc22 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/PGPainless.java +++ b/src/main/java/org/pgpainless/pgpainless/PGPainless.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless; +package org.pgpainless.pgpainless; import java.io.ByteArrayInputStream; import java.io.IOException; -import de.vanitasvitae.crypto.pgpainless.algorithm.CompressionAlgorithm; -import de.vanitasvitae.crypto.pgpainless.algorithm.SymmetricKeyAlgorithm; -import de.vanitasvitae.crypto.pgpainless.decryption_verification.DecryptionBuilder; -import de.vanitasvitae.crypto.pgpainless.encryption_signing.EncryptionBuilder; -import de.vanitasvitae.crypto.pgpainless.key.generation.KeyRingBuilder; -import de.vanitasvitae.crypto.pgpainless.symmetric_encryption.SymmetricEncryptorDecryptor; import org.bouncycastle.bcpg.ArmoredInputStream; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.pgpainless.pgpainless.algorithm.CompressionAlgorithm; +import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm; +import org.pgpainless.pgpainless.decryption_verification.DecryptionBuilder; +import org.pgpainless.pgpainless.encryption_signing.EncryptionBuilder; +import org.pgpainless.pgpainless.key.generation.KeyRingBuilder; +import org.pgpainless.pgpainless.symmetric_encryption.SymmetricEncryptorDecryptor; public class PGPainless { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/PGPv4Fingerprint.java b/src/main/java/org/pgpainless/pgpainless/PGPv4Fingerprint.java similarity index 97% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/PGPv4Fingerprint.java rename to src/main/java/org/pgpainless/pgpainless/PGPv4Fingerprint.java index e607860f..246788f7 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/PGPv4Fingerprint.java +++ b/src/main/java/org/pgpainless/pgpainless/PGPv4Fingerprint.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless; +package org.pgpainless.pgpainless; import java.util.Arrays; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/PainlessStream.java b/src/main/java/org/pgpainless/pgpainless/PainlessStream.java similarity index 97% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/PainlessStream.java rename to src/main/java/org/pgpainless/pgpainless/PainlessStream.java index 116cc1c0..8773570c 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/PainlessStream.java +++ b/src/main/java/org/pgpainless/pgpainless/PainlessStream.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless; +package org.pgpainless.pgpainless; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/PublicKeyNotFoundException.java b/src/main/java/org/pgpainless/pgpainless/PublicKeyNotFoundException.java similarity index 96% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/PublicKeyNotFoundException.java rename to src/main/java/org/pgpainless/pgpainless/PublicKeyNotFoundException.java index 659d3b9a..4a86f5f0 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/PublicKeyNotFoundException.java +++ b/src/main/java/org/pgpainless/pgpainless/PublicKeyNotFoundException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless; +package org.pgpainless.pgpainless; import org.bouncycastle.openpgp.PGPException; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/SecretKeyNotFoundException.java b/src/main/java/org/pgpainless/pgpainless/SecretKeyNotFoundException.java similarity index 95% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/SecretKeyNotFoundException.java rename to src/main/java/org/pgpainless/pgpainless/SecretKeyNotFoundException.java index 07e86653..0b3d0f19 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/SecretKeyNotFoundException.java +++ b/src/main/java/org/pgpainless/pgpainless/SecretKeyNotFoundException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless; +package org.pgpainless.pgpainless; public class SecretKeyNotFoundException extends Exception { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/AlgorithmSuite.java b/src/main/java/org/pgpainless/pgpainless/algorithm/AlgorithmSuite.java similarity index 98% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/AlgorithmSuite.java rename to src/main/java/org/pgpainless/pgpainless/algorithm/AlgorithmSuite.java index fe1b4505..28f7894e 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/AlgorithmSuite.java +++ b/src/main/java/org/pgpainless/pgpainless/algorithm/AlgorithmSuite.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.algorithm; +package org.pgpainless.pgpainless.algorithm; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/CompressionAlgorithm.java b/src/main/java/org/pgpainless/pgpainless/algorithm/CompressionAlgorithm.java similarity index 96% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/CompressionAlgorithm.java rename to src/main/java/org/pgpainless/pgpainless/algorithm/CompressionAlgorithm.java index 4694abde..1cf00ba5 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/CompressionAlgorithm.java +++ b/src/main/java/org/pgpainless/pgpainless/algorithm/CompressionAlgorithm.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.algorithm; +package org.pgpainless.pgpainless.algorithm; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/Feature.java b/src/main/java/org/pgpainless/pgpainless/algorithm/Feature.java similarity index 96% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/Feature.java rename to src/main/java/org/pgpainless/pgpainless/algorithm/Feature.java index 05d7b35c..ff533e89 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/Feature.java +++ b/src/main/java/org/pgpainless/pgpainless/algorithm/Feature.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.algorithm; +package org.pgpainless.pgpainless.algorithm; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/HashAlgorithm.java b/src/main/java/org/pgpainless/pgpainless/algorithm/HashAlgorithm.java similarity index 97% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/HashAlgorithm.java rename to src/main/java/org/pgpainless/pgpainless/algorithm/HashAlgorithm.java index 5fcb2955..132a4177 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/HashAlgorithm.java +++ b/src/main/java/org/pgpainless/pgpainless/algorithm/HashAlgorithm.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.algorithm; +package org.pgpainless.pgpainless.algorithm; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/KeyFlag.java b/src/main/java/org/pgpainless/pgpainless/algorithm/KeyFlag.java similarity index 96% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/KeyFlag.java rename to src/main/java/org/pgpainless/pgpainless/algorithm/KeyFlag.java index b3573b82..dc0a3f9a 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/KeyFlag.java +++ b/src/main/java/org/pgpainless/pgpainless/algorithm/KeyFlag.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.algorithm; +package org.pgpainless.pgpainless.algorithm; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/PublicKeyAlgorithm.java b/src/main/java/org/pgpainless/pgpainless/algorithm/PublicKeyAlgorithm.java similarity index 97% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/PublicKeyAlgorithm.java rename to src/main/java/org/pgpainless/pgpainless/algorithm/PublicKeyAlgorithm.java index 286b080a..9e0f4825 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/PublicKeyAlgorithm.java +++ b/src/main/java/org/pgpainless/pgpainless/algorithm/PublicKeyAlgorithm.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.algorithm; +package org.pgpainless.pgpainless.algorithm; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/SymmetricKeyAlgorithm.java b/src/main/java/org/pgpainless/pgpainless/algorithm/SymmetricKeyAlgorithm.java similarity index 97% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/SymmetricKeyAlgorithm.java rename to src/main/java/org/pgpainless/pgpainless/algorithm/SymmetricKeyAlgorithm.java index 2972b05b..219578e1 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/algorithm/SymmetricKeyAlgorithm.java +++ b/src/main/java/org/pgpainless/pgpainless/algorithm/SymmetricKeyAlgorithm.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.algorithm; +package org.pgpainless.pgpainless.algorithm; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/DecryptionBuilder.java b/src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionBuilder.java similarity index 94% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/DecryptionBuilder.java rename to src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionBuilder.java index e7f9f292..4e62f74b 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/DecryptionBuilder.java +++ b/src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionBuilder.java @@ -13,22 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.decryption_verification; +package org.pgpainless.pgpainless.decryption_verification; import java.io.IOException; import java.io.InputStream; import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; -import com.sun.glass.ui.Window; -import de.vanitasvitae.crypto.pgpainless.key.SecretKeyRingProtector; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; +import org.pgpainless.pgpainless.key.SecretKeyRingProtector; public class DecryptionBuilder implements DecryptionBuilderInterface { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/DecryptionBuilderInterface.java b/src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionBuilderInterface.java similarity index 92% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/DecryptionBuilderInterface.java rename to src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionBuilderInterface.java index 6a60893d..af1bb9bf 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/DecryptionBuilderInterface.java +++ b/src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionBuilderInterface.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.decryption_verification; +package org.pgpainless.pgpainless.decryption_verification; import java.io.IOException; import java.io.InputStream; import java.util.Set; -import de.vanitasvitae.crypto.pgpainless.key.SecretKeyRingProtector; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; +import org.pgpainless.pgpainless.key.SecretKeyRingProtector; public interface DecryptionBuilderInterface { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/DecryptionStream.java b/src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionStream.java similarity index 95% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/DecryptionStream.java rename to src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionStream.java index c3534429..87ea4517 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/DecryptionStream.java +++ b/src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionStream.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.decryption_verification; +package org.pgpainless.pgpainless.decryption_verification; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/DecryptionStreamFactory.java b/src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionStreamFactory.java similarity index 97% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/DecryptionStreamFactory.java rename to src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionStreamFactory.java index 522ac668..96004fd4 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/DecryptionStreamFactory.java +++ b/src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionStreamFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.decryption_verification; +package org.pgpainless.pgpainless.decryption_verification; import java.io.IOException; import java.io.InputStream; @@ -23,13 +23,9 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; -import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.Logger; -import de.vanitasvitae.crypto.pgpainless.algorithm.CompressionAlgorithm; -import de.vanitasvitae.crypto.pgpainless.algorithm.SymmetricKeyAlgorithm; -import de.vanitasvitae.crypto.pgpainless.key.SecretKeyRingProtector; import org.bouncycastle.openpgp.PGPCompressedData; import org.bouncycastle.openpgp.PGPEncryptedDataList; import org.bouncycastle.openpgp.PGPException; @@ -50,6 +46,9 @@ import org.bouncycastle.openpgp.operator.PublicKeyDataDecryptorFactory; import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; import org.bouncycastle.openpgp.operator.bc.BcPublicKeyDataDecryptorFactory; +import org.pgpainless.pgpainless.algorithm.CompressionAlgorithm; +import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm; +import org.pgpainless.pgpainless.key.SecretKeyRingProtector; public class DecryptionStreamFactory { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/MissingPublicKeyCallback.java b/src/main/java/org/pgpainless/pgpainless/decryption_verification/MissingPublicKeyCallback.java similarity index 91% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/MissingPublicKeyCallback.java rename to src/main/java/org/pgpainless/pgpainless/decryption_verification/MissingPublicKeyCallback.java index 42b4c9a3..10ccf907 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/MissingPublicKeyCallback.java +++ b/src/main/java/org/pgpainless/pgpainless/decryption_verification/MissingPublicKeyCallback.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.decryption_verification; +package org.pgpainless.pgpainless.decryption_verification; public interface MissingPublicKeyCallback { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/PainlessResult.java b/src/main/java/org/pgpainless/pgpainless/decryption_verification/PainlessResult.java similarity index 95% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/PainlessResult.java rename to src/main/java/org/pgpainless/pgpainless/decryption_verification/PainlessResult.java index ab87010d..9fce0d8f 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/PainlessResult.java +++ b/src/main/java/org/pgpainless/pgpainless/decryption_verification/PainlessResult.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.decryption_verification; +package org.pgpainless.pgpainless.decryption_verification; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import de.vanitasvitae.crypto.pgpainless.algorithm.CompressionAlgorithm; -import de.vanitasvitae.crypto.pgpainless.algorithm.SymmetricKeyAlgorithm; import org.bouncycastle.openpgp.PGPPublicKey; import org.bouncycastle.openpgp.PGPPublicKeyRing; +import org.pgpainless.pgpainless.algorithm.CompressionAlgorithm; +import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm; public class PainlessResult { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/SignatureVerifyingInputStream.java b/src/main/java/org/pgpainless/pgpainless/decryption_verification/SignatureVerifyingInputStream.java similarity index 97% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/SignatureVerifyingInputStream.java rename to src/main/java/org/pgpainless/pgpainless/decryption_verification/SignatureVerifyingInputStream.java index a56d2ae7..19997cc7 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/decryption_verification/SignatureVerifyingInputStream.java +++ b/src/main/java/org/pgpainless/pgpainless/decryption_verification/SignatureVerifyingInputStream.java @@ -13,15 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.decryption_verification; +package org.pgpainless.pgpainless.decryption_verification; import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; import java.security.SignatureException; import java.util.Map; -import java.util.logging.ConsoleHandler; -import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/encryption_signing/EncryptionBuilder.java b/src/main/java/org/pgpainless/pgpainless/encryption_signing/EncryptionBuilder.java similarity index 90% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/encryption_signing/EncryptionBuilder.java rename to src/main/java/org/pgpainless/pgpainless/encryption_signing/EncryptionBuilder.java index 84c94b79..b995a7d7 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/encryption_signing/EncryptionBuilder.java +++ b/src/main/java/org/pgpainless/pgpainless/encryption_signing/EncryptionBuilder.java @@ -13,30 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.encryption_signing; +package org.pgpainless.pgpainless.encryption_signing; import java.io.IOException; import java.io.OutputStream; -import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import de.vanitasvitae.crypto.pgpainless.SecretKeyNotFoundException; -import de.vanitasvitae.crypto.pgpainless.algorithm.CompressionAlgorithm; -import de.vanitasvitae.crypto.pgpainless.algorithm.HashAlgorithm; -import de.vanitasvitae.crypto.pgpainless.algorithm.SymmetricKeyAlgorithm; -import de.vanitasvitae.crypto.pgpainless.key.SecretKeyRingProtector; -import de.vanitasvitae.crypto.pgpainless.key.selection.key.PublicKeySelectionStrategy; -import de.vanitasvitae.crypto.pgpainless.key.selection.key.SecretKeySelectionStrategy; -import de.vanitasvitae.crypto.pgpainless.key.selection.key.impl.And; -import de.vanitasvitae.crypto.pgpainless.key.selection.key.impl.EncryptionKeySelectionStrategy; -import de.vanitasvitae.crypto.pgpainless.key.selection.key.impl.NoRevocation; -import de.vanitasvitae.crypto.pgpainless.key.selection.key.impl.SignatureKeySelectionStrategy; -import de.vanitasvitae.crypto.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy; -import de.vanitasvitae.crypto.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy; -import de.vanitasvitae.crypto.pgpainless.util.MultiMap; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPrivateKey; import org.bouncycastle.openpgp.PGPPublicKey; @@ -45,6 +29,19 @@ import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; import org.bouncycastle.openpgp.PGPSecretKey; import org.bouncycastle.openpgp.PGPSecretKeyRing; import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; +import org.pgpainless.pgpainless.algorithm.CompressionAlgorithm; +import org.pgpainless.pgpainless.algorithm.HashAlgorithm; +import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm; +import org.pgpainless.pgpainless.key.SecretKeyRingProtector; +import org.pgpainless.pgpainless.key.selection.key.PublicKeySelectionStrategy; +import org.pgpainless.pgpainless.key.selection.key.SecretKeySelectionStrategy; +import org.pgpainless.pgpainless.key.selection.key.impl.And; +import org.pgpainless.pgpainless.key.selection.key.impl.EncryptionKeySelectionStrategy; +import org.pgpainless.pgpainless.key.selection.key.impl.NoRevocation; +import org.pgpainless.pgpainless.key.selection.key.impl.SignatureKeySelectionStrategy; +import org.pgpainless.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy; +import org.pgpainless.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy; +import org.pgpainless.pgpainless.util.MultiMap; public class EncryptionBuilder implements EncryptionBuilderInterface { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/encryption_signing/EncryptionBuilderInterface.java b/src/main/java/org/pgpainless/pgpainless/encryption_signing/EncryptionBuilderInterface.java similarity index 78% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/encryption_signing/EncryptionBuilderInterface.java rename to src/main/java/org/pgpainless/pgpainless/encryption_signing/EncryptionBuilderInterface.java index e4f7eb9a..5420a2ca 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/encryption_signing/EncryptionBuilderInterface.java +++ b/src/main/java/org/pgpainless/pgpainless/encryption_signing/EncryptionBuilderInterface.java @@ -13,21 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.encryption_signing; +package org.pgpainless.pgpainless.encryption_signing; import java.io.IOException; import java.io.OutputStream; -import java.util.Set; -import de.vanitasvitae.crypto.pgpainless.PublicKeyNotFoundException; -import de.vanitasvitae.crypto.pgpainless.SecretKeyNotFoundException; -import de.vanitasvitae.crypto.pgpainless.algorithm.CompressionAlgorithm; -import de.vanitasvitae.crypto.pgpainless.algorithm.HashAlgorithm; -import de.vanitasvitae.crypto.pgpainless.algorithm.SymmetricKeyAlgorithm; -import de.vanitasvitae.crypto.pgpainless.key.SecretKeyRingProtector; -import de.vanitasvitae.crypto.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy; -import de.vanitasvitae.crypto.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy; -import de.vanitasvitae.crypto.pgpainless.util.MultiMap; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKey; import org.bouncycastle.openpgp.PGPPublicKeyRing; @@ -35,6 +25,14 @@ import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; import org.bouncycastle.openpgp.PGPSecretKey; import org.bouncycastle.openpgp.PGPSecretKeyRing; import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; +import org.pgpainless.pgpainless.SecretKeyNotFoundException; +import org.pgpainless.pgpainless.algorithm.CompressionAlgorithm; +import org.pgpainless.pgpainless.algorithm.HashAlgorithm; +import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm; +import org.pgpainless.pgpainless.key.SecretKeyRingProtector; +import org.pgpainless.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy; +import org.pgpainless.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy; +import org.pgpainless.pgpainless.util.MultiMap; public interface EncryptionBuilderInterface { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/encryption_signing/EncryptionStream.java b/src/main/java/org/pgpainless/pgpainless/encryption_signing/EncryptionStream.java similarity index 96% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/encryption_signing/EncryptionStream.java rename to src/main/java/org/pgpainless/pgpainless/encryption_signing/EncryptionStream.java index ab2bd621..10099f8c 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/encryption_signing/EncryptionStream.java +++ b/src/main/java/org/pgpainless/pgpainless/encryption_signing/EncryptionStream.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.encryption_signing; +package org.pgpainless.pgpainless.encryption_signing; import java.io.IOException; import java.io.OutputStream; @@ -26,10 +26,6 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import de.vanitasvitae.crypto.pgpainless.algorithm.CompressionAlgorithm; -import de.vanitasvitae.crypto.pgpainless.algorithm.HashAlgorithm; -import de.vanitasvitae.crypto.pgpainless.algorithm.SymmetricKeyAlgorithm; -import de.vanitasvitae.crypto.pgpainless.decryption_verification.PainlessResult; import org.bouncycastle.bcpg.ArmoredOutputStream; import org.bouncycastle.bcpg.BCPGOutputStream; import org.bouncycastle.openpgp.PGPCompressedDataGenerator; @@ -39,12 +35,15 @@ import org.bouncycastle.openpgp.PGPLiteralData; import org.bouncycastle.openpgp.PGPLiteralDataGenerator; import org.bouncycastle.openpgp.PGPPrivateKey; import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.PGPSignature; import org.bouncycastle.openpgp.PGPSignatureGenerator; import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; import org.bouncycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder; import org.bouncycastle.openpgp.operator.bc.BcPublicKeyKeyEncryptionMethodGenerator; +import org.pgpainless.pgpainless.algorithm.CompressionAlgorithm; +import org.pgpainless.pgpainless.algorithm.HashAlgorithm; +import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm; +import org.pgpainless.pgpainless.decryption_verification.PainlessResult; /** * This class is based upon Jens Neuhalfen's Bouncy-GPG PGPEncryptingStream. diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/KeyRingProtectionSettings.java b/src/main/java/org/pgpainless/pgpainless/key/KeyRingProtectionSettings.java similarity index 87% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/KeyRingProtectionSettings.java rename to src/main/java/org/pgpainless/pgpainless/key/KeyRingProtectionSettings.java index f7c5b9da..5962bbc1 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/KeyRingProtectionSettings.java +++ b/src/main/java/org/pgpainless/pgpainless/key/KeyRingProtectionSettings.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key; +package org.pgpainless.pgpainless.key; -import de.vanitasvitae.crypto.pgpainless.algorithm.HashAlgorithm; -import de.vanitasvitae.crypto.pgpainless.algorithm.SymmetricKeyAlgorithm; +import org.pgpainless.pgpainless.algorithm.HashAlgorithm; +import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm; public class KeyRingProtectionSettings { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/PassphraseMapKeyRingProtector.java b/src/main/java/org/pgpainless/pgpainless/key/PassphraseMapKeyRingProtector.java similarity index 98% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/PassphraseMapKeyRingProtector.java rename to src/main/java/org/pgpainless/pgpainless/key/PassphraseMapKeyRingProtector.java index 6051f5a4..ba895ed1 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/PassphraseMapKeyRingProtector.java +++ b/src/main/java/org/pgpainless/pgpainless/key/PassphraseMapKeyRingProtector.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key; +package org.pgpainless.pgpainless.key; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/SecretKeyRingProtector.java b/src/main/java/org/pgpainless/pgpainless/key/SecretKeyRingProtector.java similarity index 96% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/SecretKeyRingProtector.java rename to src/main/java/org/pgpainless/pgpainless/key/SecretKeyRingProtector.java index 9666b60a..1427ea81 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/SecretKeyRingProtector.java +++ b/src/main/java/org/pgpainless/pgpainless/key/SecretKeyRingProtector.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key; +package org.pgpainless.pgpainless.key; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/UnprotectedKeysProtector.java b/src/main/java/org/pgpainless/pgpainless/key/UnprotectedKeysProtector.java similarity index 96% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/UnprotectedKeysProtector.java rename to src/main/java/org/pgpainless/pgpainless/key/UnprotectedKeysProtector.java index ca04a0d3..8c15386a 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/UnprotectedKeysProtector.java +++ b/src/main/java/org/pgpainless/pgpainless/key/UnprotectedKeysProtector.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key; +package org.pgpainless.pgpainless.key; import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor; import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/KeyRingBuilder.java b/src/main/java/org/pgpainless/pgpainless/key/generation/KeyRingBuilder.java similarity index 93% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/KeyRingBuilder.java rename to src/main/java/org/pgpainless/pgpainless/key/generation/KeyRingBuilder.java index 13b80f53..ea026bdd 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/KeyRingBuilder.java +++ b/src/main/java/org/pgpainless/pgpainless/key/generation/KeyRingBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.generation; +package org.pgpainless.pgpainless.key.generation; import java.nio.charset.Charset; @@ -26,13 +26,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import de.vanitasvitae.crypto.pgpainless.algorithm.KeyFlag; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.ECDH; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.ECDSA; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.KeyType; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.RSA_GENERAL; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.curve.EllipticCurve; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.length.RsaLength; import org.bouncycastle.bcpg.HashAlgorithmTags; import org.bouncycastle.bcpg.sig.KeyFlags; import org.bouncycastle.jce.provider.BouncyCastleProvider; @@ -46,11 +39,17 @@ import org.bouncycastle.openpgp.PGPSignatureSubpacketVector; import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor; import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder; import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.openpgp.operator.bc.BcPGPKeyPair; import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair; import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; +import org.pgpainless.pgpainless.algorithm.KeyFlag; +import org.pgpainless.pgpainless.key.generation.type.ECDH; +import org.pgpainless.pgpainless.key.generation.type.ECDSA; +import org.pgpainless.pgpainless.key.generation.type.KeyType; +import org.pgpainless.pgpainless.key.generation.type.RSA_GENERAL; +import org.pgpainless.pgpainless.key.generation.type.curve.EllipticCurve; +import org.pgpainless.pgpainless.key.generation.type.length.RsaLength; public class KeyRingBuilder implements KeyRingBuilderInterface { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/KeyRingBuilderInterface.java b/src/main/java/org/pgpainless/pgpainless/key/generation/KeyRingBuilderInterface.java similarity index 96% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/KeyRingBuilderInterface.java rename to src/main/java/org/pgpainless/pgpainless/key/generation/KeyRingBuilderInterface.java index 12e12649..9b5e18d8 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/KeyRingBuilderInterface.java +++ b/src/main/java/org/pgpainless/pgpainless/key/generation/KeyRingBuilderInterface.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.generation; +package org.pgpainless.pgpainless.key.generation; import java.security.InvalidAlgorithmParameterException; import java.security.NoSuchAlgorithmException; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/KeySpec.java b/src/main/java/org/pgpainless/pgpainless/key/generation/KeySpec.java similarity index 92% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/KeySpec.java rename to src/main/java/org/pgpainless/pgpainless/key/generation/KeySpec.java index 60054d8d..1c58bf4d 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/KeySpec.java +++ b/src/main/java/org/pgpainless/pgpainless/key/generation/KeySpec.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.generation; +package org.pgpainless.pgpainless.key.generation; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.KeyType; import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator; import org.bouncycastle.openpgp.PGPSignatureSubpacketVector; +import org.pgpainless.pgpainless.key.generation.type.KeyType; public class KeySpec { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/KeySpecBuilder.java b/src/main/java/org/pgpainless/pgpainless/key/generation/KeySpecBuilder.java similarity index 92% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/KeySpecBuilder.java rename to src/main/java/org/pgpainless/pgpainless/key/generation/KeySpecBuilder.java index 1df26092..f83e08eb 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/KeySpecBuilder.java +++ b/src/main/java/org/pgpainless/pgpainless/key/generation/KeySpecBuilder.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.generation; +package org.pgpainless.pgpainless.key.generation; -import de.vanitasvitae.crypto.pgpainless.algorithm.AlgorithmSuite; -import de.vanitasvitae.crypto.pgpainless.algorithm.CompressionAlgorithm; -import de.vanitasvitae.crypto.pgpainless.algorithm.Feature; -import de.vanitasvitae.crypto.pgpainless.algorithm.HashAlgorithm; -import de.vanitasvitae.crypto.pgpainless.algorithm.KeyFlag; -import de.vanitasvitae.crypto.pgpainless.algorithm.SymmetricKeyAlgorithm; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.KeyType; import org.bouncycastle.bcpg.sig.Features; import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator; +import org.pgpainless.pgpainless.algorithm.AlgorithmSuite; +import org.pgpainless.pgpainless.algorithm.CompressionAlgorithm; +import org.pgpainless.pgpainless.algorithm.Feature; +import org.pgpainless.pgpainless.algorithm.HashAlgorithm; +import org.pgpainless.pgpainless.algorithm.KeyFlag; +import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm; +import org.pgpainless.pgpainless.key.generation.type.KeyType; public class KeySpecBuilder implements KeySpecBuilderInterface { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/KeySpecBuilderInterface.java b/src/main/java/org/pgpainless/pgpainless/key/generation/KeySpecBuilderInterface.java similarity index 82% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/KeySpecBuilderInterface.java rename to src/main/java/org/pgpainless/pgpainless/key/generation/KeySpecBuilderInterface.java index 3089a7d9..ee793c8d 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/KeySpecBuilderInterface.java +++ b/src/main/java/org/pgpainless/pgpainless/key/generation/KeySpecBuilderInterface.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.generation; +package org.pgpainless.pgpainless.key.generation; -import de.vanitasvitae.crypto.pgpainless.algorithm.CompressionAlgorithm; -import de.vanitasvitae.crypto.pgpainless.algorithm.Feature; -import de.vanitasvitae.crypto.pgpainless.algorithm.HashAlgorithm; -import de.vanitasvitae.crypto.pgpainless.algorithm.KeyFlag; -import de.vanitasvitae.crypto.pgpainless.algorithm.SymmetricKeyAlgorithm; +import org.pgpainless.pgpainless.algorithm.CompressionAlgorithm; +import org.pgpainless.pgpainless.algorithm.Feature; +import org.pgpainless.pgpainless.algorithm.HashAlgorithm; +import org.pgpainless.pgpainless.algorithm.KeyFlag; +import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm; public interface KeySpecBuilderInterface { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/ECDH.java b/src/main/java/org/pgpainless/pgpainless/key/generation/type/ECDH.java similarity index 85% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/ECDH.java rename to src/main/java/org/pgpainless/pgpainless/key/generation/type/ECDH.java index 0e6b905a..8161fbaa 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/ECDH.java +++ b/src/main/java/org/pgpainless/pgpainless/key/generation/type/ECDH.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.generation.type; +package org.pgpainless.pgpainless.key.generation.type; import java.security.spec.AlgorithmParameterSpec; -import de.vanitasvitae.crypto.pgpainless.algorithm.PublicKeyAlgorithm; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.curve.EllipticCurve; import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec; +import org.pgpainless.pgpainless.algorithm.PublicKeyAlgorithm; +import org.pgpainless.pgpainless.key.generation.type.curve.EllipticCurve; public class ECDH implements KeyType { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/ECDSA.java b/src/main/java/org/pgpainless/pgpainless/key/generation/type/ECDSA.java similarity index 81% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/ECDSA.java rename to src/main/java/org/pgpainless/pgpainless/key/generation/type/ECDSA.java index 0acf5cf0..2ead946c 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/ECDSA.java +++ b/src/main/java/org/pgpainless/pgpainless/key/generation/type/ECDSA.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.generation.type; +package org.pgpainless.pgpainless.key.generation.type; -import de.vanitasvitae.crypto.pgpainless.algorithm.PublicKeyAlgorithm; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.curve.EllipticCurve; +import org.pgpainless.pgpainless.algorithm.PublicKeyAlgorithm; +import org.pgpainless.pgpainless.key.generation.type.curve.EllipticCurve; public class ECDSA extends ECDH { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/ElGamal_ENCRYPT.java b/src/main/java/org/pgpainless/pgpainless/key/generation/type/ElGamal_ENCRYPT.java similarity index 79% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/ElGamal_ENCRYPT.java rename to src/main/java/org/pgpainless/pgpainless/key/generation/type/ElGamal_ENCRYPT.java index f0227c3e..c90ed579 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/ElGamal_ENCRYPT.java +++ b/src/main/java/org/pgpainless/pgpainless/key/generation/type/ElGamal_ENCRYPT.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.generation.type; +package org.pgpainless.pgpainless.key.generation.type; -import de.vanitasvitae.crypto.pgpainless.algorithm.PublicKeyAlgorithm; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.length.ElGamalLength; +import org.pgpainless.pgpainless.algorithm.PublicKeyAlgorithm; +import org.pgpainless.pgpainless.key.generation.type.length.ElGamalLength; public class ElGamal_ENCRYPT extends ElGamal_GENERAL { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/ElGamal_GENERAL.java b/src/main/java/org/pgpainless/pgpainless/key/generation/type/ElGamal_GENERAL.java similarity index 82% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/ElGamal_GENERAL.java rename to src/main/java/org/pgpainless/pgpainless/key/generation/type/ElGamal_GENERAL.java index ed263ae6..e524881f 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/ElGamal_GENERAL.java +++ b/src/main/java/org/pgpainless/pgpainless/key/generation/type/ElGamal_GENERAL.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.generation.type; +package org.pgpainless.pgpainless.key.generation.type; import java.security.spec.AlgorithmParameterSpec; -import de.vanitasvitae.crypto.pgpainless.algorithm.PublicKeyAlgorithm; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.length.ElGamalLength; -import org.bouncycastle.jce.spec.ElGamalGenParameterSpec; import org.bouncycastle.jce.spec.ElGamalParameterSpec; +import org.pgpainless.pgpainless.algorithm.PublicKeyAlgorithm; +import org.pgpainless.pgpainless.key.generation.type.length.ElGamalLength; public class ElGamal_GENERAL implements KeyType { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/KeyType.java b/src/main/java/org/pgpainless/pgpainless/key/generation/type/KeyType.java similarity index 85% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/KeyType.java rename to src/main/java/org/pgpainless/pgpainless/key/generation/type/KeyType.java index 1de41170..a9634738 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/KeyType.java +++ b/src/main/java/org/pgpainless/pgpainless/key/generation/type/KeyType.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.generation.type; +package org.pgpainless.pgpainless.key.generation.type; import java.security.spec.AlgorithmParameterSpec; -import de.vanitasvitae.crypto.pgpainless.algorithm.PublicKeyAlgorithm; +import org.pgpainless.pgpainless.algorithm.PublicKeyAlgorithm; public interface KeyType { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/RSA_ENCRYPT.java b/src/main/java/org/pgpainless/pgpainless/key/generation/type/RSA_ENCRYPT.java similarity index 79% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/RSA_ENCRYPT.java rename to src/main/java/org/pgpainless/pgpainless/key/generation/type/RSA_ENCRYPT.java index 53b90e1e..e9eee26f 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/RSA_ENCRYPT.java +++ b/src/main/java/org/pgpainless/pgpainless/key/generation/type/RSA_ENCRYPT.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.generation.type; +package org.pgpainless.pgpainless.key.generation.type; -import de.vanitasvitae.crypto.pgpainless.algorithm.PublicKeyAlgorithm; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.length.RsaLength; +import org.pgpainless.pgpainless.algorithm.PublicKeyAlgorithm; +import org.pgpainless.pgpainless.key.generation.type.length.RsaLength; public class RSA_ENCRYPT extends RSA_GENERAL { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/RSA_GENERAL.java b/src/main/java/org/pgpainless/pgpainless/key/generation/type/RSA_GENERAL.java similarity index 86% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/RSA_GENERAL.java rename to src/main/java/org/pgpainless/pgpainless/key/generation/type/RSA_GENERAL.java index 48c87971..08818d2f 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/RSA_GENERAL.java +++ b/src/main/java/org/pgpainless/pgpainless/key/generation/type/RSA_GENERAL.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.generation.type; +package org.pgpainless.pgpainless.key.generation.type; import java.security.spec.AlgorithmParameterSpec; import java.security.spec.RSAKeyGenParameterSpec; -import de.vanitasvitae.crypto.pgpainless.algorithm.PublicKeyAlgorithm; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.length.RsaLength; +import org.pgpainless.pgpainless.algorithm.PublicKeyAlgorithm; +import org.pgpainless.pgpainless.key.generation.type.length.RsaLength; public class RSA_GENERAL implements KeyType { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/RSA_SIGN.java b/src/main/java/org/pgpainless/pgpainless/key/generation/type/RSA_SIGN.java similarity index 79% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/RSA_SIGN.java rename to src/main/java/org/pgpainless/pgpainless/key/generation/type/RSA_SIGN.java index cac29355..9a83d056 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/RSA_SIGN.java +++ b/src/main/java/org/pgpainless/pgpainless/key/generation/type/RSA_SIGN.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.generation.type; +package org.pgpainless.pgpainless.key.generation.type; -import de.vanitasvitae.crypto.pgpainless.algorithm.PublicKeyAlgorithm; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.length.RsaLength; +import org.pgpainless.pgpainless.algorithm.PublicKeyAlgorithm; +import org.pgpainless.pgpainless.key.generation.type.length.RsaLength; public class RSA_SIGN extends RSA_GENERAL { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/curve/EllipticCurve.java b/src/main/java/org/pgpainless/pgpainless/key/generation/type/curve/EllipticCurve.java similarity index 92% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/curve/EllipticCurve.java rename to src/main/java/org/pgpainless/pgpainless/key/generation/type/curve/EllipticCurve.java index dfd906b8..08a20a46 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/curve/EllipticCurve.java +++ b/src/main/java/org/pgpainless/pgpainless/key/generation/type/curve/EllipticCurve.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.generation.type.curve; +package org.pgpainless.pgpainless.key.generation.type.curve; public enum EllipticCurve { _P256("P-256"), diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/length/DiffieHellmanLength.java b/src/main/java/org/pgpainless/pgpainless/key/generation/type/length/DiffieHellmanLength.java similarity index 92% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/length/DiffieHellmanLength.java rename to src/main/java/org/pgpainless/pgpainless/key/generation/type/length/DiffieHellmanLength.java index 67111002..263613e5 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/length/DiffieHellmanLength.java +++ b/src/main/java/org/pgpainless/pgpainless/key/generation/type/length/DiffieHellmanLength.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.generation.type.length; +package org.pgpainless.pgpainless.key.generation.type.length; public enum DiffieHellmanLength implements KeyLength { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/length/ElGamalLength.java b/src/main/java/org/pgpainless/pgpainless/key/generation/type/length/ElGamalLength.java similarity index 99% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/length/ElGamalLength.java rename to src/main/java/org/pgpainless/pgpainless/key/generation/type/length/ElGamalLength.java index c5696d10..5071eb78 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/length/ElGamalLength.java +++ b/src/main/java/org/pgpainless/pgpainless/key/generation/type/length/ElGamalLength.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.generation.type.length; +package org.pgpainless.pgpainless.key.generation.type.length; import java.math.BigInteger; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/length/KeyLength.java b/src/main/java/org/pgpainless/pgpainless/key/generation/type/length/KeyLength.java similarity index 90% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/length/KeyLength.java rename to src/main/java/org/pgpainless/pgpainless/key/generation/type/length/KeyLength.java index 6ce30779..8c9ddb3b 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/length/KeyLength.java +++ b/src/main/java/org/pgpainless/pgpainless/key/generation/type/length/KeyLength.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.generation.type.length; +package org.pgpainless.pgpainless.key.generation.type.length; public interface KeyLength { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/length/RsaLength.java b/src/main/java/org/pgpainless/pgpainless/key/generation/type/length/RsaLength.java similarity index 93% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/length/RsaLength.java rename to src/main/java/org/pgpainless/pgpainless/key/generation/type/length/RsaLength.java index f35f8b83..59437a6b 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/type/length/RsaLength.java +++ b/src/main/java/org/pgpainless/pgpainless/key/generation/type/length/RsaLength.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.generation.type.length; +package org.pgpainless.pgpainless.key.generation.type.length; public enum RsaLength implements KeyLength { @Deprecated diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/KeySelectionStrategy.java b/src/main/java/org/pgpainless/pgpainless/key/selection/key/KeySelectionStrategy.java similarity index 89% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/KeySelectionStrategy.java rename to src/main/java/org/pgpainless/pgpainless/key/selection/key/KeySelectionStrategy.java index ebea2c2d..92a1c82d 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/KeySelectionStrategy.java +++ b/src/main/java/org/pgpainless/pgpainless/key/selection/key/KeySelectionStrategy.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.selection.key; +package org.pgpainless.pgpainless.key.selection.key; import java.util.Set; -import de.vanitasvitae.crypto.pgpainless.util.MultiMap; +import org.pgpainless.pgpainless.util.MultiMap; + /** * Interface that describes a selection strategy for OpenPGP keys. diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/PublicKeySelectionStrategy.java b/src/main/java/org/pgpainless/pgpainless/key/selection/key/PublicKeySelectionStrategy.java similarity index 94% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/PublicKeySelectionStrategy.java rename to src/main/java/org/pgpainless/pgpainless/key/selection/key/PublicKeySelectionStrategy.java index 6627c081..88b4aa7d 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/PublicKeySelectionStrategy.java +++ b/src/main/java/org/pgpainless/pgpainless/key/selection/key/PublicKeySelectionStrategy.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.selection.key; +package org.pgpainless.pgpainless.key.selection.key; import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import de.vanitasvitae.crypto.pgpainless.util.MultiMap; import org.bouncycastle.openpgp.PGPPublicKey; import org.bouncycastle.openpgp.PGPPublicKeyRing; +import org.pgpainless.pgpainless.util.MultiMap; /** * Key Selection Strategy which accepts {@link PGPPublicKey}s that are accepted by the abstract method diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/SecretKeySelectionStrategy.java b/src/main/java/org/pgpainless/pgpainless/key/selection/key/SecretKeySelectionStrategy.java similarity index 94% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/SecretKeySelectionStrategy.java rename to src/main/java/org/pgpainless/pgpainless/key/selection/key/SecretKeySelectionStrategy.java index d1cab597..6089268f 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/SecretKeySelectionStrategy.java +++ b/src/main/java/org/pgpainless/pgpainless/key/selection/key/SecretKeySelectionStrategy.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.selection.key; +package org.pgpainless.pgpainless.key.selection.key; import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import de.vanitasvitae.crypto.pgpainless.util.MultiMap; import org.bouncycastle.openpgp.PGPSecretKey; import org.bouncycastle.openpgp.PGPSecretKeyRing; +import org.pgpainless.pgpainless.util.MultiMap; /** * Key Selection Strategy which accepts {@link PGPSecretKey}s that are accepted by the abstract method diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/impl/And.java b/src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/And.java similarity index 89% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/impl/And.java rename to src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/And.java index dfa5a2af..48dbb872 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/impl/And.java +++ b/src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/And.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.selection.key.impl; +package org.pgpainless.pgpainless.key.selection.key.impl; -import de.vanitasvitae.crypto.pgpainless.key.selection.key.PublicKeySelectionStrategy; -import de.vanitasvitae.crypto.pgpainless.key.selection.key.SecretKeySelectionStrategy; import org.bouncycastle.openpgp.PGPPublicKey; import org.bouncycastle.openpgp.PGPSecretKey; +import org.pgpainless.pgpainless.key.selection.key.PublicKeySelectionStrategy; +import org.pgpainless.pgpainless.key.selection.key.SecretKeySelectionStrategy; public class And { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/impl/EncryptionKeySelectionStrategy.java b/src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/EncryptionKeySelectionStrategy.java similarity index 87% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/impl/EncryptionKeySelectionStrategy.java rename to src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/EncryptionKeySelectionStrategy.java index 298d1a73..324068a3 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/impl/EncryptionKeySelectionStrategy.java +++ b/src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/EncryptionKeySelectionStrategy.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.selection.key.impl; +package org.pgpainless.pgpainless.key.selection.key.impl; -import de.vanitasvitae.crypto.pgpainless.key.selection.key.PublicKeySelectionStrategy; import org.bouncycastle.openpgp.PGPPublicKey; +import org.pgpainless.pgpainless.key.selection.key.PublicKeySelectionStrategy; /** * Key Selection Strategy that only accepts {@link PGPPublicKey}s which are capable of encryption. diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/impl/NoRevocation.java b/src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/NoRevocation.java similarity index 87% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/impl/NoRevocation.java rename to src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/NoRevocation.java index c9cb3ea8..259a3a56 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/impl/NoRevocation.java +++ b/src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/NoRevocation.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.selection.key.impl; +package org.pgpainless.pgpainless.key.selection.key.impl; -import de.vanitasvitae.crypto.pgpainless.key.selection.key.PublicKeySelectionStrategy; -import de.vanitasvitae.crypto.pgpainless.key.selection.key.SecretKeySelectionStrategy; import org.bouncycastle.openpgp.PGPPublicKey; import org.bouncycastle.openpgp.PGPSecretKey; +import org.pgpainless.pgpainless.key.selection.key.PublicKeySelectionStrategy; +import org.pgpainless.pgpainless.key.selection.key.SecretKeySelectionStrategy; /** * Key Selection Strategies that do accept only keys, which have no revocation. diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/impl/Or.java b/src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/Or.java similarity index 89% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/impl/Or.java rename to src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/Or.java index f6b58e63..d334734d 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/impl/Or.java +++ b/src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/Or.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.selection.key.impl; +package org.pgpainless.pgpainless.key.selection.key.impl; -import de.vanitasvitae.crypto.pgpainless.key.selection.key.PublicKeySelectionStrategy; -import de.vanitasvitae.crypto.pgpainless.key.selection.key.SecretKeySelectionStrategy; import org.bouncycastle.openpgp.PGPPublicKey; import org.bouncycastle.openpgp.PGPSecretKey; +import org.pgpainless.pgpainless.key.selection.key.PublicKeySelectionStrategy; +import org.pgpainless.pgpainless.key.selection.key.SecretKeySelectionStrategy; public class Or { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/impl/SignatureKeySelectionStrategy.java b/src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/SignatureKeySelectionStrategy.java similarity index 87% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/impl/SignatureKeySelectionStrategy.java rename to src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/SignatureKeySelectionStrategy.java index 6defe990..fc980d48 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/key/impl/SignatureKeySelectionStrategy.java +++ b/src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/SignatureKeySelectionStrategy.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.selection.key.impl; +package org.pgpainless.pgpainless.key.selection.key.impl; -import de.vanitasvitae.crypto.pgpainless.key.selection.key.SecretKeySelectionStrategy; import org.bouncycastle.openpgp.PGPSecretKey; +import org.pgpainless.pgpainless.key.selection.key.SecretKeySelectionStrategy; /** * Key Selection Strategy that only accepts {@link PGPSecretKey}s which are capable of signing. diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/KeyRingSelectionStrategy.java b/src/main/java/org/pgpainless/pgpainless/key/selection/keyring/KeyRingSelectionStrategy.java similarity index 87% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/KeyRingSelectionStrategy.java rename to src/main/java/org/pgpainless/pgpainless/key/selection/keyring/KeyRingSelectionStrategy.java index 0f168829..647015ec 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/KeyRingSelectionStrategy.java +++ b/src/main/java/org/pgpainless/pgpainless/key/selection/keyring/KeyRingSelectionStrategy.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.selection.keyring; +package org.pgpainless.pgpainless.key.selection.keyring; import java.util.Set; -import de.vanitasvitae.crypto.pgpainless.util.MultiMap; +import org.pgpainless.pgpainless.util.MultiMap; public interface KeyRingSelectionStrategy { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/PublicKeyRingSelectionStrategy.java b/src/main/java/org/pgpainless/pgpainless/key/selection/keyring/PublicKeyRingSelectionStrategy.java similarity index 93% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/PublicKeyRingSelectionStrategy.java rename to src/main/java/org/pgpainless/pgpainless/key/selection/keyring/PublicKeyRingSelectionStrategy.java index af5bced9..8551982f 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/PublicKeyRingSelectionStrategy.java +++ b/src/main/java/org/pgpainless/pgpainless/key/selection/keyring/PublicKeyRingSelectionStrategy.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.selection.keyring; +package org.pgpainless.pgpainless.key.selection.keyring; import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import de.vanitasvitae.crypto.pgpainless.util.MultiMap; import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; +import org.pgpainless.pgpainless.util.MultiMap; public abstract class PublicKeyRingSelectionStrategy implements KeyRingSelectionStrategy { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/SecretKeyRingSelectionStrategy.java b/src/main/java/org/pgpainless/pgpainless/key/selection/keyring/SecretKeyRingSelectionStrategy.java similarity index 93% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/SecretKeyRingSelectionStrategy.java rename to src/main/java/org/pgpainless/pgpainless/key/selection/keyring/SecretKeyRingSelectionStrategy.java index 6564e43a..b8550f59 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/SecretKeyRingSelectionStrategy.java +++ b/src/main/java/org/pgpainless/pgpainless/key/selection/keyring/SecretKeyRingSelectionStrategy.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.selection.keyring; +package org.pgpainless.pgpainless.key.selection.keyring; import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import de.vanitasvitae.crypto.pgpainless.util.MultiMap; import org.bouncycastle.openpgp.PGPSecretKeyRing; import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; +import org.pgpainless.pgpainless.util.MultiMap; public abstract class SecretKeyRingSelectionStrategy implements KeyRingSelectionStrategy { @Override diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/impl/Email.java b/src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/Email.java similarity index 95% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/impl/Email.java rename to src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/Email.java index 824b925e..3ed9199f 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/impl/Email.java +++ b/src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/Email.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.selection.keyring.impl; +package org.pgpainless.pgpainless.key.selection.keyring.impl; import org.bouncycastle.openpgp.PGPPublicKey; import org.bouncycastle.openpgp.PGPSecretKey; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/impl/ExactUserId.java b/src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/ExactUserId.java similarity index 86% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/impl/ExactUserId.java rename to src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/ExactUserId.java index 4851e5a6..99fe7deb 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/impl/ExactUserId.java +++ b/src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/ExactUserId.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.selection.keyring.impl; +package org.pgpainless.pgpainless.key.selection.keyring.impl; import java.util.Iterator; -import de.vanitasvitae.crypto.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy; -import de.vanitasvitae.crypto.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy; import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.PGPSecretKeyRing; +import org.pgpainless.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy; +import org.pgpainless.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy; public class ExactUserId { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/impl/PartialUserId.java b/src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/PartialUserId.java similarity index 87% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/impl/PartialUserId.java rename to src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/PartialUserId.java index 2826f233..2b6f688f 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/impl/PartialUserId.java +++ b/src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/PartialUserId.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.selection.keyring.impl; +package org.pgpainless.pgpainless.key.selection.keyring.impl; import java.util.Iterator; -import de.vanitasvitae.crypto.pgpainless.key.selection.key.PublicKeySelectionStrategy; -import de.vanitasvitae.crypto.pgpainless.key.selection.key.SecretKeySelectionStrategy; import org.bouncycastle.openpgp.PGPPublicKey; import org.bouncycastle.openpgp.PGPSecretKey; +import org.pgpainless.pgpainless.key.selection.key.PublicKeySelectionStrategy; +import org.pgpainless.pgpainless.key.selection.key.SecretKeySelectionStrategy; public class PartialUserId { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/impl/Whitelist.java b/src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/Whitelist.java similarity index 87% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/impl/Whitelist.java rename to src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/Whitelist.java index 7b66108f..26b09196 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/impl/Whitelist.java +++ b/src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/Whitelist.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.selection.keyring.impl; +package org.pgpainless.pgpainless.key.selection.keyring.impl; import java.util.Map; import java.util.Set; -import de.vanitasvitae.crypto.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy; -import de.vanitasvitae.crypto.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy; -import de.vanitasvitae.crypto.pgpainless.util.MultiMap; import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.PGPSecretKeyRing; +import org.pgpainless.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy; +import org.pgpainless.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy; +import org.pgpainless.pgpainless.util.MultiMap; public class Whitelist { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/impl/Wildcard.java b/src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/Wildcard.java similarity index 81% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/impl/Wildcard.java rename to src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/Wildcard.java index 3891f37b..51682ef4 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/impl/Wildcard.java +++ b/src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/Wildcard.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.selection.keyring.impl; +package org.pgpainless.pgpainless.key.selection.keyring.impl; -import de.vanitasvitae.crypto.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy; -import de.vanitasvitae.crypto.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy; import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.PGPSecretKeyRing; +import org.pgpainless.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy; +import org.pgpainless.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy; public class Wildcard { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/impl/XMPP.java b/src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/XMPP.java similarity index 94% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/impl/XMPP.java rename to src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/XMPP.java index c8fd5e75..ae98e998 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/key/selection/keyring/impl/XMPP.java +++ b/src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/XMPP.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.key.selection.keyring.impl; +package org.pgpainless.pgpainless.key.selection.keyring.impl; import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.PGPSecretKeyRing; diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/symmetric_encryption/SymmetricEncryptorDecryptor.java b/src/main/java/org/pgpainless/pgpainless/symmetric_encryption/SymmetricEncryptorDecryptor.java similarity index 96% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/symmetric_encryption/SymmetricEncryptorDecryptor.java rename to src/main/java/org/pgpainless/pgpainless/symmetric_encryption/SymmetricEncryptorDecryptor.java index e68bc04e..22f355de 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/symmetric_encryption/SymmetricEncryptorDecryptor.java +++ b/src/main/java/org/pgpainless/pgpainless/symmetric_encryption/SymmetricEncryptorDecryptor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.symmetric_encryption; +package org.pgpainless.pgpainless.symmetric_encryption; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -24,8 +24,6 @@ import java.io.OutputStream; import java.security.SecureRandom; import java.util.Date; -import de.vanitasvitae.crypto.pgpainless.algorithm.CompressionAlgorithm; -import de.vanitasvitae.crypto.pgpainless.algorithm.SymmetricKeyAlgorithm; import org.bouncycastle.openpgp.PGPCompressedData; import org.bouncycastle.openpgp.PGPCompressedDataGenerator; import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; @@ -41,6 +39,8 @@ import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; import org.bouncycastle.openpgp.operator.jcajce.JcePBEKeyEncryptionMethodGenerator; import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; import org.bouncycastle.util.io.Streams; +import org.pgpainless.pgpainless.algorithm.CompressionAlgorithm; +import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm; /** * Stolen from diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/util/BCUtil.java b/src/main/java/org/pgpainless/pgpainless/util/BCUtil.java similarity index 97% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/util/BCUtil.java rename to src/main/java/org/pgpainless/pgpainless/util/BCUtil.java index 736722a8..d0efda77 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/util/BCUtil.java +++ b/src/main/java/org/pgpainless/pgpainless/util/BCUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.util; +package org.pgpainless.pgpainless.util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -23,7 +23,6 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -31,7 +30,6 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import de.vanitasvitae.crypto.pgpainless.algorithm.KeyFlag; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKey; import org.bouncycastle.openpgp.PGPPublicKeyRing; @@ -40,10 +38,10 @@ import org.bouncycastle.openpgp.PGPSecretKey; import org.bouncycastle.openpgp.PGPSecretKeyRing; import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator; import org.bouncycastle.openpgp.PGPSignatureSubpacketVector; import org.bouncycastle.openpgp.PGPUtil; import org.bouncycastle.util.io.Streams; +import org.pgpainless.pgpainless.algorithm.KeyFlag; public class BCUtil { diff --git a/src/main/java/de/vanitasvitae/crypto/pgpainless/util/MultiMap.java b/src/main/java/org/pgpainless/pgpainless/util/MultiMap.java similarity index 93% rename from src/main/java/de/vanitasvitae/crypto/pgpainless/util/MultiMap.java rename to src/main/java/org/pgpainless/pgpainless/util/MultiMap.java index a111d1d5..e6134f4a 100644 --- a/src/main/java/de/vanitasvitae/crypto/pgpainless/util/MultiMap.java +++ b/src/main/java/org/pgpainless/pgpainless/util/MultiMap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless.util; +package org.pgpainless.pgpainless.util; import java.util.Collection; import java.util.HashMap; @@ -64,11 +64,7 @@ public class MultiMap { } public void put(K k, V v) { - Set values = map.get(k); - if (values == null) { - values = new HashSet<>(); - map.put(k, values); - } + Set values = map.computeIfAbsent(k, k1 -> new HashSet<>()); values.add(v); } diff --git a/src/test/java/de/vanitasvitae/crypto/pgpainless/AbstractPGPainlessTest.java b/src/test/java/org/pgpainless/pgpainless/AbstractPGPainlessTest.java similarity index 95% rename from src/test/java/de/vanitasvitae/crypto/pgpainless/AbstractPGPainlessTest.java rename to src/test/java/org/pgpainless/pgpainless/AbstractPGPainlessTest.java index 2507149e..0fd81952 100644 --- a/src/test/java/de/vanitasvitae/crypto/pgpainless/AbstractPGPainlessTest.java +++ b/src/test/java/org/pgpainless/pgpainless/AbstractPGPainlessTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless; +package org.pgpainless.pgpainless; import java.security.Security; diff --git a/src/test/java/de/vanitasvitae/crypto/pgpainless/BCUtilTest.java b/src/test/java/org/pgpainless/pgpainless/BCUtilTest.java similarity index 96% rename from src/test/java/de/vanitasvitae/crypto/pgpainless/BCUtilTest.java rename to src/test/java/org/pgpainless/pgpainless/BCUtilTest.java index 94f5ecbf..1a874cee 100644 --- a/src/test/java/de/vanitasvitae/crypto/pgpainless/BCUtilTest.java +++ b/src/test/java/org/pgpainless/pgpainless/BCUtilTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless; +package org.pgpainless.pgpainless; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; @@ -27,8 +27,6 @@ import java.util.Iterator; import java.util.logging.Level; import java.util.logging.Logger; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.length.RsaLength; -import de.vanitasvitae.crypto.pgpainless.util.BCUtil; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKey; import org.bouncycastle.openpgp.PGPPublicKeyRing; @@ -37,6 +35,8 @@ import org.bouncycastle.openpgp.PGPSecretKey; import org.bouncycastle.openpgp.PGPSecretKeyRing; import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; import org.junit.Test; +import org.pgpainless.pgpainless.key.generation.type.length.RsaLength; +import org.pgpainless.pgpainless.util.BCUtil; public class BCUtilTest extends AbstractPGPainlessTest { diff --git a/src/test/java/de/vanitasvitae/crypto/pgpainless/EncryptDecryptTest.java b/src/test/java/org/pgpainless/pgpainless/EncryptDecryptTest.java similarity index 88% rename from src/test/java/de/vanitasvitae/crypto/pgpainless/EncryptDecryptTest.java rename to src/test/java/org/pgpainless/pgpainless/EncryptDecryptTest.java index b84eff21..cfdc4ea6 100644 --- a/src/test/java/de/vanitasvitae/crypto/pgpainless/EncryptDecryptTest.java +++ b/src/test/java/org/pgpainless/pgpainless/EncryptDecryptTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless; +package org.pgpainless.pgpainless; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertFalse; @@ -31,26 +31,26 @@ import java.util.Collections; import java.util.logging.Level; import java.util.logging.Logger; -import de.vanitasvitae.crypto.pgpainless.algorithm.KeyFlag; -import de.vanitasvitae.crypto.pgpainless.algorithm.PublicKeyAlgorithm; -import de.vanitasvitae.crypto.pgpainless.algorithm.SymmetricKeyAlgorithm; -import de.vanitasvitae.crypto.pgpainless.decryption_verification.DecryptionStream; -import de.vanitasvitae.crypto.pgpainless.decryption_verification.PainlessResult; -import de.vanitasvitae.crypto.pgpainless.encryption_signing.EncryptionStream; -import de.vanitasvitae.crypto.pgpainless.key.SecretKeyRingProtector; -import de.vanitasvitae.crypto.pgpainless.key.UnprotectedKeysProtector; -import de.vanitasvitae.crypto.pgpainless.key.generation.KeySpec; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.ElGamal_GENERAL; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.RSA_GENERAL; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.length.ElGamalLength; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.length.RsaLength; -import de.vanitasvitae.crypto.pgpainless.util.BCUtil; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.PGPSecretKeyRing; import org.bouncycastle.util.io.Streams; import org.junit.Ignore; import org.junit.Test; +import org.pgpainless.pgpainless.algorithm.KeyFlag; +import org.pgpainless.pgpainless.algorithm.PublicKeyAlgorithm; +import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm; +import org.pgpainless.pgpainless.decryption_verification.DecryptionStream; +import org.pgpainless.pgpainless.decryption_verification.PainlessResult; +import org.pgpainless.pgpainless.encryption_signing.EncryptionStream; +import org.pgpainless.pgpainless.key.SecretKeyRingProtector; +import org.pgpainless.pgpainless.key.UnprotectedKeysProtector; +import org.pgpainless.pgpainless.key.generation.KeySpec; +import org.pgpainless.pgpainless.key.generation.type.ElGamal_GENERAL; +import org.pgpainless.pgpainless.key.generation.type.RSA_GENERAL; +import org.pgpainless.pgpainless.key.generation.type.length.ElGamalLength; +import org.pgpainless.pgpainless.key.generation.type.length.RsaLength; +import org.pgpainless.pgpainless.util.BCUtil; public class EncryptDecryptTest extends AbstractPGPainlessTest { diff --git a/src/test/java/de/vanitasvitae/crypto/pgpainless/LengthTest.java b/src/test/java/org/pgpainless/pgpainless/LengthTest.java similarity index 94% rename from src/test/java/de/vanitasvitae/crypto/pgpainless/LengthTest.java rename to src/test/java/org/pgpainless/pgpainless/LengthTest.java index 364b60c0..47d64a91 100644 --- a/src/test/java/de/vanitasvitae/crypto/pgpainless/LengthTest.java +++ b/src/test/java/org/pgpainless/pgpainless/LengthTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless; +package org.pgpainless.pgpainless; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -26,16 +26,15 @@ import java.util.Random; import java.util.logging.Level; import java.util.logging.Logger; -import de.vanitasvitae.crypto.pgpainless.key.SecretKeyRingProtector; -import de.vanitasvitae.crypto.pgpainless.key.UnprotectedKeysProtector; -import de.vanitasvitae.crypto.pgpainless.key.generation.type.length.RsaLength; -import de.vanitasvitae.crypto.pgpainless.util.BCUtil; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.PGPSecretKeyRing; import org.bouncycastle.util.io.Streams; import org.junit.Ignore; -import org.junit.Test; +import org.pgpainless.pgpainless.key.SecretKeyRingProtector; +import org.pgpainless.pgpainless.key.UnprotectedKeysProtector; +import org.pgpainless.pgpainless.key.generation.type.length.RsaLength; +import org.pgpainless.pgpainless.util.BCUtil; /** * Class used to determine the length of cipher-text depending on used algorithms. diff --git a/src/test/java/de/vanitasvitae/crypto/pgpainless/SymmetricTest.java b/src/test/java/org/pgpainless/pgpainless/SymmetricTest.java similarity index 95% rename from src/test/java/de/vanitasvitae/crypto/pgpainless/SymmetricTest.java rename to src/test/java/org/pgpainless/pgpainless/SymmetricTest.java index 13b19baf..9d7c3a99 100644 --- a/src/test/java/de/vanitasvitae/crypto/pgpainless/SymmetricTest.java +++ b/src/test/java/org/pgpainless/pgpainless/SymmetricTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless; +package org.pgpainless.pgpainless; import static junit.framework.TestCase.assertTrue; @@ -21,10 +21,10 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Arrays; -import de.vanitasvitae.crypto.pgpainless.algorithm.SymmetricKeyAlgorithm; import org.bouncycastle.bcpg.ArmoredOutputStream; import org.bouncycastle.openpgp.PGPException; import org.junit.Test; +import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm; public class SymmetricTest extends AbstractPGPainlessTest { diff --git a/src/test/java/de/vanitasvitae/crypto/pgpainless/TestKeys.java b/src/test/java/org/pgpainless/pgpainless/TestKeys.java similarity index 99% rename from src/test/java/de/vanitasvitae/crypto/pgpainless/TestKeys.java rename to src/test/java/org/pgpainless/pgpainless/TestKeys.java index 91b81063..b708bcda 100644 --- a/src/test/java/de/vanitasvitae/crypto/pgpainless/TestKeys.java +++ b/src/test/java/org/pgpainless/pgpainless/TestKeys.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless; +package org.pgpainless.pgpainless; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/src/test/java/de/vanitasvitae/crypto/pgpainless/TestKeysTest.java b/src/test/java/org/pgpainless/pgpainless/TestKeysTest.java similarity index 91% rename from src/test/java/de/vanitasvitae/crypto/pgpainless/TestKeysTest.java rename to src/test/java/org/pgpainless/pgpainless/TestKeysTest.java index e00ba18c..809a3142 100644 --- a/src/test/java/de/vanitasvitae/crypto/pgpainless/TestKeysTest.java +++ b/src/test/java/org/pgpainless/pgpainless/TestKeysTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.vanitasvitae.crypto.pgpainless; +package org.pgpainless.pgpainless; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertTrue; @@ -25,14 +25,14 @@ import java.nio.charset.Charset; import java.util.Arrays; import java.util.Collections; -import de.vanitasvitae.crypto.pgpainless.decryption_verification.DecryptionStream; -import de.vanitasvitae.crypto.pgpainless.key.UnprotectedKeysProtector; -import de.vanitasvitae.crypto.pgpainless.util.BCUtil; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPSecretKeyRing; import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; import org.bouncycastle.util.io.Streams; import org.junit.Test; +import org.pgpainless.pgpainless.decryption_verification.DecryptionStream; +import org.pgpainless.pgpainless.key.UnprotectedKeysProtector; +import org.pgpainless.pgpainless.util.BCUtil; public class TestKeysTest extends AbstractPGPainlessTest {