From 6a756c9a444cd6b1fb8f253e3e9568776116bd32 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Sat, 30 Jun 2018 16:03:21 +0200 Subject: [PATCH] Fix wrong package names of pgpainless imports --- ...asicOpenPgpInstantMessagingIntegrationTest.java | 2 +- .../SecretKeyBackupRestoreIntegrationTest.java | 2 +- .../bouncycastle/AbstractPainlessOpenPgpStore.java | 2 +- .../FileBasedPainlessOpenPgpStore.java | 2 +- .../ox/bouncycastle/PainlessOpenPgpProvider.java | 14 +++++++------- .../ox/bouncycastle/PainlessOpenPgpStore.java | 2 +- .../selection_strategy/BareJidUserId.java | 4 ++-- .../smackx/ox/bouncycastle/BackupRestoreTest.java | 2 +- .../ox/bouncycastle/DryOxEncryptionTest.java | 4 ++-- .../FileBasedPainlessOpenPgpStoreTest.java | 8 ++++---- .../ox/bouncycastle/SymmetricEncryptionTest.java | 4 ++-- .../smackx/ox/bouncycastle/UserIdTest.java | 4 ++-- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/BasicOpenPgpInstantMessagingIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/BasicOpenPgpInstantMessagingIntegrationTest.java index e29a0fd6f..2f126bfc5 100644 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/BasicOpenPgpInstantMessagingIntegrationTest.java +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/BasicOpenPgpInstantMessagingIntegrationTest.java @@ -37,7 +37,6 @@ import org.jivesoftware.smackx.ox.element.SigncryptElement; import org.jivesoftware.smackx.ox.listener.OxMessageListener; import org.jivesoftware.smackx.ox.util.PubSubDelegate; -import de.vanitasvitae.crypto.pgpainless.key.UnprotectedKeysProtector; import org.igniterealtime.smack.inttest.SmackIntegrationTest; import org.igniterealtime.smack.inttest.SmackIntegrationTestEnvironment; import org.igniterealtime.smack.inttest.TestNotPossibleException; @@ -45,6 +44,7 @@ import org.igniterealtime.smack.inttest.util.SimpleResultSyncPoint; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.pgpainless.pgpainless.key.UnprotectedKeysProtector; public class BasicOpenPgpInstantMessagingIntegrationTest extends AbstractOpenPgpIntegrationTest { diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/SecretKeyBackupRestoreIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/SecretKeyBackupRestoreIntegrationTest.java index 0404ea158..a06cc01a8 100644 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/SecretKeyBackupRestoreIntegrationTest.java +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/SecretKeyBackupRestoreIntegrationTest.java @@ -48,7 +48,6 @@ import org.jivesoftware.smackx.ox.exception.SmackOpenPgpException; import org.jivesoftware.smackx.ox.util.PubSubDelegate; import org.jivesoftware.smackx.pubsub.PubSubException; -import de.vanitasvitae.crypto.pgpainless.key.UnprotectedKeysProtector; import org.bouncycastle.openpgp.PGPException; import org.igniterealtime.smack.inttest.SmackIntegrationTest; import org.igniterealtime.smack.inttest.SmackIntegrationTestEnvironment; @@ -57,6 +56,7 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; +import org.pgpainless.pgpainless.key.UnprotectedKeysProtector; public class SecretKeyBackupRestoreIntegrationTest extends AbstractOpenPgpIntegrationTest { diff --git a/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/AbstractPainlessOpenPgpStore.java b/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/AbstractPainlessOpenPgpStore.java index 7fce4c010..305d34c36 100644 --- a/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/AbstractPainlessOpenPgpStore.java +++ b/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/AbstractPainlessOpenPgpStore.java @@ -22,12 +22,12 @@ import java.util.Map; import org.jivesoftware.smackx.ox.OpenPgpV4Fingerprint; -import de.vanitasvitae.crypto.pgpainless.key.SecretKeyRingProtector; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; import org.jxmpp.jid.BareJid; +import org.pgpainless.pgpainless.key.SecretKeyRingProtector; public abstract class AbstractPainlessOpenPgpStore implements PainlessOpenPgpStore { diff --git a/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/FileBasedPainlessOpenPgpStore.java b/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/FileBasedPainlessOpenPgpStore.java index ab1eff36a..4f19b6aa1 100644 --- a/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/FileBasedPainlessOpenPgpStore.java +++ b/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/FileBasedPainlessOpenPgpStore.java @@ -42,7 +42,6 @@ import org.jivesoftware.smackx.ox.exception.MissingOpenPgpKeyPairException; import org.jivesoftware.smackx.ox.exception.MissingOpenPgpPublicKeyException; import org.jivesoftware.smackx.ox.exception.SmackOpenPgpException; -import de.vanitasvitae.crypto.pgpainless.key.SecretKeyRingProtector; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; @@ -52,6 +51,7 @@ import org.bouncycastle.util.io.Streams; import org.jxmpp.jid.BareJid; import org.jxmpp.jid.impl.JidCreate; import org.jxmpp.util.XmppDateTime; +import org.pgpainless.pgpainless.key.SecretKeyRingProtector; public class FileBasedPainlessOpenPgpStore extends AbstractPainlessOpenPgpStore { diff --git a/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/PainlessOpenPgpProvider.java b/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/PainlessOpenPgpProvider.java index e5ac63a32..8fe08f618 100644 --- a/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/PainlessOpenPgpProvider.java +++ b/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/PainlessOpenPgpProvider.java @@ -48,13 +48,6 @@ import org.jivesoftware.smackx.ox.exception.SmackOpenPgpException; import org.jivesoftware.smackx.ox.util.DecryptedBytesAndMetadata; import org.jivesoftware.smackx.ox.util.KeyBytesAndFingerprint; -import de.vanitasvitae.crypto.pgpainless.PGPainless; -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.key.SecretKeyRingProtector; -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; @@ -65,6 +58,13 @@ import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; import org.bouncycastle.util.encoders.Hex; import org.bouncycastle.util.io.Streams; import org.jxmpp.jid.BareJid; +import org.pgpainless.pgpainless.PGPainless; +import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm; +import org.pgpainless.pgpainless.decryption_verification.DecryptionStream; +import org.pgpainless.pgpainless.decryption_verification.PainlessResult; +import org.pgpainless.pgpainless.key.SecretKeyRingProtector; +import org.pgpainless.pgpainless.key.generation.type.length.RsaLength; +import org.pgpainless.pgpainless.util.BCUtil; public class PainlessOpenPgpProvider implements OpenPgpProvider { diff --git a/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/PainlessOpenPgpStore.java b/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/PainlessOpenPgpStore.java index e086ce131..b1e1095b6 100644 --- a/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/PainlessOpenPgpStore.java +++ b/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/PainlessOpenPgpStore.java @@ -20,11 +20,11 @@ import java.io.IOException; import org.jivesoftware.smackx.ox.OpenPgpStore; -import de.vanitasvitae.crypto.pgpainless.key.SecretKeyRingProtector; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; import org.jxmpp.jid.BareJid; +import org.pgpainless.pgpainless.key.SecretKeyRingProtector; public interface PainlessOpenPgpStore extends OpenPgpStore { diff --git a/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/selection_strategy/BareJidUserId.java b/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/selection_strategy/BareJidUserId.java index 6f6fea36a..c5b3b614d 100644 --- a/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/selection_strategy/BareJidUserId.java +++ b/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/selection_strategy/BareJidUserId.java @@ -18,11 +18,11 @@ package org.jivesoftware.smackx.ox.bouncycastle.selection_strategy; 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.jxmpp.jid.BareJid; +import org.pgpainless.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy; +import org.pgpainless.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy; public class BareJidUserId { diff --git a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/BackupRestoreTest.java b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/BackupRestoreTest.java index e753a7275..a211ebffc 100644 --- a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/BackupRestoreTest.java +++ b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/BackupRestoreTest.java @@ -38,12 +38,12 @@ import org.jivesoftware.smackx.ox.exception.SmackOpenPgpException; import org.jivesoftware.smackx.ox.util.KeyBytesAndFingerprint; import org.jivesoftware.smackx.ox.util.SecretKeyBackupHelper; -import de.vanitasvitae.crypto.pgpainless.key.UnprotectedKeysProtector; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.jxmpp.jid.BareJid; import org.jxmpp.jid.JidTestUtil; +import org.pgpainless.pgpainless.key.UnprotectedKeysProtector; public class BackupRestoreTest extends OxTestSuite { diff --git a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/DryOxEncryptionTest.java b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/DryOxEncryptionTest.java index 91735039c..a824b0505 100644 --- a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/DryOxEncryptionTest.java +++ b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/DryOxEncryptionTest.java @@ -46,13 +46,13 @@ import org.jivesoftware.smackx.ox.exception.MissingOpenPgpPublicKeyException; import org.jivesoftware.smackx.ox.exception.MissingUserIdOnKeyException; import org.jivesoftware.smackx.ox.exception.SmackOpenPgpException; -import de.vanitasvitae.crypto.pgpainless.key.UnprotectedKeysProtector; -import de.vanitasvitae.crypto.pgpainless.util.BCUtil; import org.bouncycastle.util.encoders.Base64; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.jxmpp.jid.BareJid; +import org.pgpainless.pgpainless.key.UnprotectedKeysProtector; +import org.pgpainless.pgpainless.util.BCUtil; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/FileBasedPainlessOpenPgpStoreTest.java b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/FileBasedPainlessOpenPgpStoreTest.java index a829ef896..24f125a8e 100644 --- a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/FileBasedPainlessOpenPgpStoreTest.java +++ b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/FileBasedPainlessOpenPgpStoreTest.java @@ -29,10 +29,6 @@ import java.util.Collections; import org.jivesoftware.smack.util.FileUtils; -import de.vanitasvitae.crypto.pgpainless.PGPainless; -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.PGPPublicKeyRingCollection; @@ -44,6 +40,10 @@ import org.junit.Before; import org.junit.Test; import org.jxmpp.jid.BareJid; import org.jxmpp.jid.JidTestUtil; +import org.pgpainless.pgpainless.PGPainless; +import org.pgpainless.pgpainless.key.UnprotectedKeysProtector; +import org.pgpainless.pgpainless.key.generation.type.length.RsaLength; +import org.pgpainless.pgpainless.util.BCUtil; public class FileBasedPainlessOpenPgpStoreTest extends OxTestSuite { diff --git a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/SymmetricEncryptionTest.java b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/SymmetricEncryptionTest.java index 0d538d6ad..a026f9738 100644 --- a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/SymmetricEncryptionTest.java +++ b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/SymmetricEncryptionTest.java @@ -22,11 +22,11 @@ import java.io.IOException; import java.util.Arrays; import java.util.Random; -import de.vanitasvitae.crypto.pgpainless.PGPainless; -import de.vanitasvitae.crypto.pgpainless.algorithm.SymmetricKeyAlgorithm; import org.bouncycastle.openpgp.PGPDataValidationException; import org.bouncycastle.openpgp.PGPException; import org.junit.Test; +import org.pgpainless.pgpainless.PGPainless; +import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm; public class SymmetricEncryptionTest extends OxTestSuite { diff --git a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/UserIdTest.java b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/UserIdTest.java index e24e65986..04f41de82 100644 --- a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/UserIdTest.java +++ b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/UserIdTest.java @@ -26,8 +26,6 @@ import org.jivesoftware.smack.util.FileUtils; import org.jivesoftware.smackx.ox.exception.MissingUserIdOnKeyException; import org.jivesoftware.smackx.ox.exception.SmackOpenPgpException; -import de.vanitasvitae.crypto.pgpainless.PGPainless; -import de.vanitasvitae.crypto.pgpainless.key.UnprotectedKeysProtector; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPSecretKeyRing; import org.junit.After; @@ -35,6 +33,8 @@ import org.junit.Before; import org.junit.Test; import org.jxmpp.jid.BareJid; import org.jxmpp.jid.JidTestUtil; +import org.pgpainless.pgpainless.PGPainless; +import org.pgpainless.pgpainless.key.UnprotectedKeysProtector; public class UserIdTest extends OxTestSuite {