From e7784b10a40ab18fdd644db5d35eecdbbc530d8b Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Thu, 22 Feb 2024 14:25:26 +0100 Subject: [PATCH] Fix package name of extension functions --- .../kotlin/org/pgpainless/key/generation/OpenPgpKeyGenerator.kt | 2 +- .../org/pgpainless/key/generation/OpenPgpKeyPairGenerator.kt | 2 +- .../org/pgpainless/key/generation/MalformedKeyGenerationTest.kt | 2 +- .../org/pgpainless/key/generation/OpenPgpKeyGeneratorTest.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/OpenPgpKeyGenerator.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/OpenPgpKeyGenerator.kt index d93e79c0..e66fbe7a 100644 --- a/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/OpenPgpKeyGenerator.kt +++ b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/OpenPgpKeyGenerator.kt @@ -8,7 +8,6 @@ import java.io.InputStream import java.util.* import openpgp.formatUTC import org.bouncycastle.bcpg.attr.ImageAttribute -import org.bouncycastle.extensions.plusCertification import org.bouncycastle.openpgp.PGPKeyPair import org.bouncycastle.openpgp.PGPSecretKey import org.bouncycastle.openpgp.PGPSecretKeyRing @@ -21,6 +20,7 @@ import org.pgpainless.algorithm.CertificationType import org.pgpainless.algorithm.HashAlgorithm import org.pgpainless.algorithm.KeyFlag import org.pgpainless.algorithm.PublicKeyAlgorithm +import org.pgpainless.bouncycastle.extensions.plusCertification import org.pgpainless.implementation.ImplementationFactory import org.pgpainless.key.generation.DefinePrimaryKey.PrimaryKeyBuilder import org.pgpainless.key.generation.DefineSubkeys.SubkeyBuilder diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/OpenPgpKeyPairGenerator.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/OpenPgpKeyPairGenerator.kt index a8a41dbf..90005cab 100644 --- a/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/OpenPgpKeyPairGenerator.kt +++ b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/OpenPgpKeyPairGenerator.kt @@ -3,9 +3,9 @@ package org.pgpainless.key.generation import java.security.KeyPair import java.security.KeyPairGenerator import java.util.* +import org.bouncycastle.openpgp.PGPKeyPair import org.pgpainless.bouncycastle.extensions.toPrimaryKeyFormat import org.pgpainless.bouncycastle.extensions.toSubkeyFormat -import org.bouncycastle.openpgp.PGPKeyPair import org.pgpainless.implementation.ImplementationFactory import org.pgpainless.key.generation.type.KeyType import org.pgpainless.provider.ProviderFactory diff --git a/pgpainless-core/src/test/kotlin/org/pgpainless/key/generation/MalformedKeyGenerationTest.kt b/pgpainless-core/src/test/kotlin/org/pgpainless/key/generation/MalformedKeyGenerationTest.kt index e304cefe..07e91775 100644 --- a/pgpainless-core/src/test/kotlin/org/pgpainless/key/generation/MalformedKeyGenerationTest.kt +++ b/pgpainless-core/src/test/kotlin/org/pgpainless/key/generation/MalformedKeyGenerationTest.kt @@ -7,11 +7,11 @@ package org.pgpainless.key.generation import org.bouncycastle.bcpg.sig.Exportable import org.bouncycastle.bcpg.sig.PrimaryUserID import org.bouncycastle.bcpg.sig.Revocable -import org.bouncycastle.extensions.toAsciiArmor import org.junit.jupiter.api.Test import org.pgpainless.PGPainless import org.pgpainless.algorithm.HashAlgorithm import org.pgpainless.algorithm.KeyFlag +import org.pgpainless.bouncycastle.extensions.toAsciiArmor import org.pgpainless.key.generation.type.KeyType import org.pgpainless.key.generation.type.eddsa.EdDSACurve import org.pgpainless.key.generation.type.xdh.XDHSpec diff --git a/pgpainless-core/src/test/kotlin/org/pgpainless/key/generation/OpenPgpKeyGeneratorTest.kt b/pgpainless-core/src/test/kotlin/org/pgpainless/key/generation/OpenPgpKeyGeneratorTest.kt index c716665f..8ddb3ef2 100644 --- a/pgpainless-core/src/test/kotlin/org/pgpainless/key/generation/OpenPgpKeyGeneratorTest.kt +++ b/pgpainless-core/src/test/kotlin/org/pgpainless/key/generation/OpenPgpKeyGeneratorTest.kt @@ -5,7 +5,6 @@ package org.pgpainless.key.generation import org.bouncycastle.bcpg.sig.PrimaryUserID -import org.bouncycastle.extensions.toAsciiArmor import org.bouncycastle.openpgp.PGPUserAttributeSubpacketVectorGenerator import org.bouncycastle.util.encoders.Hex import org.junit.jupiter.api.Assertions.assertArrayEquals @@ -17,6 +16,7 @@ import org.pgpainless.PGPainless import org.pgpainless.algorithm.HashAlgorithm import org.pgpainless.algorithm.KeyFlag import org.pgpainless.algorithm.PublicKeyAlgorithm +import org.pgpainless.bouncycastle.extensions.toAsciiArmor import org.pgpainless.key.generation.type.KeyType import org.pgpainless.key.generation.type.eddsa.EdDSACurve import org.pgpainless.key.generation.type.rsa.RsaLength