From 2c110f129568e731edb8c9d33227a86ca9c0bece Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Fri, 6 Jul 2018 14:15:40 +0200 Subject: [PATCH] Adopt latest pgpainless changes --- .../openpgp/BasicOpenPgpInstantMessagingIntegrationTest.java | 2 +- .../smackx/openpgp/SecretKeyBackupRestoreIntegrationTest.java | 2 +- .../smackx/ox/bouncycastle/AbstractPainlessOpenPgpStore.java | 2 +- .../smackx/ox/bouncycastle/FileBasedPainlessOpenPgpStore.java | 2 +- .../smackx/ox/bouncycastle/PainlessOpenPgpProvider.java | 2 +- .../smackx/ox/bouncycastle/PainlessOpenPgpStore.java | 2 +- .../jivesoftware/smackx/ox/bouncycastle/BackupRestoreTest.java | 2 +- .../smackx/ox/bouncycastle/DryOxEncryptionTest.java | 2 +- .../ox/bouncycastle/FileBasedPainlessOpenPgpStoreTest.java | 2 +- .../org/jivesoftware/smackx/ox/bouncycastle/UserIdTest.java | 2 +- 10 files changed, 10 insertions(+), 10 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 170f24140..8a3ee85a5 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 @@ -43,7 +43,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; +import org.pgpainless.pgpainless.key.protection.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 e97fdba0b..70b81346b 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 @@ -56,7 +56,7 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.pgpainless.pgpainless.key.UnprotectedKeysProtector; +import org.pgpainless.pgpainless.key.protection.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 185631f04..8ef4c3a9d 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 @@ -27,7 +27,7 @@ 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; +import org.pgpainless.pgpainless.key.protection.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 4f19b6aa1..d00b26e82 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 @@ -51,7 +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; +import org.pgpainless.pgpainless.key.protection.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 32b3b8067..7a2a92de3 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 @@ -62,8 +62,8 @@ 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.key.protection.SecretKeyRingProtector; 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 b1e1095b6..2810d8675 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 @@ -24,7 +24,7 @@ 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; +import org.pgpainless.pgpainless.key.protection.SecretKeyRingProtector; public interface PainlessOpenPgpStore extends OpenPgpStore { 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 a211ebffc..c9af1dd52 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 @@ -43,7 +43,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.jxmpp.jid.BareJid; import org.jxmpp.jid.JidTestUtil; -import org.pgpainless.pgpainless.key.UnprotectedKeysProtector; +import org.pgpainless.pgpainless.key.protection.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 0b719eb1a..c7ccd41f6 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 @@ -52,7 +52,7 @@ 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.key.protection.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 24f125a8e..a71ae662e 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 @@ -41,8 +41,8 @@ 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.key.protection.UnprotectedKeysProtector; 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/UserIdTest.java b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/UserIdTest.java index 04f41de82..35e9e0f7d 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 @@ -34,7 +34,7 @@ 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.protection.UnprotectedKeysProtector; public class UserIdTest extends OxTestSuite {