diff options
Diffstat (limited to 'pg/src')
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/PGPEncryptedDataGenerator.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/PGPEncryptedDataGenerator.java) | 22 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/PGPKeyPair.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/PGPKeyPair.java) | 10 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/PGPKeyRingGenerator.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/PGPKeyRingGenerator.java) | 10 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/PGPLiteralDataGenerator.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/PGPLiteralDataGenerator.java) | 8 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/PGPObjectFactory.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/PGPObjectFactory.java) | 10 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/PGPOnePassSignature.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/PGPOnePassSignature.java) | 14 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/PGPPBEEncryptedData.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/PGPPBEEncryptedData.java) | 16 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/PGPPrivateKey.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/PGPPrivateKey.java) | 12 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/PGPPublicKey.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/PGPPublicKey.java) | 28 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/PGPPublicKeyEncryptedData.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/PGPPublicKeyEncryptedData.java) | 18 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/PGPPublicKeyRing.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKeyRing.java) | 12 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/PGPSecretKey.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/PGPSecretKey.java) | 40 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/PGPSecretKeyRing.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/PGPSecretKeyRing.java) | 20 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/PGPSignature.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/PGPSignature.java) | 32 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/PGPSignatureException.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/PGPSignatureException.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/PGPSignatureGenerator.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/PGPSignatureGenerator.java) | 26 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/PGPUtil.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/PGPUtil.java) | 16 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/PGPV3SignatureGenerator.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/PGPV3SignatureGenerator.java) | 14 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/test/BcPGPDSAElGamalTest.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/test/BcPGPDSAElGamalTest.java) | 82 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/test/BcPGPDSATest.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/test/BcPGPDSATest.java) | 66 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/test/BcPGPKeyRingTest.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/test/BcPGPKeyRingTest.java) | 68 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/test/BcPGPPBETest.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/test/BcPGPPBETest.java) | 32 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/test/BcPGPRSATest.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/test/BcPGPRSATest.java) | 126 | ||||
| -rw-r--r-- | pg/src/main/j2me/org/spongycastle/openpgp/test/RegressionTest.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/test/RegressionTest.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/apache/bzip2/BZip2Constants.java (renamed from pg/src/main/java/org/bouncycastle/apache/bzip2/BZip2Constants.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/apache/bzip2/CBZip2InputStream.java (renamed from pg/src/main/java/org/bouncycastle/apache/bzip2/CBZip2InputStream.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/apache/bzip2/CBZip2OutputStream.java (renamed from pg/src/main/java/org/bouncycastle/apache/bzip2/CBZip2OutputStream.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/apache/bzip2/CRC.java (renamed from pg/src/main/java/org/bouncycastle/apache/bzip2/CRC.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/ArmoredInputStream.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/ArmoredInputStream.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/ArmoredOutputStream.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/ArmoredOutputStream.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/BCPGInputStream.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/BCPGInputStream.java) | 4 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/BCPGKey.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/BCPGKey.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/BCPGObject.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/BCPGObject.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/BCPGOutputStream.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/BCPGOutputStream.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/CRC24.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/CRC24.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/CompressedDataPacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/CompressedDataPacket.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/CompressionAlgorithmTags.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/CompressionAlgorithmTags.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/ContainedPacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/ContainedPacket.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/DSAPublicBCPGKey.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/DSAPublicBCPGKey.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/DSASecretBCPGKey.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/DSASecretBCPGKey.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/ECDHPublicBCPGKey.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/ECDHPublicBCPGKey.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/ECDSAPublicBCPGKey.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/ECDSAPublicBCPGKey.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/ECPublicBCPGKey.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/ECPublicBCPGKey.java) | 22 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/ECSecretBCPGKey.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/ECSecretBCPGKey.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/ElGamalPublicBCPGKey.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/ElGamalPublicBCPGKey.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/ElGamalSecretBCPGKey.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/ElGamalSecretBCPGKey.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/ExperimentalPacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/ExperimentalPacket.java) | 4 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/HashAlgorithmTags.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/HashAlgorithmTags.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/InputStreamPacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/InputStreamPacket.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/LiteralDataPacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/LiteralDataPacket.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/MPInteger.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/MPInteger.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/MarkerPacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/MarkerPacket.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/ModDetectionCodePacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/ModDetectionCodePacket.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/OnePassSignaturePacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/OnePassSignaturePacket.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/OutputStreamPacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/OutputStreamPacket.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/Packet.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/Packet.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/PacketTags.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/PacketTags.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/PublicKeyAlgorithmTags.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/PublicKeyAlgorithmTags.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/PublicKeyEncSessionPacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/PublicKeyEncSessionPacket.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/PublicKeyPacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/PublicKeyPacket.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/PublicSubkeyPacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/PublicSubkeyPacket.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/RSAPublicBCPGKey.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/RSAPublicBCPGKey.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/RSASecretBCPGKey.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/RSASecretBCPGKey.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/S2K.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/S2K.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/SecretKeyPacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/SecretKeyPacket.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/SecretSubkeyPacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/SecretSubkeyPacket.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/SignaturePacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/SignaturePacket.java) | 8 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/SignatureSubpacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/SignatureSubpacket.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/SignatureSubpacketInputStream.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/SignatureSubpacketInputStream.java) | 30 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/SignatureSubpacketTags.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/SignatureSubpacketTags.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/SymmetricEncDataPacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/SymmetricEncDataPacket.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/SymmetricEncIntegrityPacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/SymmetricEncIntegrityPacket.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/SymmetricKeyAlgorithmTags.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/SymmetricKeyAlgorithmTags.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/SymmetricKeyEncSessionPacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/SymmetricKeyEncSessionPacket.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/TrustPacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/TrustPacket.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/UserAttributePacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/UserAttributePacket.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/UserAttributeSubpacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/UserAttributeSubpacket.java) | 4 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/UserAttributeSubpacketInputStream.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/UserAttributeSubpacketInputStream.java) | 4 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/UserAttributeSubpacketTags.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/UserAttributeSubpacketTags.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/UserIDPacket.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/UserIDPacket.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/attr/ImageAttribute.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/attr/ImageAttribute.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/sig/EmbeddedSignature.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/sig/EmbeddedSignature.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/sig/Exportable.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/sig/Exportable.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/sig/Features.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/sig/Features.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/sig/IssuerKeyID.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/sig/IssuerKeyID.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/sig/KeyExpirationTime.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/sig/KeyExpirationTime.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/sig/KeyFlags.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/sig/KeyFlags.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/sig/NotationData.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/sig/NotationData.java) | 8 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/sig/PreferredAlgorithms.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/sig/PreferredAlgorithms.java) | 4 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/sig/PrimaryUserID.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/sig/PrimaryUserID.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/sig/Revocable.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/sig/Revocable.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/sig/RevocationKey.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/sig/RevocationKey.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/sig/RevocationKeyTags.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/sig/RevocationKeyTags.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/sig/RevocationReason.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/sig/RevocationReason.java) | 8 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/sig/RevocationReasonTags.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/sig/RevocationReasonTags.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/sig/SignatureCreationTime.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/sig/SignatureCreationTime.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/sig/SignatureExpirationTime.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/sig/SignatureExpirationTime.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/sig/SignerUserID.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/sig/SignerUserID.java) | 10 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/bcpg/sig/TrustSignature.java (renamed from pg/src/main/java/org/bouncycastle/bcpg/sig/TrustSignature.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPAlgorithmParameters.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPAlgorithmParameters.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPCompressedData.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPCompressedData.java) | 12 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPCompressedDataGenerator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPCompressedDataGenerator.java) | 10 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPDataValidationException.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPDataValidationException.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPEncryptedData.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPEncryptedData.java) | 16 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPEncryptedDataGenerator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPEncryptedDataGenerator.java) | 22 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPEncryptedDataList.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPEncryptedDataList.java) | 12 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPException.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPException.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPKdfParameters.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPKdfParameters.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPKeyFlags.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPKeyFlags.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPKeyPair.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPKeyPair.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPKeyRing.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPKeyRing.java) | 16 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPKeyRingGenerator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPKeyRingGenerator.java) | 10 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPKeyValidationException.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPKeyValidationException.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPLiteralData.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPLiteralData.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPLiteralDataGenerator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPLiteralDataGenerator.java) | 8 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPMarker.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPMarker.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPObjectFactory.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPObjectFactory.java) | 14 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPOnePassSignature.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPOnePassSignature.java) | 14 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPOnePassSignatureList.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPOnePassSignatureList.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPPBEEncryptedData.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPPBEEncryptedData.java) | 18 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPPrivateKey.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPPrivateKey.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPPublicKey.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKey.java) | 28 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPPublicKeyEncryptedData.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKeyEncryptedData.java) | 18 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPPublicKeyRing.java (renamed from pg/src/main/j2me/org/bouncycastle/openpgp/PGPPublicKeyRing.java) | 12 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPPublicKeyRingCollection.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKeyRingCollection.java) | 10 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPRuntimeOperationException.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPRuntimeOperationException.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPSecretKey.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPSecretKey.java) | 52 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPSecretKeyRing.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPSecretKeyRing.java) | 20 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPSecretKeyRingCollection.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPSecretKeyRingCollection.java) | 10 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPSignature.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPSignature.java) | 32 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPSignatureGenerator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPSignatureGenerator.java) | 26 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPSignatureList.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPSignatureList.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPSignatureSubpacketGenerator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPSignatureSubpacketGenerator.java) | 40 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPSignatureSubpacketVector.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPSignatureSubpacketVector.java) | 28 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPUserAttributeSubpacketVector.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPUserAttributeSubpacketVector.java) | 8 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPUserAttributeSubpacketVectorGenerator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPUserAttributeSubpacketVectorGenerator.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPUtil.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPUtil.java) | 22 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/PGPV3SignatureGenerator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/PGPV3SignatureGenerator.java) | 14 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/SXprUtils.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/SXprUtils.java) | 8 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/StreamGenerator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/StreamGenerator.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/WrappedGeneratorStream.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/WrappedGeneratorStream.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/bc/BcPGPObjectFactory.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/bc/BcPGPObjectFactory.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/bc/BcPGPPublicKeyRing.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/bc/BcPGPPublicKeyRing.java) | 8 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/bc/BcPGPPublicKeyRingCollection.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/bc/BcPGPPublicKeyRingCollection.java) | 8 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/bc/BcPGPSecretKeyRing.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/bc/BcPGPSecretKeyRing.java) | 10 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/bc/BcPGPSecretKeyRingCollection.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/bc/BcPGPSecretKeyRingCollection.java) | 8 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/examples/ByteArrayHandler.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/examples/ByteArrayHandler.java) | 46 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/examples/ClearSignedFileProcessor.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/examples/ClearSignedFileProcessor.java) | 46 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/examples/DSAElGamalKeyRingGenerator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/examples/DSAElGamalKeyRingGenerator.java) | 38 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/examples/DetachedSignatureProcessor.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/examples/DetachedSignatureProcessor.java) | 44 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/examples/DirectKeySignature.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/examples/DirectKeySignature.java) | 38 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/examples/KeyBasedFileProcessor.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/examples/KeyBasedFileProcessor.java) | 50 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/examples/KeyBasedLargeFileProcessor.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/examples/KeyBasedLargeFileProcessor.java) | 50 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/examples/PBEFileProcessor.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/examples/PBEFileProcessor.java) | 42 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/examples/PGPExampleUtil.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/examples/PGPExampleUtil.java) | 30 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/examples/PubringDump.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/examples/PubringDump.java) | 20 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/examples/RSAKeyPairGenerator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/examples/RSAKeyPairGenerator.java) | 34 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/examples/SignedFileProcessor.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/examples/SignedFileProcessor.java) | 56 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/jcajce/JcaPGPObjectFactory.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/jcajce/JcaPGPObjectFactory.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/jcajce/JcaPGPPublicKeyRing.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/jcajce/JcaPGPPublicKeyRing.java) | 8 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/jcajce/JcaPGPPublicKeyRingCollection.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/jcajce/JcaPGPPublicKeyRingCollection.java) | 8 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/jcajce/JcaPGPSecretKeyRing.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/jcajce/JcaPGPSecretKeyRing.java) | 10 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/jcajce/JcaPGPSecretKeyRingCollection.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/jcajce/JcaPGPSecretKeyRingCollection.java) | 8 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/KeyFingerPrintCalculator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/KeyFingerPrintCalculator.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PBEDataDecryptorFactory.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PBEDataDecryptorFactory.java) | 8 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PBEKeyEncryptionMethodGenerator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PBEKeyEncryptionMethodGenerator.java) | 12 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PBEProtectionRemoverFactory.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PBEProtectionRemoverFactory.java) | 4 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PBESecretKeyDecryptor.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PBESecretKeyDecryptor.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PBESecretKeyEncryptor.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PBESecretKeyEncryptor.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PGPContentSigner.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PGPContentSigner.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PGPContentSignerBuilder.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PGPContentSignerBuilder.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PGPContentVerifier.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PGPContentVerifier.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PGPContentVerifierBuilder.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PGPContentVerifierBuilder.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PGPContentVerifierBuilderProvider.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PGPContentVerifierBuilderProvider.java) | 4 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PGPDataDecryptor.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDataDecryptor.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PGPDataDecryptorFactory.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDataDecryptorFactory.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PGPDataDecryptorProvider.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDataDecryptorProvider.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PGPDataEncryptor.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDataEncryptor.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PGPDataEncryptorBuilder.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDataEncryptorBuilder.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PGPDigestCalculator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDigestCalculator.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PGPDigestCalculatorProvider.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDigestCalculatorProvider.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PGPKeyEncryptionMethodGenerator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PGPKeyEncryptionMethodGenerator.java) | 10 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PGPPad.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PGPPad.java) | 4 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PGPUtil.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PGPUtil.java) | 12 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PublicKeyDataDecryptorFactory.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PublicKeyDataDecryptorFactory.java) | 4 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/PublicKeyKeyEncryptionMethodGenerator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/PublicKeyKeyEncryptionMethodGenerator.java) | 12 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/RFC6637KDFCalculator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/RFC6637KDFCalculator.java) | 14 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcImplProvider.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcImplProvider.java) | 74 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcKeyFingerprintCalculator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcKeyFingerprintCalculator.java) | 20 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPBEDataDecryptorFactory.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBEDataDecryptorFactory.java) | 12 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPBEKeyEncryptionMethodGenerator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBEKeyEncryptionMethodGenerator.java) | 16 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPBESecretKeyDecryptorBuilder.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBESecretKeyDecryptorBuilder.java) | 12 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPBESecretKeyEncryptorBuilder.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBESecretKeyEncryptorBuilder.java) | 14 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPGPContentSignerBuilder.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPContentSignerBuilder.java) | 20 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPGPContentVerifierBuilderProvider.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPContentVerifierBuilderProvider.java) | 14 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPGPDataEncryptorBuilder.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPDataEncryptorBuilder.java) | 18 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPGPDigestCalculatorProvider.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPDigestCalculatorProvider.java) | 10 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPGPKeyConverter.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPKeyConverter.java) | 68 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPGPKeyPair.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPKeyPair.java) | 14 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPublicKeyDataDecryptorFactory.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPublicKeyDataDecryptorFactory.java) | 44 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPublicKeyKeyEncryptionMethodGenerator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPublicKeyKeyEncryptionMethodGenerator.java) | 50 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcUtil.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcUtil.java) | 20 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/bc/SHA1PGPDigestCalculator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/bc/SHA1PGPDigestCalculator.java) | 10 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/bc/SignerOutputStream.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/bc/SignerOutputStream.java) | 4 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaKeyFingerprintCalculator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaKeyFingerprintCalculator.java) | 14 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaPGPContentSignerBuilder.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPContentSignerBuilder.java) | 20 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaPGPContentVerifierBuilderProvider.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPContentVerifierBuilderProvider.java) | 20 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaPGPDigestCalculatorProviderBuilder.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPDigestCalculatorProviderBuilder.java) | 14 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaPGPKeyConverter.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPKeyConverter.java) | 78 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaPGPKeyPair.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPKeyPair.java) | 12 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaPGPPrivateKey.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPPrivateKey.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePBEDataDecryptorFactoryBuilder.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePBEDataDecryptorFactoryBuilder.java) | 16 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePBEKeyEncryptionMethodGenerator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePBEKeyEncryptionMethodGenerator.java) | 16 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePBEProtectionRemoverFactory.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePBEProtectionRemoverFactory.java) | 16 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePBESecretKeyDecryptorBuilder.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePBESecretKeyDecryptorBuilder.java) | 14 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePBESecretKeyEncryptorBuilder.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePBESecretKeyEncryptorBuilder.java) | 14 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePGPDataEncryptorBuilder.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePGPDataEncryptorBuilder.java) | 18 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePublicKeyDataDecryptorFactoryBuilder.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePublicKeyDataDecryptorFactoryBuilder.java) | 40 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePublicKeyKeyEncryptionMethodGenerator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePublicKeyKeyEncryptionMethodGenerator.java) | 48 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/OperatorHelper.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/OperatorHelper.java) | 16 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/PGPUtil.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/PGPUtil.java) | 10 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/SHA1PGPDigestCalculator.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/SHA1PGPDigestCalculator.java) | 6 | ||||
| -rw-r--r-- | pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/SignatureOutputStream.java (renamed from pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/SignatureOutputStream.java) | 2 | ||||
| -rw-r--r-- | pg/src/main/javadoc/org/bouncycastle/openpgp/examples/package.html | 5 | ||||
| -rw-r--r-- | pg/src/main/javadoc/org/bouncycastle/openpgp/examples/test/package.html | 5 | ||||
| -rw-r--r-- | pg/src/main/javadoc/org/spongycastle/bcpg/attr/package.html (renamed from pg/src/main/javadoc/org/bouncycastle/bcpg/attr/package.html) | 0 | ||||
| -rw-r--r-- | pg/src/main/javadoc/org/spongycastle/bcpg/package.html (renamed from pg/src/main/javadoc/org/bouncycastle/bcpg/package.html) | 2 | ||||
| -rw-r--r-- | pg/src/main/javadoc/org/spongycastle/bcpg/sig/package.html (renamed from pg/src/main/javadoc/org/bouncycastle/bcpg/sig/package.html) | 0 | ||||
| -rw-r--r-- | pg/src/main/javadoc/org/spongycastle/openpgp/bc/package.html (renamed from pg/src/main/javadoc/org/bouncycastle/openpgp/bc/package.html) | 0 | ||||
| -rw-r--r-- | pg/src/main/javadoc/org/spongycastle/openpgp/examples/package.html | 5 | ||||
| -rw-r--r-- | pg/src/main/javadoc/org/spongycastle/openpgp/examples/test/package.html | 5 | ||||
| -rw-r--r-- | pg/src/main/javadoc/org/spongycastle/openpgp/jcajce/package.html (renamed from pg/src/main/javadoc/org/bouncycastle/openpgp/jcajce/package.html) | 0 | ||||
| -rw-r--r-- | pg/src/main/javadoc/org/spongycastle/openpgp/operator/bc/package.html (renamed from pg/src/main/javadoc/org/bouncycastle/openpgp/operator/bc/package.html) | 0 | ||||
| -rw-r--r-- | pg/src/main/javadoc/org/spongycastle/openpgp/operator/jcajce/package.html (renamed from pg/src/main/javadoc/org/bouncycastle/openpgp/operator/jcajce/package.html) | 0 | ||||
| -rw-r--r-- | pg/src/main/javadoc/org/spongycastle/openpgp/operator/package.html (renamed from pg/src/main/javadoc/org/bouncycastle/openpgp/operator/package.html) | 2 | ||||
| -rw-r--r-- | pg/src/main/javadoc/org/spongycastle/openpgp/package.html (renamed from pg/src/main/javadoc/org/bouncycastle/openpgp/package.html) | 2 | ||||
| -rw-r--r-- | pg/src/main/jdk1.1/org/spongycastle/openpgp/examples/DetachedSignatureProcessor.java (renamed from pg/src/main/jdk1.1/org/bouncycastle/openpgp/examples/DetachedSignatureProcessor.java) | 42 | ||||
| -rw-r--r-- | pg/src/main/jdk1.1/org/spongycastle/openpgp/operator/jcajce/JcaPGPContentSignerBuilder.java (renamed from pg/src/main/jdk1.1/org/bouncycastle/openpgp/operator/jcajce/JcaPGPContentSignerBuilder.java) | 20 | ||||
| -rw-r--r-- | pg/src/main/jdk1.1/org/spongycastle/openpgp/operator/jcajce/OperatorHelper.java (renamed from pg/src/main/jdk1.1/org/bouncycastle/openpgp/operator/jcajce/OperatorHelper.java) | 16 | ||||
| -rw-r--r-- | pg/src/main/jdk1.4/org/spongycastle/openpgp/operator/jcajce/JcaPGPKeyConverter.java (renamed from pg/src/main/jdk1.4/org/bouncycastle/openpgp/operator/jcajce/JcaPGPKeyConverter.java) | 84 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/examples/test/AllTests.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/examples/test/AllTests.java) | 18 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/AllTests.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/AllTests.java) | 8 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/BcPGPDSAElGamalTest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/BcPGPDSAElGamalTest.java) | 94 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/BcPGPDSATest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/BcPGPDSATest.java) | 84 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/BcPGPKeyRingTest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/BcPGPKeyRingTest.java) | 82 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/BcPGPPBETest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/BcPGPPBETest.java) | 38 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/BcPGPRSATest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/BcPGPRSATest.java) | 128 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/DSA2Test.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/DSA2Test.java) | 54 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/PGPArmoredTest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/PGPArmoredTest.java) | 18 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/PGPClearSignedSignatureTest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/PGPClearSignedSignatureTest.java) | 52 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/PGPCompressionTest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/PGPCompressionTest.java) | 16 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/PGPDSAElGamalTest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/PGPDSAElGamalTest.java) | 122 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/PGPDSATest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/PGPDSATest.java) | 96 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/PGPECDHTest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/PGPECDHTest.java) | 116 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/PGPECDSATest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/PGPECDSATest.java) | 100 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/PGPECMessageTest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/PGPECMessageTest.java) | 66 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/PGPKeyRingTest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/PGPKeyRingTest.java) | 146 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/PGPMarkerTest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/PGPMarkerTest.java) | 16 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/PGPNoPrivateKeyTest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/PGPNoPrivateKeyTest.java) | 24 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/PGPPBETest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/PGPPBETest.java) | 64 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/PGPPacketTest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/PGPPacketTest.java) | 14 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/PGPParsingTest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/PGPParsingTest.java) | 12 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/PGPRSATest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/PGPRSATest.java) | 218 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/PGPSignatureTest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/PGPSignatureTest.java) | 108 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/PGPUnicodeTest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/PGPUnicodeTest.java) | 28 | ||||
| -rw-r--r-- | pg/src/test/java/org/spongycastle/openpgp/test/RegressionTest.java (renamed from pg/src/test/java/org/bouncycastle/openpgp/test/RegressionTest.java) | 8 | ||||
| -rw-r--r-- | pg/src/test/jdk1.1/org/spongycastle/openpgp/test/BcPGPDSAElGamalTest.java (renamed from pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/BcPGPDSAElGamalTest.java) | 94 | ||||
| -rw-r--r-- | pg/src/test/jdk1.1/org/spongycastle/openpgp/test/BcPGPKeyRingTest.java (renamed from pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/BcPGPKeyRingTest.java) | 82 | ||||
| -rw-r--r-- | pg/src/test/jdk1.1/org/spongycastle/openpgp/test/PGPDSAElGamalTest.java (renamed from pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/PGPDSAElGamalTest.java) | 122 | ||||
| -rw-r--r-- | pg/src/test/jdk1.1/org/spongycastle/openpgp/test/PGPECDHTest.java (renamed from pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/PGPECDHTest.java) | 92 | ||||
| -rw-r--r-- | pg/src/test/jdk1.1/org/spongycastle/openpgp/test/PGPECDSATest.java (renamed from pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/PGPECDSATest.java) | 60 | ||||
| -rw-r--r-- | pg/src/test/jdk1.1/org/spongycastle/openpgp/test/PGPKeyRingTest.java (renamed from pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/PGPKeyRingTest.java) | 146 | ||||
| -rw-r--r-- | pg/src/test/jdk1.3/org/spongycastle/openpgp/test/AllTests.java (renamed from pg/src/test/jdk1.3/org/bouncycastle/openpgp/test/AllTests.java) | 8 | ||||
| -rw-r--r-- | pg/src/test/jdk1.4/org/spongycastle/openpgp/test/PGPECDHTest.java (renamed from pg/src/test/jdk1.4/org/bouncycastle/openpgp/test/PGPECDHTest.java) | 92 | ||||
| -rw-r--r-- | pg/src/test/jdk1.4/org/spongycastle/openpgp/test/PGPECDSATest.java (renamed from pg/src/test/jdk1.4/org/bouncycastle/openpgp/test/PGPECDSATest.java) | 60 | ||||
| -rw-r--r-- | pg/src/test/resources/org/spongycastle/openpgp/test/bigpub.asc (renamed from pg/src/test/resources/org/bouncycastle/openpgp/test/bigpub.asc) | 0 |
276 files changed, 2874 insertions, 2874 deletions
diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPEncryptedDataGenerator.java b/pg/src/main/j2me/org/spongycastle/openpgp/PGPEncryptedDataGenerator.java index 6f36dbc9..449964ab 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPEncryptedDataGenerator.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/PGPEncryptedDataGenerator.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.IOException; import java.io.OutputStream; @@ -6,16 +6,16 @@ import java.security.SecureRandom; import java.util.ArrayList; import java.util.List; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.PacketTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.openpgp.operator.PBEKeyEncryptionMethodGenerator; -import org.bouncycastle.openpgp.operator.PGPDataEncryptor; -import org.bouncycastle.openpgp.operator.PGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.openpgp.operator.PGPKeyEncryptionMethodGenerator; -import org.bouncycastle.util.io.TeeOutputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.PacketTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.openpgp.operator.PBEKeyEncryptionMethodGenerator; +import org.spongycastle.openpgp.operator.PGPDataEncryptor; +import org.spongycastle.openpgp.operator.PGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.openpgp.operator.PGPKeyEncryptionMethodGenerator; +import org.spongycastle.util.io.TeeOutputStream; /** * Generator for encrypted objects. diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPKeyPair.java b/pg/src/main/j2me/org/spongycastle/openpgp/PGPKeyPair.java index feedae15..fc2c891c 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPKeyPair.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/PGPKeyPair.java @@ -1,11 +1,11 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.util.Date; -import org.bouncycastle.bcpg.BCPGKey; -import org.bouncycastle.bcpg.DSASecretBCPGKey; -import org.bouncycastle.bcpg.ElGamalSecretBCPGKey; -import org.bouncycastle.bcpg.RSASecretBCPGKey; +import org.spongycastle.bcpg.BCPGKey; +import org.spongycastle.bcpg.DSASecretBCPGKey; +import org.spongycastle.bcpg.ElGamalSecretBCPGKey; +import org.spongycastle.bcpg.RSASecretBCPGKey; /** diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPKeyRingGenerator.java b/pg/src/main/j2me/org/spongycastle/openpgp/PGPKeyRingGenerator.java index a5f84b4f..b631bb8b 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPKeyRingGenerator.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/PGPKeyRingGenerator.java @@ -1,13 +1,13 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.bouncycastle.bcpg.PublicSubkeyPacket; -import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor; -import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.bcpg.PublicSubkeyPacket; +import org.spongycastle.openpgp.operator.PBESecretKeyEncryptor; +import org.spongycastle.openpgp.operator.PGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; /** * Generator for a PGP master and subkey ring. This class will generate diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPLiteralDataGenerator.java b/pg/src/main/j2me/org/spongycastle/openpgp/PGPLiteralDataGenerator.java index b35c7898..5792a0b8 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPLiteralDataGenerator.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/PGPLiteralDataGenerator.java @@ -1,12 +1,12 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.IOException; import java.io.OutputStream; import java.util.Date; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.PacketTags; -import org.bouncycastle.util.Strings; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.PacketTags; +import org.spongycastle.util.Strings; /** * Class for producing literal data packets. diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPObjectFactory.java b/pg/src/main/j2me/org/spongycastle/openpgp/PGPObjectFactory.java index d5697e95..50e29218 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPObjectFactory.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/PGPObjectFactory.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -6,10 +6,10 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.PacketTags; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.PacketTags; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; /** * General class for reading a PGP object stream. diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPOnePassSignature.java b/pg/src/main/j2me/org/spongycastle/openpgp/PGPOnePassSignature.java index a1d5b9b0..4edb9a97 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPOnePassSignature.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/PGPOnePassSignature.java @@ -1,15 +1,15 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.OnePassSignaturePacket; -import org.bouncycastle.openpgp.operator.PGPContentVerifier; -import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilder; -import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilderProvider; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.OnePassSignaturePacket; +import org.spongycastle.openpgp.operator.PGPContentVerifier; +import org.spongycastle.openpgp.operator.PGPContentVerifierBuilder; +import org.spongycastle.openpgp.operator.PGPContentVerifierBuilderProvider; /** * A one pass signature object. diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPPBEEncryptedData.java b/pg/src/main/j2me/org/spongycastle/openpgp/PGPPBEEncryptedData.java index a24cdc47..d13edf6a 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPPBEEncryptedData.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/PGPPBEEncryptedData.java @@ -1,15 +1,15 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.EOFException; import java.io.InputStream; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.InputStreamPacket; -import org.bouncycastle.bcpg.SymmetricEncIntegrityPacket; -import org.bouncycastle.bcpg.SymmetricKeyEncSessionPacket; -import org.bouncycastle.openpgp.operator.PBEDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.PGPDataDecryptor; -import org.bouncycastle.util.io.TeeInputStream; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.InputStreamPacket; +import org.spongycastle.bcpg.SymmetricEncIntegrityPacket; +import org.spongycastle.bcpg.SymmetricKeyEncSessionPacket; +import org.spongycastle.openpgp.operator.PBEDataDecryptorFactory; +import org.spongycastle.openpgp.operator.PGPDataDecryptor; +import org.spongycastle.util.io.TeeInputStream; /** * A password based encryption object. diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPPrivateKey.java b/pg/src/main/j2me/org/spongycastle/openpgp/PGPPrivateKey.java index c658e29b..23c962b3 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPPrivateKey.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/PGPPrivateKey.java @@ -1,10 +1,10 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; -import org.bouncycastle.bcpg.BCPGKey; -import org.bouncycastle.bcpg.DSASecretBCPGKey; -import org.bouncycastle.bcpg.ElGamalSecretBCPGKey; -import org.bouncycastle.bcpg.PublicKeyPacket; -import org.bouncycastle.bcpg.RSASecretBCPGKey; +import org.spongycastle.bcpg.BCPGKey; +import org.spongycastle.bcpg.DSASecretBCPGKey; +import org.spongycastle.bcpg.ElGamalSecretBCPGKey; +import org.spongycastle.bcpg.PublicKeyPacket; +import org.spongycastle.bcpg.RSASecretBCPGKey; /** * general class to contain a private key for use with other openPGP diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPPublicKey.java b/pg/src/main/j2me/org/spongycastle/openpgp/PGPPublicKey.java index 552f324a..03368f3f 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPPublicKey.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/PGPPublicKey.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -9,19 +9,19 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import org.bouncycastle.bcpg.BCPGKey; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.ContainedPacket; -import org.bouncycastle.bcpg.DSAPublicBCPGKey; -import org.bouncycastle.bcpg.ElGamalPublicBCPGKey; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyPacket; -import org.bouncycastle.bcpg.RSAPublicBCPGKey; -import org.bouncycastle.bcpg.TrustPacket; -import org.bouncycastle.bcpg.UserAttributePacket; -import org.bouncycastle.bcpg.UserIDPacket; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; -import org.bouncycastle.util.Arrays; +import org.spongycastle.bcpg.BCPGKey; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.ContainedPacket; +import org.spongycastle.bcpg.DSAPublicBCPGKey; +import org.spongycastle.bcpg.ElGamalPublicBCPGKey; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyPacket; +import org.spongycastle.bcpg.RSAPublicBCPGKey; +import org.spongycastle.bcpg.TrustPacket; +import org.spongycastle.bcpg.UserAttributePacket; +import org.spongycastle.bcpg.UserIDPacket; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.util.Arrays; /** * general class to handle a PGP public key object. diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPPublicKeyEncryptedData.java b/pg/src/main/j2me/org/spongycastle/openpgp/PGPPublicKeyEncryptedData.java index 1dde086b..e3e71cfa 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPPublicKeyEncryptedData.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/PGPPublicKeyEncryptedData.java @@ -1,16 +1,16 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.EOFException; import java.io.InputStream; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.InputStreamPacket; -import org.bouncycastle.bcpg.PublicKeyEncSessionPacket; -import org.bouncycastle.bcpg.SymmetricEncIntegrityPacket; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.openpgp.operator.PGPDataDecryptor; -import org.bouncycastle.openpgp.operator.PublicKeyDataDecryptorFactory; -import org.bouncycastle.util.io.TeeInputStream; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.InputStreamPacket; +import org.spongycastle.bcpg.PublicKeyEncSessionPacket; +import org.spongycastle.bcpg.SymmetricEncIntegrityPacket; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.openpgp.operator.PGPDataDecryptor; +import org.spongycastle.openpgp.operator.PublicKeyDataDecryptorFactory; +import org.spongycastle.util.io.TeeInputStream; /** * A public key encrypted data object. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKeyRing.java b/pg/src/main/j2me/org/spongycastle/openpgp/PGPPublicKeyRing.java index f39bfd1a..35620ff2 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKeyRing.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/PGPPublicKeyRing.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -10,11 +10,11 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.PacketTags; -import org.bouncycastle.bcpg.PublicKeyPacket; -import org.bouncycastle.bcpg.TrustPacket; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.PacketTags; +import org.spongycastle.bcpg.PublicKeyPacket; +import org.spongycastle.bcpg.TrustPacket; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; /** * Class to hold a single master public key and its subkeys. diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPSecretKey.java b/pg/src/main/j2me/org/spongycastle/openpgp/PGPSecretKey.java index b9c9885f..e9bc334f 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPSecretKey.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/PGPSecretKey.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -9,25 +9,25 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.BCPGObject; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.ContainedPacket; -import org.bouncycastle.bcpg.DSASecretBCPGKey; -import org.bouncycastle.bcpg.ElGamalSecretBCPGKey; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyPacket; -import org.bouncycastle.bcpg.RSASecretBCPGKey; -import org.bouncycastle.bcpg.S2K; -import org.bouncycastle.bcpg.SecretKeyPacket; -import org.bouncycastle.bcpg.SecretSubkeyPacket; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.bcpg.UserAttributePacket; -import org.bouncycastle.bcpg.UserIDPacket; -import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor; -import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor; -import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.BCPGObject; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.ContainedPacket; +import org.spongycastle.bcpg.DSASecretBCPGKey; +import org.spongycastle.bcpg.ElGamalSecretBCPGKey; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyPacket; +import org.spongycastle.bcpg.RSASecretBCPGKey; +import org.spongycastle.bcpg.S2K; +import org.spongycastle.bcpg.SecretKeyPacket; +import org.spongycastle.bcpg.SecretSubkeyPacket; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.bcpg.UserAttributePacket; +import org.spongycastle.bcpg.UserIDPacket; +import org.spongycastle.openpgp.operator.PBESecretKeyDecryptor; +import org.spongycastle.openpgp.operator.PBESecretKeyEncryptor; +import org.spongycastle.openpgp.operator.PGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; /** * general class to handle a PGP secret key object. diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPSecretKeyRing.java b/pg/src/main/j2me/org/spongycastle/openpgp/PGPSecretKeyRing.java index 8b6ec6c2..b54f3408 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPSecretKeyRing.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/PGPSecretKeyRing.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -11,15 +11,15 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.PacketTags; -import org.bouncycastle.bcpg.PublicSubkeyPacket; -import org.bouncycastle.bcpg.SecretKeyPacket; -import org.bouncycastle.bcpg.SecretSubkeyPacket; -import org.bouncycastle.bcpg.TrustPacket; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; -import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor; -import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.PacketTags; +import org.spongycastle.bcpg.PublicSubkeyPacket; +import org.spongycastle.bcpg.SecretKeyPacket; +import org.spongycastle.bcpg.SecretSubkeyPacket; +import org.spongycastle.bcpg.TrustPacket; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.openpgp.operator.PBESecretKeyDecryptor; +import org.spongycastle.openpgp.operator.PBESecretKeyEncryptor; /** * Class to hold a single master secret key and its subkeys. diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPSignature.java b/pg/src/main/j2me/org/spongycastle/openpgp/PGPSignature.java index e345167a..7afcd4d8 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPSignature.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/PGPSignature.java @@ -1,25 +1,25 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; import java.util.Date; -import org.bouncycastle.asn1.ASN1EncodableVector; -import org.bouncycastle.asn1.ASN1Integer; -import org.bouncycastle.asn1.DERSequence; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.MPInteger; -import org.bouncycastle.bcpg.SignaturePacket; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.TrustPacket; -import org.bouncycastle.bcpg.UserAttributeSubpacket; -import org.bouncycastle.openpgp.operator.PGPContentVerifier; -import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilder; -import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilderProvider; -import org.bouncycastle.util.BigIntegers; -import org.bouncycastle.util.Strings; +import org.spongycastle.asn1.ASN1EncodableVector; +import org.spongycastle.asn1.ASN1Integer; +import org.spongycastle.asn1.DERSequence; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.MPInteger; +import org.spongycastle.bcpg.SignaturePacket; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.TrustPacket; +import org.spongycastle.bcpg.UserAttributeSubpacket; +import org.spongycastle.openpgp.operator.PGPContentVerifier; +import org.spongycastle.openpgp.operator.PGPContentVerifierBuilder; +import org.spongycastle.openpgp.operator.PGPContentVerifierBuilderProvider; +import org.spongycastle.util.BigIntegers; +import org.spongycastle.util.Strings; /** *A PGP signature object. diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPSignatureException.java b/pg/src/main/j2me/org/spongycastle/openpgp/PGPSignatureException.java index 44bf8aee..a90cab88 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPSignatureException.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/PGPSignatureException.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; public class PGPSignatureException extends PGPException diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPSignatureGenerator.java b/pg/src/main/j2me/org/spongycastle/openpgp/PGPSignatureGenerator.java index 84de5809..c0940855 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPSignatureGenerator.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/PGPSignatureGenerator.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -7,18 +7,18 @@ import java.math.BigInteger; import java.security.SecureRandom; import java.util.Date; -import org.bouncycastle.bcpg.MPInteger; -import org.bouncycastle.bcpg.OnePassSignaturePacket; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.SignaturePacket; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.SignatureSubpacketTags; -import org.bouncycastle.bcpg.UserAttributeSubpacket; -import org.bouncycastle.bcpg.sig.IssuerKeyID; -import org.bouncycastle.bcpg.sig.SignatureCreationTime; -import org.bouncycastle.openpgp.operator.PGPContentSigner; -import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder; -import org.bouncycastle.util.Strings; +import org.spongycastle.bcpg.MPInteger; +import org.spongycastle.bcpg.OnePassSignaturePacket; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.SignaturePacket; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.bcpg.UserAttributeSubpacket; +import org.spongycastle.bcpg.sig.IssuerKeyID; +import org.spongycastle.bcpg.sig.SignatureCreationTime; +import org.spongycastle.openpgp.operator.PGPContentSigner; +import org.spongycastle.openpgp.operator.PGPContentSignerBuilder; +import org.spongycastle.util.Strings; /** * Generator for PGP Signatures. diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPUtil.java b/pg/src/main/j2me/org/spongycastle/openpgp/PGPUtil.java index fc5dab65..6bff42d0 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPUtil.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/PGPUtil.java @@ -1,15 +1,15 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.IOException; import java.security.SecureRandom; -import org.bouncycastle.asn1.ASN1InputStream; -import org.bouncycastle.asn1.ASN1Sequence; -import org.bouncycastle.asn1.ASN1Integer; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.MPInteger; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.asn1.ASN1InputStream; +import org.spongycastle.asn1.ASN1Sequence; +import org.spongycastle.asn1.ASN1Integer; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.MPInteger; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; /** * Basic utility class diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPV3SignatureGenerator.java b/pg/src/main/j2me/org/spongycastle/openpgp/PGPV3SignatureGenerator.java index b666f55c..d89603bb 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPV3SignatureGenerator.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/PGPV3SignatureGenerator.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -7,12 +7,12 @@ import java.math.BigInteger; import java.security.SecureRandom; import java.util.Date; -import org.bouncycastle.bcpg.MPInteger; -import org.bouncycastle.bcpg.OnePassSignaturePacket; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.SignaturePacket; -import org.bouncycastle.openpgp.operator.PGPContentSigner; -import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder; +import org.spongycastle.bcpg.MPInteger; +import org.spongycastle.bcpg.OnePassSignaturePacket; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.SignaturePacket; +import org.spongycastle.openpgp.operator.PGPContentSigner; +import org.spongycastle.openpgp.operator.PGPContentSignerBuilder; /** * Generator for old style PGP V3 Signatures. diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/test/BcPGPDSAElGamalTest.java b/pg/src/main/j2me/org/spongycastle/openpgp/test/BcPGPDSAElGamalTest.java index 34382a5e..1842bbfc 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/test/BcPGPDSAElGamalTest.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/test/BcPGPDSAElGamalTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -10,46 +10,46 @@ import java.security.SecureRandom; import java.util.Date; import java.util.Iterator; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.crypto.AsymmetricBlockCipher; -import org.bouncycastle.crypto.AsymmetricCipherKeyPair; -import org.bouncycastle.crypto.encodings.PKCS1Encoding; -import org.bouncycastle.crypto.engines.ElGamalEngine; -import org.bouncycastle.crypto.generators.ElGamalKeyPairGenerator; -import org.bouncycastle.crypto.params.AsymmetricKeyParameter; -import org.bouncycastle.crypto.params.ElGamalKeyGenerationParameters; -import org.bouncycastle.crypto.params.ElGamalParameters; -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPObjectFactory; -import org.bouncycastle.openpgp.PGPOnePassSignature; -import org.bouncycastle.openpgp.PGPOnePassSignatureList; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; -import org.bouncycastle.openpgp.operator.bc.BcPGPKeyConverter; -import org.bouncycastle.openpgp.operator.bc.BcPGPKeyPair; -import org.bouncycastle.openpgp.operator.bc.BcPublicKeyDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.bc.BcPublicKeyKeyEncryptionMethodGenerator; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.crypto.AsymmetricBlockCipher; +import org.spongycastle.crypto.AsymmetricCipherKeyPair; +import org.spongycastle.crypto.encodings.PKCS1Encoding; +import org.spongycastle.crypto.engines.ElGamalEngine; +import org.spongycastle.crypto.generators.ElGamalKeyPairGenerator; +import org.spongycastle.crypto.params.AsymmetricKeyParameter; +import org.spongycastle.crypto.params.ElGamalKeyGenerationParameters; +import org.spongycastle.crypto.params.ElGamalParameters; +import org.spongycastle.openpgp.PGPEncryptedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPObjectFactory; +import org.spongycastle.openpgp.PGPOnePassSignature; +import org.spongycastle.openpgp.PGPOnePassSignatureList; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyEncryptedData; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; +import org.spongycastle.openpgp.operator.bc.BcPGPKeyConverter; +import org.spongycastle.openpgp.operator.bc.BcPGPKeyPair; +import org.spongycastle.openpgp.operator.bc.BcPublicKeyDataDecryptorFactory; +import org.spongycastle.openpgp.operator.bc.BcPublicKeyKeyEncryptionMethodGenerator; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class BcPGPDSAElGamalTest extends SimpleTest diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/test/BcPGPDSATest.java b/pg/src/main/j2me/org/spongycastle/openpgp/test/BcPGPDSATest.java index 3ef0c0cb..f3087ee0 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/test/BcPGPDSATest.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/test/BcPGPDSATest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -9,38 +9,38 @@ import java.security.SecureRandom; import java.util.Date; import java.util.Iterator; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.crypto.AsymmetricCipherKeyPair; -import org.bouncycastle.crypto.generators.RSAKeyPairGenerator; -import org.bouncycastle.crypto.params.AsymmetricKeyParameter; -import org.bouncycastle.crypto.params.RSAKeyGenerationParameters; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPObjectFactory; -import org.bouncycastle.openpgp.PGPOnePassSignature; -import org.bouncycastle.openpgp.PGPOnePassSignatureList; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator; -import org.bouncycastle.openpgp.PGPUserAttributeSubpacketVector; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; -import org.bouncycastle.openpgp.operator.bc.BcPGPKeyConverter; -import org.bouncycastle.openpgp.operator.bc.BcPGPKeyPair; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.crypto.AsymmetricCipherKeyPair; +import org.spongycastle.crypto.generators.RSAKeyPairGenerator; +import org.spongycastle.crypto.params.AsymmetricKeyParameter; +import org.spongycastle.crypto.params.RSAKeyGenerationParameters; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPObjectFactory; +import org.spongycastle.openpgp.PGPOnePassSignature; +import org.spongycastle.openpgp.PGPOnePassSignatureList; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator; +import org.spongycastle.openpgp.PGPUserAttributeSubpacketVector; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; +import org.spongycastle.openpgp.operator.bc.BcPGPKeyConverter; +import org.spongycastle.openpgp.operator.bc.BcPGPKeyPair; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class BcPGPDSATest extends SimpleTest diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/test/BcPGPKeyRingTest.java b/pg/src/main/j2me/org/spongycastle/openpgp/test/BcPGPKeyRingTest.java index b0fe290e..b587b9d6 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/test/BcPGPKeyRingTest.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/test/BcPGPKeyRingTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.math.BigInteger; @@ -6,39 +6,39 @@ import java.security.SecureRandom; import java.util.Date; import java.util.Iterator; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.crypto.AsymmetricCipherKeyPair; -import org.bouncycastle.crypto.generators.DSAKeyPairGenerator; -import org.bouncycastle.crypto.generators.DSAParametersGenerator; -import org.bouncycastle.crypto.generators.ElGamalKeyPairGenerator; -import org.bouncycastle.crypto.generators.RSAKeyPairGenerator; -import org.bouncycastle.crypto.params.DSAKeyGenerationParameters; -import org.bouncycastle.crypto.params.ElGamalKeyGenerationParameters; -import org.bouncycastle.crypto.params.ElGamalParameters; -import org.bouncycastle.crypto.params.RSAKeyGenerationParameters; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPKeyRingGenerator; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyEncryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; -import org.bouncycastle.openpgp.operator.bc.BcPGPKeyPair; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.Hex; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.crypto.AsymmetricCipherKeyPair; +import org.spongycastle.crypto.generators.DSAKeyPairGenerator; +import org.spongycastle.crypto.generators.DSAParametersGenerator; +import org.spongycastle.crypto.generators.ElGamalKeyPairGenerator; +import org.spongycastle.crypto.generators.RSAKeyPairGenerator; +import org.spongycastle.crypto.params.DSAKeyGenerationParameters; +import org.spongycastle.crypto.params.ElGamalKeyGenerationParameters; +import org.spongycastle.crypto.params.ElGamalParameters; +import org.spongycastle.crypto.params.RSAKeyGenerationParameters; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPKeyRingGenerator; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPPublicKeyRingCollection; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSecretKeyRingCollection; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPBESecretKeyEncryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; +import org.spongycastle.openpgp.operator.bc.BcPGPKeyPair; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.test.SimpleTest; public class BcPGPKeyRingTest extends SimpleTest diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/test/BcPGPPBETest.java b/pg/src/main/j2me/org/spongycastle/openpgp/test/BcPGPPBETest.java index 2e1da490..b6ada0f4 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/test/BcPGPPBETest.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/test/BcPGPPBETest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayOutputStream; import java.io.InputStream; @@ -6,21 +6,21 @@ import java.io.OutputStream; import java.security.SecureRandom; import java.util.Date; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPObjectFactory; -import org.bouncycastle.openpgp.PGPPBEEncryptedData; -import org.bouncycastle.openpgp.operator.bc.BcPBEDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.bc.BcPBEKeyEncryptionMethodGenerator; -import org.bouncycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.Hex; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPEncryptedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPObjectFactory; +import org.spongycastle.openpgp.PGPPBEEncryptedData; +import org.spongycastle.openpgp.operator.bc.BcPBEDataDecryptorFactory; +import org.spongycastle.openpgp.operator.bc.BcPBEKeyEncryptionMethodGenerator; +import org.spongycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class BcPGPPBETest extends SimpleTest diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/test/BcPGPRSATest.java b/pg/src/main/j2me/org/spongycastle/openpgp/test/BcPGPRSATest.java index 1f562228..e6d790d3 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/test/BcPGPRSATest.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/test/BcPGPRSATest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -12,68 +12,68 @@ import java.security.SecureRandom; import java.util.Date; import java.util.Iterator; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.CompressionAlgorithmTags; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.bcpg.attr.ImageAttribute; -import org.bouncycastle.bcpg.sig.Features; -import org.bouncycastle.bcpg.sig.KeyFlags; - -import org.bouncycastle.crypto.AsymmetricCipherKeyPair; -import org.bouncycastle.crypto.BufferedAsymmetricBlockCipher; -import org.bouncycastle.crypto.KeyGenerationParameters; -import org.bouncycastle.crypto.engines.RSAEngine; -import org.bouncycastle.crypto.generators.RSAKeyPairGenerator; -import org.bouncycastle.crypto.params.AsymmetricKeyParameter; -import org.bouncycastle.crypto.params.RSAKeyGenerationParameters; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPKeyRingGenerator; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPObjectFactory; -import org.bouncycastle.openpgp.PGPOnePassSignature; -import org.bouncycastle.openpgp.PGPOnePassSignatureList; -import org.bouncycastle.openpgp.PGPPBEEncryptedData; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator; -import org.bouncycastle.openpgp.PGPSignatureSubpacketVector; -import org.bouncycastle.openpgp.PGPUserAttributeSubpacketVector; -import org.bouncycastle.openpgp.PGPUserAttributeSubpacketVectorGenerator; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.PGPV3SignatureGenerator; -import org.bouncycastle.openpgp.operator.bc.BcPGPKeyPair; -import org.bouncycastle.openpgp.operator.PublicKeyDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.bc.BcPBEDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.bc.BcPBEKeyEncryptionMethodGenerator; -import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyEncryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; -import org.bouncycastle.openpgp.operator.bc.BcPGPKeyConverter; -import org.bouncycastle.openpgp.operator.bc.BcPublicKeyDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.bc.BcPublicKeyKeyEncryptionMethodGenerator; - -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.Hex; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.CompressionAlgorithmTags; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.bcpg.attr.ImageAttribute; +import org.spongycastle.bcpg.sig.Features; +import org.spongycastle.bcpg.sig.KeyFlags; + +import org.spongycastle.crypto.AsymmetricCipherKeyPair; +import org.spongycastle.crypto.BufferedAsymmetricBlockCipher; +import org.spongycastle.crypto.KeyGenerationParameters; +import org.spongycastle.crypto.engines.RSAEngine; +import org.spongycastle.crypto.generators.RSAKeyPairGenerator; +import org.spongycastle.crypto.params.AsymmetricKeyParameter; +import org.spongycastle.crypto.params.RSAKeyGenerationParameters; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPEncryptedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPKeyRingGenerator; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPObjectFactory; +import org.spongycastle.openpgp.PGPOnePassSignature; +import org.spongycastle.openpgp.PGPOnePassSignatureList; +import org.spongycastle.openpgp.PGPPBEEncryptedData; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyEncryptedData; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator; +import org.spongycastle.openpgp.PGPSignatureSubpacketVector; +import org.spongycastle.openpgp.PGPUserAttributeSubpacketVector; +import org.spongycastle.openpgp.PGPUserAttributeSubpacketVectorGenerator; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.PGPV3SignatureGenerator; +import org.spongycastle.openpgp.operator.bc.BcPGPKeyPair; +import org.spongycastle.openpgp.operator.PublicKeyDataDecryptorFactory; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.bc.BcPBEDataDecryptorFactory; +import org.spongycastle.openpgp.operator.bc.BcPBEKeyEncryptionMethodGenerator; +import org.spongycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPBESecretKeyEncryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; +import org.spongycastle.openpgp.operator.bc.BcPGPKeyConverter; +import org.spongycastle.openpgp.operator.bc.BcPublicKeyDataDecryptorFactory; +import org.spongycastle.openpgp.operator.bc.BcPublicKeyKeyEncryptionMethodGenerator; + +import org.spongycastle.util.Arrays; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class BcPGPRSATest extends SimpleTest diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/test/RegressionTest.java b/pg/src/main/j2me/org/spongycastle/openpgp/test/RegressionTest.java index 23337ce9..796d1203 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/test/RegressionTest.java +++ b/pg/src/main/j2me/org/spongycastle/openpgp/test/RegressionTest.java @@ -1,7 +1,7 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; -import org.bouncycastle.util.test.Test; -import org.bouncycastle.util.test.TestResult; +import org.spongycastle.util.test.Test; +import org.spongycastle.util.test.TestResult; public class RegressionTest { diff --git a/pg/src/main/java/org/bouncycastle/apache/bzip2/BZip2Constants.java b/pg/src/main/java/org/spongycastle/apache/bzip2/BZip2Constants.java index e86bdeeb..9bfd74e0 100644 --- a/pg/src/main/java/org/bouncycastle/apache/bzip2/BZip2Constants.java +++ b/pg/src/main/java/org/spongycastle/apache/bzip2/BZip2Constants.java @@ -22,7 +22,7 @@ * great code. */ -package org.bouncycastle.apache.bzip2; +package org.spongycastle.apache.bzip2; /** * Base class for both the compress and decompress classes. diff --git a/pg/src/main/java/org/bouncycastle/apache/bzip2/CBZip2InputStream.java b/pg/src/main/java/org/spongycastle/apache/bzip2/CBZip2InputStream.java index 08d05e7d..6609482c 100644 --- a/pg/src/main/java/org/bouncycastle/apache/bzip2/CBZip2InputStream.java +++ b/pg/src/main/java/org/spongycastle/apache/bzip2/CBZip2InputStream.java @@ -21,7 +21,7 @@ * <keiron@aftexsw.com> to whom the Ant project is very grateful for his * great code. */ -package org.bouncycastle.apache.bzip2; +package org.spongycastle.apache.bzip2; import java.io.InputStream; import java.io.IOException; diff --git a/pg/src/main/java/org/bouncycastle/apache/bzip2/CBZip2OutputStream.java b/pg/src/main/java/org/spongycastle/apache/bzip2/CBZip2OutputStream.java index 0503583a..9648663a 100644 --- a/pg/src/main/java/org/bouncycastle/apache/bzip2/CBZip2OutputStream.java +++ b/pg/src/main/java/org/spongycastle/apache/bzip2/CBZip2OutputStream.java @@ -22,7 +22,7 @@ * great code. */ -package org.bouncycastle.apache.bzip2; +package org.spongycastle.apache.bzip2; import java.io.OutputStream; import java.io.IOException; diff --git a/pg/src/main/java/org/bouncycastle/apache/bzip2/CRC.java b/pg/src/main/java/org/spongycastle/apache/bzip2/CRC.java index ce03d288..acb2e80e 100644 --- a/pg/src/main/java/org/bouncycastle/apache/bzip2/CRC.java +++ b/pg/src/main/java/org/spongycastle/apache/bzip2/CRC.java @@ -22,7 +22,7 @@ * great code. */ -package org.bouncycastle.apache.bzip2; +package org.spongycastle.apache.bzip2; /** * A simple class the hold and calculate the CRC for sanity checking diff --git a/pg/src/main/java/org/bouncycastle/bcpg/ArmoredInputStream.java b/pg/src/main/java/org/spongycastle/bcpg/ArmoredInputStream.java index 802cdf91..2a0f9e3e 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/ArmoredInputStream.java +++ b/pg/src/main/java/org/spongycastle/bcpg/ArmoredInputStream.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.EOFException; import java.io.IOException; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/ArmoredOutputStream.java b/pg/src/main/java/org/spongycastle/bcpg/ArmoredOutputStream.java index 5233d1a2..1f86f5bb 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/ArmoredOutputStream.java +++ b/pg/src/main/java/org/spongycastle/bcpg/ArmoredOutputStream.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.IOException; import java.io.OutputStream; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/BCPGInputStream.java b/pg/src/main/java/org/spongycastle/bcpg/BCPGInputStream.java index bc7cb802..aec47c5f 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/BCPGInputStream.java +++ b/pg/src/main/java/org/spongycastle/bcpg/BCPGInputStream.java @@ -1,10 +1,10 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; -import org.bouncycastle.util.io.Streams; +import org.spongycastle.util.io.Streams; /** * Stream reader for PGP objects diff --git a/pg/src/main/java/org/bouncycastle/bcpg/BCPGKey.java b/pg/src/main/java/org/spongycastle/bcpg/BCPGKey.java index 632ef91d..7025bb31 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/BCPGKey.java +++ b/pg/src/main/java/org/spongycastle/bcpg/BCPGKey.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; /** * base interface for a PGP key diff --git a/pg/src/main/java/org/bouncycastle/bcpg/BCPGObject.java b/pg/src/main/java/org/spongycastle/bcpg/BCPGObject.java index 1018f189..10d87498 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/BCPGObject.java +++ b/pg/src/main/java/org/spongycastle/bcpg/BCPGObject.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/BCPGOutputStream.java b/pg/src/main/java/org/spongycastle/bcpg/BCPGOutputStream.java index 640310b4..560a6456 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/BCPGOutputStream.java +++ b/pg/src/main/java/org/spongycastle/bcpg/BCPGOutputStream.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.IOException; import java.io.OutputStream; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/CRC24.java b/pg/src/main/java/org/spongycastle/bcpg/CRC24.java index 82c4b9a8..b9db421d 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/CRC24.java +++ b/pg/src/main/java/org/spongycastle/bcpg/CRC24.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; public class CRC24 { diff --git a/pg/src/main/java/org/bouncycastle/bcpg/CompressedDataPacket.java b/pg/src/main/java/org/spongycastle/bcpg/CompressedDataPacket.java index 7239d91e..7c5818ab 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/CompressedDataPacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/CompressedDataPacket.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.IOException; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/CompressionAlgorithmTags.java b/pg/src/main/java/org/spongycastle/bcpg/CompressionAlgorithmTags.java index 0e947d54..2d195696 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/CompressionAlgorithmTags.java +++ b/pg/src/main/java/org/spongycastle/bcpg/CompressionAlgorithmTags.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; /** * Basic tags for compression algorithms diff --git a/pg/src/main/java/org/bouncycastle/bcpg/ContainedPacket.java b/pg/src/main/java/org/spongycastle/bcpg/ContainedPacket.java index fca0078c..75964559 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/ContainedPacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/ContainedPacket.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/DSAPublicBCPGKey.java b/pg/src/main/java/org/spongycastle/bcpg/DSAPublicBCPGKey.java index c2315174..54d0738c 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/DSAPublicBCPGKey.java +++ b/pg/src/main/java/org/spongycastle/bcpg/DSAPublicBCPGKey.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.*; import java.math.BigInteger; @@ -42,7 +42,7 @@ public class DSAPublicBCPGKey /** * return "PGP" * - * @see org.bouncycastle.bcpg.BCPGKey#getFormat() + * @see org.spongycastle.bcpg.BCPGKey#getFormat() */ public String getFormat() { @@ -52,7 +52,7 @@ public class DSAPublicBCPGKey /** * return the standard PGP encoding of the key. * - * @see org.bouncycastle.bcpg.BCPGKey#getEncoded() + * @see org.spongycastle.bcpg.BCPGKey#getEncoded() */ public byte[] getEncoded() { diff --git a/pg/src/main/java/org/bouncycastle/bcpg/DSASecretBCPGKey.java b/pg/src/main/java/org/spongycastle/bcpg/DSASecretBCPGKey.java index 9f2d48f0..17dd6882 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/DSASecretBCPGKey.java +++ b/pg/src/main/java/org/spongycastle/bcpg/DSASecretBCPGKey.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.*; import java.math.BigInteger; @@ -36,7 +36,7 @@ public class DSASecretBCPGKey /** * return "PGP" * - * @see org.bouncycastle.bcpg.BCPGKey#getFormat() + * @see org.spongycastle.bcpg.BCPGKey#getFormat() */ public String getFormat() { @@ -46,7 +46,7 @@ public class DSASecretBCPGKey /** * return the standard PGP encoding of the key. * - * @see org.bouncycastle.bcpg.BCPGKey#getEncoded() + * @see org.spongycastle.bcpg.BCPGKey#getEncoded() */ public byte[] getEncoded() { diff --git a/pg/src/main/java/org/bouncycastle/bcpg/ECDHPublicBCPGKey.java b/pg/src/main/java/org/spongycastle/bcpg/ECDHPublicBCPGKey.java index 44c5b30f..a1ddfffb 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/ECDHPublicBCPGKey.java +++ b/pg/src/main/java/org/spongycastle/bcpg/ECDHPublicBCPGKey.java @@ -1,9 +1,9 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.IOException; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.math.ec.ECPoint; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.math.ec.ECPoint; /** * base class for an ECDH Public Key. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/ECDSAPublicBCPGKey.java b/pg/src/main/java/org/spongycastle/bcpg/ECDSAPublicBCPGKey.java index a7b8867d..0693e3e0 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/ECDSAPublicBCPGKey.java +++ b/pg/src/main/java/org/spongycastle/bcpg/ECDSAPublicBCPGKey.java @@ -1,10 +1,10 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.IOException; import java.math.BigInteger; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.math.ec.ECPoint; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.math.ec.ECPoint; /** * base class for an ECDSA Public Key. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/ECPublicBCPGKey.java b/pg/src/main/java/org/spongycastle/bcpg/ECPublicBCPGKey.java index 3c858439..5d4e74f9 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/ECPublicBCPGKey.java +++ b/pg/src/main/java/org/spongycastle/bcpg/ECPublicBCPGKey.java @@ -1,17 +1,17 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigInteger; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.ASN1Primitive; -import org.bouncycastle.asn1.x9.ECNamedCurveTable; -import org.bouncycastle.asn1.x9.X9ECParameters; -import org.bouncycastle.crypto.ec.CustomNamedCurves; -import org.bouncycastle.math.ec.ECAlgorithms; -import org.bouncycastle.math.ec.ECPoint; -import org.bouncycastle.util.BigIntegers; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.ASN1Primitive; +import org.spongycastle.asn1.x9.ECNamedCurveTable; +import org.spongycastle.asn1.x9.X9ECParameters; +import org.spongycastle.crypto.ec.CustomNamedCurves; +import org.spongycastle.math.ec.ECAlgorithms; +import org.spongycastle.math.ec.ECPoint; +import org.spongycastle.util.BigIntegers; /** * base class for an EC Public Key. @@ -54,7 +54,7 @@ public abstract class ECPublicBCPGKey /** * return "PGP" * - * @see org.bouncycastle.bcpg.BCPGKey#getFormat() + * @see org.spongycastle.bcpg.BCPGKey#getFormat() */ public String getFormat() { @@ -64,7 +64,7 @@ public abstract class ECPublicBCPGKey /** * return the standard PGP encoding of the key. * - * @see org.bouncycastle.bcpg.BCPGKey#getEncoded() + * @see org.spongycastle.bcpg.BCPGKey#getEncoded() */ public byte[] getEncoded() { diff --git a/pg/src/main/java/org/bouncycastle/bcpg/ECSecretBCPGKey.java b/pg/src/main/java/org/spongycastle/bcpg/ECSecretBCPGKey.java index bec3c0d6..124a8d12 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/ECSecretBCPGKey.java +++ b/pg/src/main/java/org/spongycastle/bcpg/ECSecretBCPGKey.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -36,7 +36,7 @@ public class ECSecretBCPGKey /** * return "PGP" * - * @see org.bouncycastle.bcpg.BCPGKey#getFormat() + * @see org.spongycastle.bcpg.BCPGKey#getFormat() */ public String getFormat() { @@ -46,7 +46,7 @@ public class ECSecretBCPGKey /** * return the standard PGP encoding of the key. * - * @see org.bouncycastle.bcpg.BCPGKey#getEncoded() + * @see org.spongycastle.bcpg.BCPGKey#getEncoded() */ public byte[] getEncoded() { diff --git a/pg/src/main/java/org/bouncycastle/bcpg/ElGamalPublicBCPGKey.java b/pg/src/main/java/org/spongycastle/bcpg/ElGamalPublicBCPGKey.java index 8c273682..bb1bc0b4 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/ElGamalPublicBCPGKey.java +++ b/pg/src/main/java/org/spongycastle/bcpg/ElGamalPublicBCPGKey.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.*; import java.math.BigInteger; @@ -38,7 +38,7 @@ public class ElGamalPublicBCPGKey /** * return "PGP" * - * @see org.bouncycastle.bcpg.BCPGKey#getFormat() + * @see org.spongycastle.bcpg.BCPGKey#getFormat() */ public String getFormat() { @@ -48,7 +48,7 @@ public class ElGamalPublicBCPGKey /** * return the standard PGP encoding of the key. * - * @see org.bouncycastle.bcpg.BCPGKey#getEncoded() + * @see org.spongycastle.bcpg.BCPGKey#getEncoded() */ public byte[] getEncoded() { diff --git a/pg/src/main/java/org/bouncycastle/bcpg/ElGamalSecretBCPGKey.java b/pg/src/main/java/org/spongycastle/bcpg/ElGamalSecretBCPGKey.java index 31c113ce..9a7d2b02 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/ElGamalSecretBCPGKey.java +++ b/pg/src/main/java/org/spongycastle/bcpg/ElGamalSecretBCPGKey.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.*; import java.math.BigInteger; @@ -36,7 +36,7 @@ public class ElGamalSecretBCPGKey /** * return "PGP" * - * @see org.bouncycastle.bcpg.BCPGKey#getFormat() + * @see org.spongycastle.bcpg.BCPGKey#getFormat() */ public String getFormat() { @@ -51,7 +51,7 @@ public class ElGamalSecretBCPGKey /** * return the standard PGP encoding of the key. * - * @see org.bouncycastle.bcpg.BCPGKey#getEncoded() + * @see org.spongycastle.bcpg.BCPGKey#getEncoded() */ public byte[] getEncoded() { diff --git a/pg/src/main/java/org/bouncycastle/bcpg/ExperimentalPacket.java b/pg/src/main/java/org/spongycastle/bcpg/ExperimentalPacket.java index 8407052b..64575c48 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/ExperimentalPacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/ExperimentalPacket.java @@ -1,8 +1,8 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.IOException; -import org.bouncycastle.util.Arrays; +import org.spongycastle.util.Arrays; /** * basic packet for an experimental packet. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/HashAlgorithmTags.java b/pg/src/main/java/org/spongycastle/bcpg/HashAlgorithmTags.java index da52bc85..868451b0 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/HashAlgorithmTags.java +++ b/pg/src/main/java/org/spongycastle/bcpg/HashAlgorithmTags.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; /** * basic tags for hash algorithms diff --git a/pg/src/main/java/org/bouncycastle/bcpg/InputStreamPacket.java b/pg/src/main/java/org/spongycastle/bcpg/InputStreamPacket.java index 9073a2e8..e399c4b7 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/InputStreamPacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/InputStreamPacket.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; /** * A block of data associated with other packets in a PGP object stream. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/LiteralDataPacket.java b/pg/src/main/java/org/spongycastle/bcpg/LiteralDataPacket.java index b57c8bde..831d8220 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/LiteralDataPacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/LiteralDataPacket.java @@ -1,9 +1,9 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.IOException; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.Strings; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.Strings; /** * Generic literal data packet. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/MPInteger.java b/pg/src/main/java/org/spongycastle/bcpg/MPInteger.java index ebd22615..05abda37 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/MPInteger.java +++ b/pg/src/main/java/org/spongycastle/bcpg/MPInteger.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.*; import java.math.BigInteger; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/MarkerPacket.java b/pg/src/main/java/org/spongycastle/bcpg/MarkerPacket.java index a3e9757f..e4efbe85 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/MarkerPacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/MarkerPacket.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.IOException; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/ModDetectionCodePacket.java b/pg/src/main/java/org/spongycastle/bcpg/ModDetectionCodePacket.java index 812e9374..70bf4d27 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/ModDetectionCodePacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/ModDetectionCodePacket.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.*; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/OnePassSignaturePacket.java b/pg/src/main/java/org/spongycastle/bcpg/OnePassSignaturePacket.java index fde95576..59d73160 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/OnePassSignaturePacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/OnePassSignaturePacket.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.*; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/OutputStreamPacket.java b/pg/src/main/java/org/spongycastle/bcpg/OutputStreamPacket.java index fcf3a97b..4575ee05 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/OutputStreamPacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/OutputStreamPacket.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.IOException; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/Packet.java b/pg/src/main/java/org/spongycastle/bcpg/Packet.java index b233fd56..6fcc840e 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/Packet.java +++ b/pg/src/main/java/org/spongycastle/bcpg/Packet.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; /** */ diff --git a/pg/src/main/java/org/bouncycastle/bcpg/PacketTags.java b/pg/src/main/java/org/spongycastle/bcpg/PacketTags.java index 3fc163cb..d20efcef 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/PacketTags.java +++ b/pg/src/main/java/org/spongycastle/bcpg/PacketTags.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; /** * Basic PGP packet tag types. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/PublicKeyAlgorithmTags.java b/pg/src/main/java/org/spongycastle/bcpg/PublicKeyAlgorithmTags.java index ef04c1c3..fe1d8d95 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/PublicKeyAlgorithmTags.java +++ b/pg/src/main/java/org/spongycastle/bcpg/PublicKeyAlgorithmTags.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; /** * Public Key Algorithm tag numbers diff --git a/pg/src/main/java/org/bouncycastle/bcpg/PublicKeyEncSessionPacket.java b/pg/src/main/java/org/spongycastle/bcpg/PublicKeyEncSessionPacket.java index a935dc33..fcc9b31d 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/PublicKeyEncSessionPacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/PublicKeyEncSessionPacket.java @@ -1,10 +1,10 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.ByteArrayOutputStream; import java.io.IOException; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.io.Streams; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.io.Streams; /** * basic packet for a PGP public key diff --git a/pg/src/main/java/org/bouncycastle/bcpg/PublicKeyPacket.java b/pg/src/main/java/org/spongycastle/bcpg/PublicKeyPacket.java index 3a5dac26..ac1dc3ba 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/PublicKeyPacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/PublicKeyPacket.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/PublicSubkeyPacket.java b/pg/src/main/java/org/spongycastle/bcpg/PublicSubkeyPacket.java index e203fe37..5e745ef4 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/PublicSubkeyPacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/PublicSubkeyPacket.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.*; import java.util.Date; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/RSAPublicBCPGKey.java b/pg/src/main/java/org/spongycastle/bcpg/RSAPublicBCPGKey.java index 1729f4d8..e6eed70f 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/RSAPublicBCPGKey.java +++ b/pg/src/main/java/org/spongycastle/bcpg/RSAPublicBCPGKey.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.math.BigInteger; import java.io.*; @@ -52,7 +52,7 @@ public class RSAPublicBCPGKey /** * return "PGP" * - * @see org.bouncycastle.bcpg.BCPGKey#getFormat() + * @see org.spongycastle.bcpg.BCPGKey#getFormat() */ public String getFormat() { @@ -62,7 +62,7 @@ public class RSAPublicBCPGKey /** * return the standard PGP encoding of the key. * - * @see org.bouncycastle.bcpg.BCPGKey#getEncoded() + * @see org.spongycastle.bcpg.BCPGKey#getEncoded() */ public byte[] getEncoded() { diff --git a/pg/src/main/java/org/bouncycastle/bcpg/RSASecretBCPGKey.java b/pg/src/main/java/org/spongycastle/bcpg/RSASecretBCPGKey.java index 6a6e7e6d..a8b21167 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/RSASecretBCPGKey.java +++ b/pg/src/main/java/org/spongycastle/bcpg/RSASecretBCPGKey.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.*; import java.math.BigInteger; @@ -135,7 +135,7 @@ public class RSASecretBCPGKey /** * return "PGP" * - * @see org.bouncycastle.bcpg.BCPGKey#getFormat() + * @see org.spongycastle.bcpg.BCPGKey#getFormat() */ public String getFormat() { @@ -145,7 +145,7 @@ public class RSASecretBCPGKey /** * return the standard PGP encoding of the key. * - * @see org.bouncycastle.bcpg.BCPGKey#getEncoded() + * @see org.spongycastle.bcpg.BCPGKey#getEncoded() */ public byte[] getEncoded() { diff --git a/pg/src/main/java/org/bouncycastle/bcpg/S2K.java b/pg/src/main/java/org/spongycastle/bcpg/S2K.java index 389814f7..6b36b3bc 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/S2K.java +++ b/pg/src/main/java/org/spongycastle/bcpg/S2K.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.DataInputStream; import java.io.IOException; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/SecretKeyPacket.java b/pg/src/main/java/org/spongycastle/bcpg/SecretKeyPacket.java index d362bb93..e5e72c39 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/SecretKeyPacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/SecretKeyPacket.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/SecretSubkeyPacket.java b/pg/src/main/java/org/spongycastle/bcpg/SecretSubkeyPacket.java index 728ab3d7..d978d5c4 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/SecretSubkeyPacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/SecretSubkeyPacket.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.*; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/SignaturePacket.java b/pg/src/main/java/org/spongycastle/bcpg/SignaturePacket.java index 75edc025..5b00692a 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/SignaturePacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/SignaturePacket.java @@ -1,13 +1,13 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Vector; -import org.bouncycastle.bcpg.sig.IssuerKeyID; -import org.bouncycastle.bcpg.sig.SignatureCreationTime; -import org.bouncycastle.util.Arrays; +import org.spongycastle.bcpg.sig.IssuerKeyID; +import org.spongycastle.bcpg.sig.SignatureCreationTime; +import org.spongycastle.util.Arrays; /** * generic signature packet diff --git a/pg/src/main/java/org/bouncycastle/bcpg/SignatureSubpacket.java b/pg/src/main/java/org/spongycastle/bcpg/SignatureSubpacket.java index c44e9eac..c427cef9 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/SignatureSubpacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/SignatureSubpacket.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.IOException; import java.io.OutputStream; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/SignatureSubpacketInputStream.java b/pg/src/main/java/org/spongycastle/bcpg/SignatureSubpacketInputStream.java index 891511be..678062a5 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/SignatureSubpacketInputStream.java +++ b/pg/src/main/java/org/spongycastle/bcpg/SignatureSubpacketInputStream.java @@ -1,23 +1,23 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; -import org.bouncycastle.bcpg.sig.Exportable; -import org.bouncycastle.bcpg.sig.IssuerKeyID; -import org.bouncycastle.bcpg.sig.KeyExpirationTime; -import org.bouncycastle.bcpg.sig.KeyFlags; -import org.bouncycastle.bcpg.sig.NotationData; -import org.bouncycastle.bcpg.sig.PreferredAlgorithms; -import org.bouncycastle.bcpg.sig.PrimaryUserID; -import org.bouncycastle.bcpg.sig.Revocable; -import org.bouncycastle.bcpg.sig.SignatureCreationTime; -import org.bouncycastle.bcpg.sig.SignatureExpirationTime; -import org.bouncycastle.bcpg.sig.SignerUserID; -import org.bouncycastle.bcpg.sig.TrustSignature; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.io.Streams; +import org.spongycastle.bcpg.sig.Exportable; +import org.spongycastle.bcpg.sig.IssuerKeyID; +import org.spongycastle.bcpg.sig.KeyExpirationTime; +import org.spongycastle.bcpg.sig.KeyFlags; +import org.spongycastle.bcpg.sig.NotationData; +import org.spongycastle.bcpg.sig.PreferredAlgorithms; +import org.spongycastle.bcpg.sig.PrimaryUserID; +import org.spongycastle.bcpg.sig.Revocable; +import org.spongycastle.bcpg.sig.SignatureCreationTime; +import org.spongycastle.bcpg.sig.SignatureExpirationTime; +import org.spongycastle.bcpg.sig.SignerUserID; +import org.spongycastle.bcpg.sig.TrustSignature; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.io.Streams; /** * reader for signature sub-packets diff --git a/pg/src/main/java/org/bouncycastle/bcpg/SignatureSubpacketTags.java b/pg/src/main/java/org/spongycastle/bcpg/SignatureSubpacketTags.java index 8c279586..fdeaae52 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/SignatureSubpacketTags.java +++ b/pg/src/main/java/org/spongycastle/bcpg/SignatureSubpacketTags.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; /** * Basic PGP signature sub-packet tag types. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/SymmetricEncDataPacket.java b/pg/src/main/java/org/spongycastle/bcpg/SymmetricEncDataPacket.java index 6efe350a..51cace69 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/SymmetricEncDataPacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/SymmetricEncDataPacket.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; /** * Basic type for a symmetric key encrypted packet diff --git a/pg/src/main/java/org/bouncycastle/bcpg/SymmetricEncIntegrityPacket.java b/pg/src/main/java/org/spongycastle/bcpg/SymmetricEncIntegrityPacket.java index 8e8fac66..00e0c7ff 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/SymmetricEncIntegrityPacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/SymmetricEncIntegrityPacket.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.IOException; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/SymmetricKeyAlgorithmTags.java b/pg/src/main/java/org/spongycastle/bcpg/SymmetricKeyAlgorithmTags.java index 43b66cd2..be553bba 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/SymmetricKeyAlgorithmTags.java +++ b/pg/src/main/java/org/spongycastle/bcpg/SymmetricKeyAlgorithmTags.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; /** * Basic tags for symmetric key algorithms diff --git a/pg/src/main/java/org/bouncycastle/bcpg/SymmetricKeyEncSessionPacket.java b/pg/src/main/java/org/spongycastle/bcpg/SymmetricKeyEncSessionPacket.java index 37769fef..138bbba4 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/SymmetricKeyEncSessionPacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/SymmetricKeyEncSessionPacket.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/TrustPacket.java b/pg/src/main/java/org/spongycastle/bcpg/TrustPacket.java index 05a00322..3a98003b 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/TrustPacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/TrustPacket.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/UserAttributePacket.java b/pg/src/main/java/org/spongycastle/bcpg/UserAttributePacket.java index 3f4913ab..64d3ca08 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/UserAttributePacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/UserAttributePacket.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/pg/src/main/java/org/bouncycastle/bcpg/UserAttributeSubpacket.java b/pg/src/main/java/org/spongycastle/bcpg/UserAttributeSubpacket.java index f372399d..36933991 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/UserAttributeSubpacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/UserAttributeSubpacket.java @@ -1,9 +1,9 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.IOException; import java.io.OutputStream; -import org.bouncycastle.util.Arrays; +import org.spongycastle.util.Arrays; /** * Basic type for a user attribute sub-packet. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/UserAttributeSubpacketInputStream.java b/pg/src/main/java/org/spongycastle/bcpg/UserAttributeSubpacketInputStream.java index 2b1ed0d1..d32e0390 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/UserAttributeSubpacketInputStream.java +++ b/pg/src/main/java/org/spongycastle/bcpg/UserAttributeSubpacketInputStream.java @@ -1,10 +1,10 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; -import org.bouncycastle.bcpg.attr.ImageAttribute; +import org.spongycastle.bcpg.attr.ImageAttribute; /** * reader for user attribute sub-packets diff --git a/pg/src/main/java/org/bouncycastle/bcpg/UserAttributeSubpacketTags.java b/pg/src/main/java/org/spongycastle/bcpg/UserAttributeSubpacketTags.java index f6675d86..fc653140 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/UserAttributeSubpacketTags.java +++ b/pg/src/main/java/org/spongycastle/bcpg/UserAttributeSubpacketTags.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; /** * Basic PGP user attribute sub-packet tag types. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/UserIDPacket.java b/pg/src/main/java/org/spongycastle/bcpg/UserIDPacket.java index 7fd79186..5ddc3e8c 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/UserIDPacket.java +++ b/pg/src/main/java/org/spongycastle/bcpg/UserIDPacket.java @@ -1,9 +1,9 @@ -package org.bouncycastle.bcpg; +package org.spongycastle.bcpg; import java.io.IOException; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.Strings; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.Strings; /** * Basic type for a user ID packet. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/attr/ImageAttribute.java b/pg/src/main/java/org/spongycastle/bcpg/attr/ImageAttribute.java index 467f5015..b7758587 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/attr/ImageAttribute.java +++ b/pg/src/main/java/org/spongycastle/bcpg/attr/ImageAttribute.java @@ -1,10 +1,10 @@ -package org.bouncycastle.bcpg.attr; +package org.spongycastle.bcpg.attr; import java.io.ByteArrayOutputStream; import java.io.IOException; -import org.bouncycastle.bcpg.UserAttributeSubpacket; -import org.bouncycastle.bcpg.UserAttributeSubpacketTags; +import org.spongycastle.bcpg.UserAttributeSubpacket; +import org.spongycastle.bcpg.UserAttributeSubpacketTags; /** * Basic type for a image attribute packet. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/sig/EmbeddedSignature.java b/pg/src/main/java/org/spongycastle/bcpg/sig/EmbeddedSignature.java index 1288389f..b4861b12 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/sig/EmbeddedSignature.java +++ b/pg/src/main/java/org/spongycastle/bcpg/sig/EmbeddedSignature.java @@ -1,7 +1,7 @@ -package org.bouncycastle.bcpg.sig; +package org.spongycastle.bcpg.sig; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacketTags; /** * Packet embedded signature diff --git a/pg/src/main/java/org/bouncycastle/bcpg/sig/Exportable.java b/pg/src/main/java/org/spongycastle/bcpg/sig/Exportable.java index 8adafba5..5831a69a 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/sig/Exportable.java +++ b/pg/src/main/java/org/spongycastle/bcpg/sig/Exportable.java @@ -1,7 +1,7 @@ -package org.bouncycastle.bcpg.sig; +package org.spongycastle.bcpg.sig; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacketTags; /** * packet giving signature creation time. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/sig/Features.java b/pg/src/main/java/org/spongycastle/bcpg/sig/Features.java index 1adf2643..02ee5790 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/sig/Features.java +++ b/pg/src/main/java/org/spongycastle/bcpg/sig/Features.java @@ -1,7 +1,7 @@ -package org.bouncycastle.bcpg.sig; +package org.spongycastle.bcpg.sig; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacketTags; public class Features extends SignatureSubpacket diff --git a/pg/src/main/java/org/bouncycastle/bcpg/sig/IssuerKeyID.java b/pg/src/main/java/org/spongycastle/bcpg/sig/IssuerKeyID.java index 2b908cd3..b963b797 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/sig/IssuerKeyID.java +++ b/pg/src/main/java/org/spongycastle/bcpg/sig/IssuerKeyID.java @@ -1,7 +1,7 @@ -package org.bouncycastle.bcpg.sig; +package org.spongycastle.bcpg.sig; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacketTags; /** * packet giving signature creation time. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/sig/KeyExpirationTime.java b/pg/src/main/java/org/spongycastle/bcpg/sig/KeyExpirationTime.java index 91b21b07..dc0817c9 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/sig/KeyExpirationTime.java +++ b/pg/src/main/java/org/spongycastle/bcpg/sig/KeyExpirationTime.java @@ -1,7 +1,7 @@ -package org.bouncycastle.bcpg.sig; +package org.spongycastle.bcpg.sig; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacketTags; /** * packet giving time after creation at which the key expires. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/sig/KeyFlags.java b/pg/src/main/java/org/spongycastle/bcpg/sig/KeyFlags.java index 326f9282..6ebb1fa8 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/sig/KeyFlags.java +++ b/pg/src/main/java/org/spongycastle/bcpg/sig/KeyFlags.java @@ -1,7 +1,7 @@ -package org.bouncycastle.bcpg.sig; +package org.spongycastle.bcpg.sig; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacketTags; /** * Packet holding the key flag values. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/sig/NotationData.java b/pg/src/main/java/org/spongycastle/bcpg/sig/NotationData.java index 85172ee3..d4b04323 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/sig/NotationData.java +++ b/pg/src/main/java/org/spongycastle/bcpg/sig/NotationData.java @@ -1,10 +1,10 @@ -package org.bouncycastle.bcpg.sig; +package org.spongycastle.bcpg.sig; import java.io.ByteArrayOutputStream; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.SignatureSubpacketTags; -import org.bouncycastle.util.Strings; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.util.Strings; /** * Class provided a NotationData object according to diff --git a/pg/src/main/java/org/bouncycastle/bcpg/sig/PreferredAlgorithms.java b/pg/src/main/java/org/spongycastle/bcpg/sig/PreferredAlgorithms.java index ca83b056..ce99a1dc 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/sig/PreferredAlgorithms.java +++ b/pg/src/main/java/org/spongycastle/bcpg/sig/PreferredAlgorithms.java @@ -1,6 +1,6 @@ -package org.bouncycastle.bcpg.sig; +package org.spongycastle.bcpg.sig; -import org.bouncycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacket; /** * packet giving signature creation time. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/sig/PrimaryUserID.java b/pg/src/main/java/org/spongycastle/bcpg/sig/PrimaryUserID.java index 2e0d7fd3..80829ad8 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/sig/PrimaryUserID.java +++ b/pg/src/main/java/org/spongycastle/bcpg/sig/PrimaryUserID.java @@ -1,7 +1,7 @@ -package org.bouncycastle.bcpg.sig; +package org.spongycastle.bcpg.sig; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacketTags; /** * packet giving whether or not the signature is signed using the primary user ID for the key. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/sig/Revocable.java b/pg/src/main/java/org/spongycastle/bcpg/sig/Revocable.java index 9807ca89..b982b014 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/sig/Revocable.java +++ b/pg/src/main/java/org/spongycastle/bcpg/sig/Revocable.java @@ -1,7 +1,7 @@ -package org.bouncycastle.bcpg.sig; +package org.spongycastle.bcpg.sig; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacketTags; /** * packet giving whether or not is revocable. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/sig/RevocationKey.java b/pg/src/main/java/org/spongycastle/bcpg/sig/RevocationKey.java index b46eab56..b1059330 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/sig/RevocationKey.java +++ b/pg/src/main/java/org/spongycastle/bcpg/sig/RevocationKey.java @@ -1,7 +1,7 @@ -package org.bouncycastle.bcpg.sig; +package org.spongycastle.bcpg.sig; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacketTags; /** * Represents revocation key OpenPGP signature sub packet. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/sig/RevocationKeyTags.java b/pg/src/main/java/org/spongycastle/bcpg/sig/RevocationKeyTags.java index aee90c1e..294fdd34 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/sig/RevocationKeyTags.java +++ b/pg/src/main/java/org/spongycastle/bcpg/sig/RevocationKeyTags.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg.sig; +package org.spongycastle.bcpg.sig; public interface RevocationKeyTags { diff --git a/pg/src/main/java/org/bouncycastle/bcpg/sig/RevocationReason.java b/pg/src/main/java/org/spongycastle/bcpg/sig/RevocationReason.java index e3b50fec..33cf451d 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/sig/RevocationReason.java +++ b/pg/src/main/java/org/spongycastle/bcpg/sig/RevocationReason.java @@ -1,8 +1,8 @@ -package org.bouncycastle.bcpg.sig; +package org.spongycastle.bcpg.sig; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.SignatureSubpacketTags; -import org.bouncycastle.util.Strings; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.util.Strings; /** * Represents revocation reason OpenPGP signature sub packet. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/sig/RevocationReasonTags.java b/pg/src/main/java/org/spongycastle/bcpg/sig/RevocationReasonTags.java index 576b1818..94233fb3 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/sig/RevocationReasonTags.java +++ b/pg/src/main/java/org/spongycastle/bcpg/sig/RevocationReasonTags.java @@ -1,4 +1,4 @@ -package org.bouncycastle.bcpg.sig; +package org.spongycastle.bcpg.sig; public interface RevocationReasonTags { diff --git a/pg/src/main/java/org/bouncycastle/bcpg/sig/SignatureCreationTime.java b/pg/src/main/java/org/spongycastle/bcpg/sig/SignatureCreationTime.java index 51705013..888cb9a9 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/sig/SignatureCreationTime.java +++ b/pg/src/main/java/org/spongycastle/bcpg/sig/SignatureCreationTime.java @@ -1,9 +1,9 @@ -package org.bouncycastle.bcpg.sig; +package org.spongycastle.bcpg.sig; import java.util.Date; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacketTags; /** * packet giving signature creation time. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/sig/SignatureExpirationTime.java b/pg/src/main/java/org/spongycastle/bcpg/sig/SignatureExpirationTime.java index 6aa949c5..bcf1444d 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/sig/SignatureExpirationTime.java +++ b/pg/src/main/java/org/spongycastle/bcpg/sig/SignatureExpirationTime.java @@ -1,7 +1,7 @@ -package org.bouncycastle.bcpg.sig; +package org.spongycastle.bcpg.sig; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacketTags; /** * packet giving signature expiration time. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/sig/SignerUserID.java b/pg/src/main/java/org/spongycastle/bcpg/sig/SignerUserID.java index 589208d2..f1adf4b1 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/sig/SignerUserID.java +++ b/pg/src/main/java/org/spongycastle/bcpg/sig/SignerUserID.java @@ -1,9 +1,9 @@ -package org.bouncycastle.bcpg.sig; +package org.spongycastle.bcpg.sig; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.SignatureSubpacketTags; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.Strings; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.Strings; /** * packet giving the User ID of the signer. diff --git a/pg/src/main/java/org/bouncycastle/bcpg/sig/TrustSignature.java b/pg/src/main/java/org/spongycastle/bcpg/sig/TrustSignature.java index a3239003..4555f222 100644 --- a/pg/src/main/java/org/bouncycastle/bcpg/sig/TrustSignature.java +++ b/pg/src/main/java/org/spongycastle/bcpg/sig/TrustSignature.java @@ -1,7 +1,7 @@ -package org.bouncycastle.bcpg.sig; +package org.spongycastle.bcpg.sig; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacketTags; /** * packet giving trust. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPAlgorithmParameters.java b/pg/src/main/java/org/spongycastle/openpgp/PGPAlgorithmParameters.java index 718a42d5..a9628afb 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPAlgorithmParameters.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPAlgorithmParameters.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; public interface PGPAlgorithmParameters { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPCompressedData.java b/pg/src/main/java/org/spongycastle/openpgp/PGPCompressedData.java index a609b5b3..9269dfee 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPCompressedData.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPCompressedData.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.EOFException; import java.io.IOException; @@ -6,11 +6,11 @@ import java.io.InputStream; import java.util.zip.Inflater; import java.util.zip.InflaterInputStream; -import org.bouncycastle.apache.bzip2.CBZip2InputStream; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.CompressedDataPacket; -import org.bouncycastle.bcpg.CompressionAlgorithmTags; -import org.bouncycastle.bcpg.PacketTags; +import org.spongycastle.apache.bzip2.CBZip2InputStream; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.CompressedDataPacket; +import org.spongycastle.bcpg.CompressionAlgorithmTags; +import org.spongycastle.bcpg.PacketTags; /** * A PGP compressed data object. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPCompressedDataGenerator.java b/pg/src/main/java/org/spongycastle/openpgp/PGPCompressedDataGenerator.java index e680a02a..ae9bd043 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPCompressedDataGenerator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPCompressedDataGenerator.java @@ -1,14 +1,14 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.IOException; import java.io.OutputStream; import java.util.zip.Deflater; import java.util.zip.DeflaterOutputStream; -import org.bouncycastle.apache.bzip2.CBZip2OutputStream; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.CompressionAlgorithmTags; -import org.bouncycastle.bcpg.PacketTags; +import org.spongycastle.apache.bzip2.CBZip2OutputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.CompressionAlgorithmTags; +import org.spongycastle.bcpg.PacketTags; /** * Generator for producing compressed data packets. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPDataValidationException.java b/pg/src/main/java/org/spongycastle/openpgp/PGPDataValidationException.java index d48b6996..1b6fb10b 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPDataValidationException.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPDataValidationException.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; /** * Thrown if the iv at the start of a data stream indicates the wrong key diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPEncryptedData.java b/pg/src/main/java/org/spongycastle/openpgp/PGPEncryptedData.java index 8b570bc5..6f5f4043 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPEncryptedData.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPEncryptedData.java @@ -1,17 +1,17 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import org.bouncycastle.bcpg.InputStreamPacket; -import org.bouncycastle.bcpg.SymmetricEncIntegrityPacket; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.openpgp.operator.PGPDataDecryptor; -import org.bouncycastle.openpgp.operator.PGPDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.util.Arrays; +import org.spongycastle.bcpg.InputStreamPacket; +import org.spongycastle.bcpg.SymmetricEncIntegrityPacket; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.openpgp.operator.PGPDataDecryptor; +import org.spongycastle.openpgp.operator.PGPDataDecryptorFactory; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.util.Arrays; /** * A PGP encrypted data object. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPEncryptedDataGenerator.java b/pg/src/main/java/org/spongycastle/openpgp/PGPEncryptedDataGenerator.java index 855e9842..6300d001 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPEncryptedDataGenerator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPEncryptedDataGenerator.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.IOException; import java.io.OutputStream; @@ -6,16 +6,16 @@ import java.security.SecureRandom; import java.util.ArrayList; import java.util.List; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.PacketTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.openpgp.operator.PBEKeyEncryptionMethodGenerator; -import org.bouncycastle.openpgp.operator.PGPDataEncryptor; -import org.bouncycastle.openpgp.operator.PGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.openpgp.operator.PGPKeyEncryptionMethodGenerator; -import org.bouncycastle.util.io.TeeOutputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.PacketTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.openpgp.operator.PBEKeyEncryptionMethodGenerator; +import org.spongycastle.openpgp.operator.PGPDataEncryptor; +import org.spongycastle.openpgp.operator.PGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.openpgp.operator.PGPKeyEncryptionMethodGenerator; +import org.spongycastle.util.io.TeeOutputStream; /** * Generator for encrypted objects. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPEncryptedDataList.java b/pg/src/main/java/org/spongycastle/openpgp/PGPEncryptedDataList.java index 65c58a67..7942d1ef 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPEncryptedDataList.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPEncryptedDataList.java @@ -1,15 +1,15 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.InputStreamPacket; -import org.bouncycastle.bcpg.PacketTags; -import org.bouncycastle.bcpg.PublicKeyEncSessionPacket; -import org.bouncycastle.bcpg.SymmetricKeyEncSessionPacket; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.InputStreamPacket; +import org.spongycastle.bcpg.PacketTags; +import org.spongycastle.bcpg.PublicKeyEncSessionPacket; +import org.spongycastle.bcpg.SymmetricKeyEncSessionPacket; /** * A holder for a list of PGP encryption method packets and the encrypted data associated with them. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPException.java b/pg/src/main/java/org/spongycastle/openpgp/PGPException.java index 0420fcd8..220672ac 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPException.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPException.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; /** * generic exception class for PGP encoding/decoding problems diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPKdfParameters.java b/pg/src/main/java/org/spongycastle/openpgp/PGPKdfParameters.java index f80c5be5..fc37af74 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPKdfParameters.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPKdfParameters.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; public class PGPKdfParameters implements PGPAlgorithmParameters diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPKeyFlags.java b/pg/src/main/java/org/spongycastle/openpgp/PGPKeyFlags.java index 6e4a4de6..2c169126 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPKeyFlags.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPKeyFlags.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; /** * key flag values for the KeyFlags subpacket. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPKeyPair.java b/pg/src/main/java/org/spongycastle/openpgp/PGPKeyPair.java index 81c03f08..9ac974e2 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPKeyPair.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPKeyPair.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; /** * General class to handle JCA key pairs and convert them into OpenPGP ones. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPKeyRing.java b/pg/src/main/java/org/spongycastle/openpgp/PGPKeyRing.java index 413e1af9..f2018a07 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPKeyRing.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPKeyRing.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.IOException; import java.io.InputStream; @@ -7,13 +7,13 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.Packet; -import org.bouncycastle.bcpg.PacketTags; -import org.bouncycastle.bcpg.SignaturePacket; -import org.bouncycastle.bcpg.TrustPacket; -import org.bouncycastle.bcpg.UserAttributePacket; -import org.bouncycastle.bcpg.UserIDPacket; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.Packet; +import org.spongycastle.bcpg.PacketTags; +import org.spongycastle.bcpg.SignaturePacket; +import org.spongycastle.bcpg.TrustPacket; +import org.spongycastle.bcpg.UserAttributePacket; +import org.spongycastle.bcpg.UserIDPacket; public abstract class PGPKeyRing { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPKeyRingGenerator.java b/pg/src/main/java/org/spongycastle/openpgp/PGPKeyRingGenerator.java index a5f84b4f..b631bb8b 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPKeyRingGenerator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPKeyRingGenerator.java @@ -1,13 +1,13 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.bouncycastle.bcpg.PublicSubkeyPacket; -import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor; -import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.bcpg.PublicSubkeyPacket; +import org.spongycastle.openpgp.operator.PBESecretKeyEncryptor; +import org.spongycastle.openpgp.operator.PGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; /** * Generator for a PGP master and subkey ring. This class will generate diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPKeyValidationException.java b/pg/src/main/java/org/spongycastle/openpgp/PGPKeyValidationException.java index 1604a46b..63245c51 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPKeyValidationException.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPKeyValidationException.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; /** * Thrown if the key checksum is invalid. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPLiteralData.java b/pg/src/main/java/org/spongycastle/openpgp/PGPLiteralData.java index c90fb1f1..d640bab0 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPLiteralData.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPLiteralData.java @@ -1,11 +1,11 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.IOException; import java.io.InputStream; import java.util.Date; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.LiteralDataPacket; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.LiteralDataPacket; /** * A single literal data packet in a PGP object stream. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPLiteralDataGenerator.java b/pg/src/main/java/org/spongycastle/openpgp/PGPLiteralDataGenerator.java index 1b8da659..9487238e 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPLiteralDataGenerator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPLiteralDataGenerator.java @@ -1,13 +1,13 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.File; import java.io.IOException; import java.io.OutputStream; import java.util.Date; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.PacketTags; -import org.bouncycastle.util.Strings; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.PacketTags; +import org.spongycastle.util.Strings; /** * Generator for producing literal data packets. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPMarker.java b/pg/src/main/java/org/spongycastle/openpgp/PGPMarker.java index 67f3109b..5719e90d 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPMarker.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPMarker.java @@ -4,12 +4,12 @@ * To change this generated comment go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.IOException; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.MarkerPacket; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.MarkerPacket; /** * a PGP marker packet - in general these should be ignored other than where diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPObjectFactory.java b/pg/src/main/java/org/spongycastle/openpgp/PGPObjectFactory.java index 5d2b90df..948a491a 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPObjectFactory.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPObjectFactory.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -6,12 +6,12 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.PacketTags; -import org.bouncycastle.openpgp.bc.BcPGPObjectFactory; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.PacketTags; +import org.spongycastle.openpgp.bc.BcPGPObjectFactory; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; /** * General class for reading a PGP object stream. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPOnePassSignature.java b/pg/src/main/java/org/spongycastle/openpgp/PGPOnePassSignature.java index beb631b6..8e1dbcf6 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPOnePassSignature.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPOnePassSignature.java @@ -1,15 +1,15 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.OnePassSignaturePacket; -import org.bouncycastle.openpgp.operator.PGPContentVerifier; -import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilder; -import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilderProvider; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.OnePassSignaturePacket; +import org.spongycastle.openpgp.operator.PGPContentVerifier; +import org.spongycastle.openpgp.operator.PGPContentVerifierBuilder; +import org.spongycastle.openpgp.operator.PGPContentVerifierBuilderProvider; /** * A one pass signature object. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPOnePassSignatureList.java b/pg/src/main/java/org/spongycastle/openpgp/PGPOnePassSignatureList.java index e367fcd4..471c64e9 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPOnePassSignatureList.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPOnePassSignatureList.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; /** * Holder for a list of PGPOnePassSignatures diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPPBEEncryptedData.java b/pg/src/main/java/org/spongycastle/openpgp/PGPPBEEncryptedData.java index c14ad548..fffb5d93 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPPBEEncryptedData.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPPBEEncryptedData.java @@ -1,16 +1,16 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.EOFException; import java.io.InputStream; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.InputStreamPacket; -import org.bouncycastle.bcpg.SymmetricEncIntegrityPacket; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyEncSessionPacket; -import org.bouncycastle.openpgp.operator.PBEDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.PGPDataDecryptor; -import org.bouncycastle.util.io.TeeInputStream; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.InputStreamPacket; +import org.spongycastle.bcpg.SymmetricEncIntegrityPacket; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyEncSessionPacket; +import org.spongycastle.openpgp.operator.PBEDataDecryptorFactory; +import org.spongycastle.openpgp.operator.PGPDataDecryptor; +import org.spongycastle.util.io.TeeInputStream; /** * A password based encryption object. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPPrivateKey.java b/pg/src/main/java/org/spongycastle/openpgp/PGPPrivateKey.java index 1cd1de78..8ba973d7 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPPrivateKey.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPPrivateKey.java @@ -1,7 +1,7 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; -import org.bouncycastle.bcpg.BCPGKey; -import org.bouncycastle.bcpg.PublicKeyPacket; +import org.spongycastle.bcpg.BCPGKey; +import org.spongycastle.bcpg.PublicKeyPacket; /** * general class to contain a private key for use with other openPGP diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKey.java b/pg/src/main/java/org/spongycastle/openpgp/PGPPublicKey.java index be4ffd23..8f4d84a5 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKey.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPPublicKey.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -9,19 +9,19 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import org.bouncycastle.bcpg.BCPGKey; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.ContainedPacket; -import org.bouncycastle.bcpg.DSAPublicBCPGKey; -import org.bouncycastle.bcpg.ElGamalPublicBCPGKey; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyPacket; -import org.bouncycastle.bcpg.RSAPublicBCPGKey; -import org.bouncycastle.bcpg.TrustPacket; -import org.bouncycastle.bcpg.UserAttributePacket; -import org.bouncycastle.bcpg.UserIDPacket; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; -import org.bouncycastle.util.Arrays; +import org.spongycastle.bcpg.BCPGKey; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.ContainedPacket; +import org.spongycastle.bcpg.DSAPublicBCPGKey; +import org.spongycastle.bcpg.ElGamalPublicBCPGKey; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyPacket; +import org.spongycastle.bcpg.RSAPublicBCPGKey; +import org.spongycastle.bcpg.TrustPacket; +import org.spongycastle.bcpg.UserAttributePacket; +import org.spongycastle.bcpg.UserIDPacket; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.util.Arrays; /** * general class to handle a PGP public key object. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKeyEncryptedData.java b/pg/src/main/java/org/spongycastle/openpgp/PGPPublicKeyEncryptedData.java index 18e5f644..5cf015d5 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKeyEncryptedData.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPPublicKeyEncryptedData.java @@ -1,16 +1,16 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.EOFException; import java.io.InputStream; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.InputStreamPacket; -import org.bouncycastle.bcpg.PublicKeyEncSessionPacket; -import org.bouncycastle.bcpg.SymmetricEncIntegrityPacket; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.openpgp.operator.PGPDataDecryptor; -import org.bouncycastle.openpgp.operator.PublicKeyDataDecryptorFactory; -import org.bouncycastle.util.io.TeeInputStream; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.InputStreamPacket; +import org.spongycastle.bcpg.PublicKeyEncSessionPacket; +import org.spongycastle.bcpg.SymmetricEncIntegrityPacket; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.openpgp.operator.PGPDataDecryptor; +import org.spongycastle.openpgp.operator.PublicKeyDataDecryptorFactory; +import org.spongycastle.util.io.TeeInputStream; /** * A public key encrypted data object. diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPPublicKeyRing.java b/pg/src/main/java/org/spongycastle/openpgp/PGPPublicKeyRing.java index f39bfd1a..35620ff2 100644 --- a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPPublicKeyRing.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPPublicKeyRing.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -10,11 +10,11 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.PacketTags; -import org.bouncycastle.bcpg.PublicKeyPacket; -import org.bouncycastle.bcpg.TrustPacket; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.PacketTags; +import org.spongycastle.bcpg.PublicKeyPacket; +import org.spongycastle.bcpg.TrustPacket; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; /** * Class to hold a single master public key and its subkeys. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKeyRingCollection.java b/pg/src/main/java/org/spongycastle/openpgp/PGPPublicKeyRingCollection.java index 40b70d2c..74b61cfd 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKeyRingCollection.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPPublicKeyRingCollection.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -12,10 +12,10 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; -import org.bouncycastle.util.Strings; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.util.Strings; /** * Often a PGP key ring file is made up of a succession of master/sub-key key rings. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPRuntimeOperationException.java b/pg/src/main/java/org/spongycastle/openpgp/PGPRuntimeOperationException.java index c4067ec0..8e64ce7e 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPRuntimeOperationException.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPRuntimeOperationException.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; public class PGPRuntimeOperationException extends RuntimeException diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPSecretKey.java b/pg/src/main/java/org/spongycastle/openpgp/PGPSecretKey.java index 387e989e..a3e583ea 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPSecretKey.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPSecretKey.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -11,31 +11,31 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import org.bouncycastle.asn1.x9.ECNamedCurveTable; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.BCPGObject; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.ContainedPacket; -import org.bouncycastle.bcpg.DSASecretBCPGKey; -import org.bouncycastle.bcpg.ECDSAPublicBCPGKey; -import org.bouncycastle.bcpg.ECSecretBCPGKey; -import org.bouncycastle.bcpg.ElGamalSecretBCPGKey; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyPacket; -import org.bouncycastle.bcpg.RSASecretBCPGKey; -import org.bouncycastle.bcpg.S2K; -import org.bouncycastle.bcpg.SecretKeyPacket; -import org.bouncycastle.bcpg.SecretSubkeyPacket; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.bcpg.UserAttributePacket; -import org.bouncycastle.bcpg.UserIDPacket; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; -import org.bouncycastle.openpgp.operator.PBEProtectionRemoverFactory; -import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor; -import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor; -import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.asn1.x9.ECNamedCurveTable; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.BCPGObject; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.ContainedPacket; +import org.spongycastle.bcpg.DSASecretBCPGKey; +import org.spongycastle.bcpg.ECDSAPublicBCPGKey; +import org.spongycastle.bcpg.ECSecretBCPGKey; +import org.spongycastle.bcpg.ElGamalSecretBCPGKey; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyPacket; +import org.spongycastle.bcpg.RSASecretBCPGKey; +import org.spongycastle.bcpg.S2K; +import org.spongycastle.bcpg.SecretKeyPacket; +import org.spongycastle.bcpg.SecretSubkeyPacket; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.bcpg.UserAttributePacket; +import org.spongycastle.bcpg.UserIDPacket; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.openpgp.operator.PBEProtectionRemoverFactory; +import org.spongycastle.openpgp.operator.PBESecretKeyDecryptor; +import org.spongycastle.openpgp.operator.PBESecretKeyEncryptor; +import org.spongycastle.openpgp.operator.PGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; /** * general class to handle and construct a PGP secret key object. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPSecretKeyRing.java b/pg/src/main/java/org/spongycastle/openpgp/PGPSecretKeyRing.java index ce356ceb..4391bc9b 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPSecretKeyRing.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPSecretKeyRing.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -10,15 +10,15 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.PacketTags; -import org.bouncycastle.bcpg.PublicSubkeyPacket; -import org.bouncycastle.bcpg.SecretKeyPacket; -import org.bouncycastle.bcpg.SecretSubkeyPacket; -import org.bouncycastle.bcpg.TrustPacket; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; -import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor; -import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.PacketTags; +import org.spongycastle.bcpg.PublicSubkeyPacket; +import org.spongycastle.bcpg.SecretKeyPacket; +import org.spongycastle.bcpg.SecretSubkeyPacket; +import org.spongycastle.bcpg.TrustPacket; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.openpgp.operator.PBESecretKeyDecryptor; +import org.spongycastle.openpgp.operator.PBESecretKeyEncryptor; /** * Class to hold a single master secret key and its subkeys. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPSecretKeyRingCollection.java b/pg/src/main/java/org/spongycastle/openpgp/PGPSecretKeyRingCollection.java index eb248188..61469242 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPSecretKeyRingCollection.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPSecretKeyRingCollection.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -12,10 +12,10 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; -import org.bouncycastle.util.Strings; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.util.Strings; /** * Often a PGP key ring file is made up of a succession of master/sub-key key rings. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPSignature.java b/pg/src/main/java/org/spongycastle/openpgp/PGPSignature.java index f5b4c9a8..b58a667e 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPSignature.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPSignature.java @@ -1,25 +1,25 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; import java.util.Date; -import org.bouncycastle.asn1.ASN1EncodableVector; -import org.bouncycastle.asn1.ASN1Integer; -import org.bouncycastle.asn1.DERSequence; -import org.bouncycastle.bcpg.BCPGInputStream; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.MPInteger; -import org.bouncycastle.bcpg.SignaturePacket; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.TrustPacket; -import org.bouncycastle.bcpg.UserAttributeSubpacket; -import org.bouncycastle.openpgp.operator.PGPContentVerifier; -import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilder; -import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilderProvider; -import org.bouncycastle.util.BigIntegers; -import org.bouncycastle.util.Strings; +import org.spongycastle.asn1.ASN1EncodableVector; +import org.spongycastle.asn1.ASN1Integer; +import org.spongycastle.asn1.DERSequence; +import org.spongycastle.bcpg.BCPGInputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.MPInteger; +import org.spongycastle.bcpg.SignaturePacket; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.TrustPacket; +import org.spongycastle.bcpg.UserAttributeSubpacket; +import org.spongycastle.openpgp.operator.PGPContentVerifier; +import org.spongycastle.openpgp.operator.PGPContentVerifierBuilder; +import org.spongycastle.openpgp.operator.PGPContentVerifierBuilderProvider; +import org.spongycastle.util.BigIntegers; +import org.spongycastle.util.Strings; /** *A PGP signature object. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPSignatureGenerator.java b/pg/src/main/java/org/spongycastle/openpgp/PGPSignatureGenerator.java index 2450e1ee..d9308c1c 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPSignatureGenerator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPSignatureGenerator.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -6,18 +6,18 @@ import java.io.OutputStream; import java.math.BigInteger; import java.util.Date; -import org.bouncycastle.bcpg.MPInteger; -import org.bouncycastle.bcpg.OnePassSignaturePacket; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.SignaturePacket; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.SignatureSubpacketTags; -import org.bouncycastle.bcpg.UserAttributeSubpacket; -import org.bouncycastle.bcpg.sig.IssuerKeyID; -import org.bouncycastle.bcpg.sig.SignatureCreationTime; -import org.bouncycastle.openpgp.operator.PGPContentSigner; -import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder; -import org.bouncycastle.util.Strings; +import org.spongycastle.bcpg.MPInteger; +import org.spongycastle.bcpg.OnePassSignaturePacket; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.SignaturePacket; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.bcpg.UserAttributeSubpacket; +import org.spongycastle.bcpg.sig.IssuerKeyID; +import org.spongycastle.bcpg.sig.SignatureCreationTime; +import org.spongycastle.openpgp.operator.PGPContentSigner; +import org.spongycastle.openpgp.operator.PGPContentSignerBuilder; +import org.spongycastle.util.Strings; /** * Generator for PGP Signatures. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPSignatureList.java b/pg/src/main/java/org/spongycastle/openpgp/PGPSignatureList.java index 39a747c9..a7f6b8cf 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPSignatureList.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPSignatureList.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; /** * A list of PGP signatures - normally in the signature block after literal data. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPSignatureSubpacketGenerator.java b/pg/src/main/java/org/spongycastle/openpgp/PGPSignatureSubpacketGenerator.java index c91e7b6c..80718cfe 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPSignatureSubpacketGenerator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPSignatureSubpacketGenerator.java @@ -1,29 +1,29 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.IOException; import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.SignatureSubpacketTags; -import org.bouncycastle.bcpg.sig.EmbeddedSignature; -import org.bouncycastle.bcpg.sig.Exportable; -import org.bouncycastle.bcpg.sig.Features; -import org.bouncycastle.bcpg.sig.IssuerKeyID; -import org.bouncycastle.bcpg.sig.KeyExpirationTime; -import org.bouncycastle.bcpg.sig.KeyFlags; -import org.bouncycastle.bcpg.sig.NotationData; -import org.bouncycastle.bcpg.sig.PreferredAlgorithms; -import org.bouncycastle.bcpg.sig.PrimaryUserID; -import org.bouncycastle.bcpg.sig.Revocable; -import org.bouncycastle.bcpg.sig.RevocationKey; -import org.bouncycastle.bcpg.sig.RevocationKeyTags; -import org.bouncycastle.bcpg.sig.RevocationReason; -import org.bouncycastle.bcpg.sig.SignatureCreationTime; -import org.bouncycastle.bcpg.sig.SignatureExpirationTime; -import org.bouncycastle.bcpg.sig.SignerUserID; -import org.bouncycastle.bcpg.sig.TrustSignature; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.bcpg.sig.EmbeddedSignature; +import org.spongycastle.bcpg.sig.Exportable; +import org.spongycastle.bcpg.sig.Features; +import org.spongycastle.bcpg.sig.IssuerKeyID; +import org.spongycastle.bcpg.sig.KeyExpirationTime; +import org.spongycastle.bcpg.sig.KeyFlags; +import org.spongycastle.bcpg.sig.NotationData; +import org.spongycastle.bcpg.sig.PreferredAlgorithms; +import org.spongycastle.bcpg.sig.PrimaryUserID; +import org.spongycastle.bcpg.sig.Revocable; +import org.spongycastle.bcpg.sig.RevocationKey; +import org.spongycastle.bcpg.sig.RevocationKeyTags; +import org.spongycastle.bcpg.sig.RevocationReason; +import org.spongycastle.bcpg.sig.SignatureCreationTime; +import org.spongycastle.bcpg.sig.SignatureExpirationTime; +import org.spongycastle.bcpg.sig.SignerUserID; +import org.spongycastle.bcpg.sig.TrustSignature; /** * Generator for signature subpackets. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPSignatureSubpacketVector.java b/pg/src/main/java/org/spongycastle/openpgp/PGPSignatureSubpacketVector.java index 0c0d7028..3b48ccce 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPSignatureSubpacketVector.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPSignatureSubpacketVector.java @@ -1,23 +1,23 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.IOException; import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.bouncycastle.bcpg.SignaturePacket; -import org.bouncycastle.bcpg.SignatureSubpacket; -import org.bouncycastle.bcpg.SignatureSubpacketTags; -import org.bouncycastle.bcpg.sig.Features; -import org.bouncycastle.bcpg.sig.IssuerKeyID; -import org.bouncycastle.bcpg.sig.KeyExpirationTime; -import org.bouncycastle.bcpg.sig.KeyFlags; -import org.bouncycastle.bcpg.sig.NotationData; -import org.bouncycastle.bcpg.sig.PreferredAlgorithms; -import org.bouncycastle.bcpg.sig.PrimaryUserID; -import org.bouncycastle.bcpg.sig.SignatureCreationTime; -import org.bouncycastle.bcpg.sig.SignatureExpirationTime; -import org.bouncycastle.bcpg.sig.SignerUserID; +import org.spongycastle.bcpg.SignaturePacket; +import org.spongycastle.bcpg.SignatureSubpacket; +import org.spongycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.bcpg.sig.Features; +import org.spongycastle.bcpg.sig.IssuerKeyID; +import org.spongycastle.bcpg.sig.KeyExpirationTime; +import org.spongycastle.bcpg.sig.KeyFlags; +import org.spongycastle.bcpg.sig.NotationData; +import org.spongycastle.bcpg.sig.PreferredAlgorithms; +import org.spongycastle.bcpg.sig.PrimaryUserID; +import org.spongycastle.bcpg.sig.SignatureCreationTime; +import org.spongycastle.bcpg.sig.SignatureExpirationTime; +import org.spongycastle.bcpg.sig.SignerUserID; /** * Container for a list of signature subpackets. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPUserAttributeSubpacketVector.java b/pg/src/main/java/org/spongycastle/openpgp/PGPUserAttributeSubpacketVector.java index bf8ffe32..26d6c736 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPUserAttributeSubpacketVector.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPUserAttributeSubpacketVector.java @@ -1,8 +1,8 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; -import org.bouncycastle.bcpg.UserAttributeSubpacket; -import org.bouncycastle.bcpg.UserAttributeSubpacketTags; -import org.bouncycastle.bcpg.attr.ImageAttribute; +import org.spongycastle.bcpg.UserAttributeSubpacket; +import org.spongycastle.bcpg.UserAttributeSubpacketTags; +import org.spongycastle.bcpg.attr.ImageAttribute; /** * Container for a list of user attribute subpackets. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPUserAttributeSubpacketVectorGenerator.java b/pg/src/main/java/org/spongycastle/openpgp/PGPUserAttributeSubpacketVectorGenerator.java index 07f54177..66af84b3 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPUserAttributeSubpacketVectorGenerator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPUserAttributeSubpacketVectorGenerator.java @@ -1,7 +1,7 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; -import org.bouncycastle.bcpg.UserAttributeSubpacket; -import org.bouncycastle.bcpg.attr.ImageAttribute; +import org.spongycastle.bcpg.UserAttributeSubpacket; +import org.spongycastle.bcpg.attr.ImageAttribute; import java.util.ArrayList; import java.util.List; diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPUtil.java b/pg/src/main/java/org/spongycastle/openpgp/PGPUtil.java index 42e922bf..5f2c2619 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPUtil.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPUtil.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.BufferedInputStream; import java.io.File; @@ -11,15 +11,15 @@ import java.security.SecureRandom; import java.security.Signature; import java.util.Date; -import org.bouncycastle.asn1.ASN1InputStream; -import org.bouncycastle.asn1.ASN1Integer; -import org.bouncycastle.asn1.ASN1Sequence; -import org.bouncycastle.bcpg.ArmoredInputStream; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.MPInteger; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.util.encoders.Base64; +import org.spongycastle.asn1.ASN1InputStream; +import org.spongycastle.asn1.ASN1Integer; +import org.spongycastle.asn1.ASN1Sequence; +import org.spongycastle.bcpg.ArmoredInputStream; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.MPInteger; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.util.encoders.Base64; /** * PGP utilities. @@ -27,7 +27,7 @@ import org.bouncycastle.util.encoders.Base64; public class PGPUtil implements HashAlgorithmTags { - private static String defProvider = "BC"; + private static String defProvider = "SC"; /** * Return the JCA/JCE provider that will be used by factory classes in situations where a diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPV3SignatureGenerator.java b/pg/src/main/java/org/spongycastle/openpgp/PGPV3SignatureGenerator.java index 605e6608..cb6cb921 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPV3SignatureGenerator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/PGPV3SignatureGenerator.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -6,12 +6,12 @@ import java.io.OutputStream; import java.math.BigInteger; import java.util.Date; -import org.bouncycastle.bcpg.MPInteger; -import org.bouncycastle.bcpg.OnePassSignaturePacket; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.SignaturePacket; -import org.bouncycastle.openpgp.operator.PGPContentSigner; -import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder; +import org.spongycastle.bcpg.MPInteger; +import org.spongycastle.bcpg.OnePassSignaturePacket; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.SignaturePacket; +import org.spongycastle.openpgp.operator.PGPContentSigner; +import org.spongycastle.openpgp.operator.PGPContentSignerBuilder; /** * Generator for old style PGP V3 Signatures. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/SXprUtils.java b/pg/src/main/java/org/spongycastle/openpgp/SXprUtils.java index 8adac0e5..0da315ec 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/SXprUtils.java +++ b/pg/src/main/java/org/spongycastle/openpgp/SXprUtils.java @@ -1,11 +1,11 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.IOException; import java.io.InputStream; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.S2K; -import org.bouncycastle.util.io.Streams; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.S2K; +import org.spongycastle.util.io.Streams; /** * Utility functions for looking a S-expression keys. This class will move when it finds a better home! diff --git a/pg/src/main/java/org/bouncycastle/openpgp/StreamGenerator.java b/pg/src/main/java/org/spongycastle/openpgp/StreamGenerator.java index 75e92767..d65339f3 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/StreamGenerator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/StreamGenerator.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.IOException; diff --git a/pg/src/main/java/org/bouncycastle/openpgp/WrappedGeneratorStream.java b/pg/src/main/java/org/spongycastle/openpgp/WrappedGeneratorStream.java index 5b9191d9..f5360d51 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/WrappedGeneratorStream.java +++ b/pg/src/main/java/org/spongycastle/openpgp/WrappedGeneratorStream.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp; +package org.spongycastle.openpgp; import java.io.IOException; import java.io.OutputStream; diff --git a/pg/src/main/java/org/bouncycastle/openpgp/bc/BcPGPObjectFactory.java b/pg/src/main/java/org/spongycastle/openpgp/bc/BcPGPObjectFactory.java index 7ee93c73..d11c71b3 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/bc/BcPGPObjectFactory.java +++ b/pg/src/main/java/org/spongycastle/openpgp/bc/BcPGPObjectFactory.java @@ -1,10 +1,10 @@ -package org.bouncycastle.openpgp.bc; +package org.spongycastle.openpgp.bc; import java.io.ByteArrayInputStream; import java.io.InputStream; -import org.bouncycastle.openpgp.PGPObjectFactory; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.openpgp.PGPObjectFactory; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; /** * {@link PGPObjectFactory} that uses the Bouncy Castle lightweight API to implement cryptographic diff --git a/pg/src/main/java/org/bouncycastle/openpgp/bc/BcPGPPublicKeyRing.java b/pg/src/main/java/org/spongycastle/openpgp/bc/BcPGPPublicKeyRing.java index 4023be76..cb7f3839 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/bc/BcPGPPublicKeyRing.java +++ b/pg/src/main/java/org/spongycastle/openpgp/bc/BcPGPPublicKeyRing.java @@ -1,11 +1,11 @@ -package org.bouncycastle.openpgp.bc; +package org.spongycastle.openpgp.bc; import java.io.IOException; import java.io.InputStream; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; public class BcPGPPublicKeyRing extends PGPPublicKeyRing diff --git a/pg/src/main/java/org/bouncycastle/openpgp/bc/BcPGPPublicKeyRingCollection.java b/pg/src/main/java/org/spongycastle/openpgp/bc/BcPGPPublicKeyRingCollection.java index 20e09bca..e769f0ad 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/bc/BcPGPPublicKeyRingCollection.java +++ b/pg/src/main/java/org/spongycastle/openpgp/bc/BcPGPPublicKeyRingCollection.java @@ -1,13 +1,13 @@ -package org.bouncycastle.openpgp.bc; +package org.spongycastle.openpgp.bc; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Collection; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPublicKeyRingCollection; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; public class BcPGPPublicKeyRingCollection extends PGPPublicKeyRingCollection diff --git a/pg/src/main/java/org/bouncycastle/openpgp/bc/BcPGPSecretKeyRing.java b/pg/src/main/java/org/spongycastle/openpgp/bc/BcPGPSecretKeyRing.java index 8dac1d5e..2286b78c 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/bc/BcPGPSecretKeyRing.java +++ b/pg/src/main/java/org/spongycastle/openpgp/bc/BcPGPSecretKeyRing.java @@ -1,12 +1,12 @@ -package org.bouncycastle.openpgp.bc; +package org.spongycastle.openpgp.bc; import java.io.IOException; import java.io.InputStream; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; public class BcPGPSecretKeyRing extends PGPSecretKeyRing diff --git a/pg/src/main/java/org/bouncycastle/openpgp/bc/BcPGPSecretKeyRingCollection.java b/pg/src/main/java/org/spongycastle/openpgp/bc/BcPGPSecretKeyRingCollection.java index 57e0276e..64688e92 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/bc/BcPGPSecretKeyRingCollection.java +++ b/pg/src/main/java/org/spongycastle/openpgp/bc/BcPGPSecretKeyRingCollection.java @@ -1,13 +1,13 @@ -package org.bouncycastle.openpgp.bc; +package org.spongycastle.openpgp.bc; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Collection; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPSecretKeyRingCollection; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; public class BcPGPSecretKeyRingCollection extends PGPSecretKeyRingCollection diff --git a/pg/src/main/java/org/bouncycastle/openpgp/examples/ByteArrayHandler.java b/pg/src/main/java/org/spongycastle/openpgp/examples/ByteArrayHandler.java index 636032e1..52b2327d 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/examples/ByteArrayHandler.java +++ b/pg/src/main/java/org/spongycastle/openpgp/examples/ByteArrayHandler.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.examples; +package org.spongycastle.openpgp.examples; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -10,24 +10,24 @@ import java.security.SecureRandom; import java.security.Security; import java.util.Date; -import org.bouncycastle.bcpg.ArmoredOutputStream; -import org.bouncycastle.bcpg.CompressionAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPCompressedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPPBEEncryptedData; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePBEDataDecryptorFactoryBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePBEKeyEncryptionMethodGenerator; -import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; -import org.bouncycastle.util.io.Streams; +import org.spongycastle.bcpg.ArmoredOutputStream; +import org.spongycastle.bcpg.CompressionAlgorithmTags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPCompressedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPPBEEncryptedData; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePBEDataDecryptorFactoryBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePBEKeyEncryptionMethodGenerator; +import org.spongycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; +import org.spongycastle.util.io.Streams; /** * Simple routine to encrypt and decrypt using a passphrase. @@ -80,7 +80,7 @@ public class ByteArrayHandler PGPPBEEncryptedData pbe = (PGPPBEEncryptedData)enc.get(0); - InputStream clear = pbe.getDataStream(new JcePBEDataDecryptorFactoryBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(passPhrase)); + InputStream clear = pbe.getDataStream(new JcePBEDataDecryptorFactoryBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(passPhrase)); JcaPGPObjectFactory pgpFact = new JcaPGPObjectFactory(clear); @@ -139,8 +139,8 @@ public class ByteArrayHandler out = new ArmoredOutputStream(out); } - PGPEncryptedDataGenerator encGen = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(algorithm).setSecureRandom(new SecureRandom()).setProvider("BC")); - encGen.addMethod(new JcePBEKeyEncryptionMethodGenerator(passPhrase).setProvider("BC")); + PGPEncryptedDataGenerator encGen = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(algorithm).setSecureRandom(new SecureRandom()).setProvider("SC")); + encGen.addMethod(new JcePBEKeyEncryptionMethodGenerator(passPhrase).setProvider("SC")); OutputStream encOut = encGen.open(out, compressedData.length); @@ -198,7 +198,7 @@ public class ByteArrayHandler encrypted = encrypt(original, passArray, "iway", PGPEncryptedDataGenerator.AES_256, false); - System.out.println("\nencrypted data = '"+new String(org.bouncycastle.util.encoders.Hex.encode(encrypted))+"'"); + System.out.println("\nencrypted data = '"+new String(org.spongycastle.util.encoders.Hex.encode(encrypted))+"'"); decrypted= decrypt(encrypted, passArray); System.out.println("\ndecrypted data = '"+new String(decrypted)+"'"); diff --git a/pg/src/main/java/org/bouncycastle/openpgp/examples/ClearSignedFileProcessor.java b/pg/src/main/java/org/spongycastle/openpgp/examples/ClearSignedFileProcessor.java index 5076732d..62f53539 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/examples/ClearSignedFileProcessor.java +++ b/pg/src/main/java/org/spongycastle/openpgp/examples/ClearSignedFileProcessor.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.examples; +package org.spongycastle.openpgp.examples; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -14,25 +14,25 @@ import java.security.Security; import java.security.SignatureException; import java.util.Iterator; -import org.bouncycastle.bcpg.ArmoredInputStream; -import org.bouncycastle.bcpg.ArmoredOutputStream; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.bcpg.ArmoredInputStream; +import org.spongycastle.bcpg.ArmoredOutputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRingCollection; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; /** * A simple utility class that creates clear signed files and verifies them. @@ -152,7 +152,7 @@ public class ClearSignedFileProcessor PGPSignature sig = p3.get(0); PGPPublicKey publicKey = pgpRings.getPublicKey(sig.getKeyID()); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), publicKey); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), publicKey); // // read the input, making sure we ignore the last newline. @@ -242,8 +242,8 @@ public class ClearSignedFileProcessor } PGPSecretKey pgpSecKey = PGPExampleUtil.readSecretKey(keyIn); - PGPPrivateKey pgpPrivKey = pgpSecKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(pass)); - PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(pgpSecKey.getPublicKey().getAlgorithm(), digest).setProvider("BC")); + PGPPrivateKey pgpPrivKey = pgpSecKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(pass)); + PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(pgpSecKey.getPublicKey().getAlgorithm(), digest).setProvider("SC")); PGPSignatureSubpacketGenerator spGen = new PGPSignatureSubpacketGenerator(); sGen.init(PGPSignature.CANONICAL_TEXT_DOCUMENT, pgpPrivKey); diff --git a/pg/src/main/java/org/bouncycastle/openpgp/examples/DSAElGamalKeyRingGenerator.java b/pg/src/main/java/org/spongycastle/openpgp/examples/DSAElGamalKeyRingGenerator.java index bdd3295a..e67e6f22 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/examples/DSAElGamalKeyRingGenerator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/examples/DSAElGamalKeyRingGenerator.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.examples; +package org.spongycastle.openpgp.examples; import java.io.FileOutputStream; import java.io.IOException; @@ -12,21 +12,21 @@ import java.security.Security; import java.security.SignatureException; import java.util.Date; -import org.bouncycastle.bcpg.ArmoredOutputStream; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.jce.spec.ElGamalParameterSpec; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPKeyRingGenerator; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -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.spongycastle.bcpg.ArmoredOutputStream; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.jce.spec.ElGamalParameterSpec; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPKeyRingGenerator; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; /** * A simple utility class that generates a public/secret keyring containing a DSA signing @@ -62,7 +62,7 @@ public class DSAElGamalKeyRingGenerator PGPKeyPair elgKeyPair = new JcaPGPKeyPair(PGPPublicKey.ELGAMAL_ENCRYPT, elgKp, new Date()); PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, dsaKeyPair, - identity, sha1Calc, null, null, new JcaPGPContentSignerBuilder(dsaKeyPair.getPublicKey().getAlgorithm(), HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256, sha1Calc).setProvider("BC").build(passPhrase)); + identity, sha1Calc, null, null, new JcaPGPContentSignerBuilder(dsaKeyPair.getPublicKey().getAlgorithm(), HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256, sha1Calc).setProvider("SC").build(passPhrase)); keyRingGen.addSubKey(elgKeyPair); @@ -92,7 +92,7 @@ public class DSAElGamalKeyRingGenerator System.exit(0); } - KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", "BC"); + KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", "SC"); dsaKpg.initialize(1024); @@ -102,7 +102,7 @@ public class DSAElGamalKeyRingGenerator // KeyPair dsaKp = dsaKpg.generateKeyPair(); - KeyPairGenerator elgKpg = KeyPairGenerator.getInstance("ELGAMAL", "BC"); + KeyPairGenerator elgKpg = KeyPairGenerator.getInstance("ELGAMAL", "SC"); BigInteger g = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16); BigInteger p = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16); diff --git a/pg/src/main/java/org/bouncycastle/openpgp/examples/DetachedSignatureProcessor.java b/pg/src/main/java/org/spongycastle/openpgp/examples/DetachedSignatureProcessor.java index 4abcf64e..fc9fa531 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/examples/DetachedSignatureProcessor.java +++ b/pg/src/main/java/org/spongycastle/openpgp/examples/DetachedSignatureProcessor.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.examples; +package org.spongycastle.openpgp.examples; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -10,24 +10,24 @@ import java.io.OutputStream; import java.security.GeneralSecurityException; import java.security.Security; -import org.bouncycastle.bcpg.ArmoredOutputStream; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.bcpg.ArmoredOutputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRingCollection; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; /** * A simple utility class that creates seperate signatures for files and verifies them. @@ -94,7 +94,7 @@ public class DetachedSignatureProcessor PGPSignature sig = p3.get(0); PGPPublicKey key = pgpPubRingCollection.getPublicKey(sig.getKeyID()); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), key); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), key); int ch; while ((ch = dIn.read()) >= 0) @@ -145,8 +145,8 @@ public class DetachedSignatureProcessor } PGPSecretKey pgpSec = PGPExampleUtil.readSecretKey(keyIn); - PGPPrivateKey pgpPrivKey = pgpSec.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(pass)); - PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(pgpSec.getPublicKey().getAlgorithm(), PGPUtil.SHA1).setProvider("BC")); + PGPPrivateKey pgpPrivKey = pgpSec.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(pass)); + PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(pgpSec.getPublicKey().getAlgorithm(), PGPUtil.SHA1).setProvider("SC")); sGen.init(PGPSignature.BINARY_DOCUMENT, pgpPrivKey); diff --git a/pg/src/main/java/org/bouncycastle/openpgp/examples/DirectKeySignature.java b/pg/src/main/java/org/spongycastle/openpgp/examples/DirectKeySignature.java index a4a954c3..00f14a23 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/examples/DirectKeySignature.java +++ b/pg/src/main/java/org/spongycastle/openpgp/examples/DirectKeySignature.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.examples; +package org.spongycastle.openpgp.examples; import java.io.ByteArrayInputStream; import java.io.FileInputStream; @@ -6,22 +6,22 @@ import java.io.FileOutputStream; import java.security.Security; import java.util.Iterator; -import org.bouncycastle.bcpg.ArmoredOutputStream; -import org.bouncycastle.bcpg.sig.NotationData; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator; -import org.bouncycastle.openpgp.PGPSignatureSubpacketVector; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.bcpg.ArmoredOutputStream; +import org.spongycastle.bcpg.sig.NotationData; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator; +import org.spongycastle.openpgp.PGPSignatureSubpacketVector; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; /** * A simple utility class that directly signs a public key and writes the signed key to "SignedKey.asc" in @@ -94,9 +94,9 @@ public class DirectKeySignature private static byte[] signPublicKey(PGPSecretKey secretKey, String secretKeyPass, PGPPublicKey keyToBeSigned, String notationName, String notationValue) throws Exception { - PGPPrivateKey pgpPrivKey = secretKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(secretKeyPass.toCharArray())); + PGPPrivateKey pgpPrivKey = secretKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(secretKeyPass.toCharArray())); - PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(secretKey.getPublicKey().getAlgorithm(), PGPUtil.SHA1).setProvider("BC")); + PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(secretKey.getPublicKey().getAlgorithm(), PGPUtil.SHA1).setProvider("SC")); sGen.init(PGPSignature.DIRECT_KEY, pgpPrivKey); diff --git a/pg/src/main/java/org/bouncycastle/openpgp/examples/KeyBasedFileProcessor.java b/pg/src/main/java/org/spongycastle/openpgp/examples/KeyBasedFileProcessor.java index 4061eec2..cd893eaa 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/examples/KeyBasedFileProcessor.java +++ b/pg/src/main/java/org/spongycastle/openpgp/examples/KeyBasedFileProcessor.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.examples; +package org.spongycastle.openpgp.examples; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -13,27 +13,27 @@ import java.security.SecureRandom; import java.security.Security; import java.util.Iterator; -import org.bouncycastle.bcpg.ArmoredOutputStream; -import org.bouncycastle.bcpg.CompressionAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPOnePassSignatureList; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData; -import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; -import org.bouncycastle.util.io.Streams; +import org.spongycastle.bcpg.ArmoredOutputStream; +import org.spongycastle.bcpg.CompressionAlgorithmTags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPEncryptedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPOnePassSignatureList; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyEncryptedData; +import org.spongycastle.openpgp.PGPSecretKeyRingCollection; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; +import org.spongycastle.util.io.Streams; /** * A simple utility class that encrypts/decrypts public key based @@ -119,7 +119,7 @@ public class KeyBasedFileProcessor throw new IllegalArgumentException("secret key for message not found."); } - InputStream clear = pbe.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(sKey)); + InputStream clear = pbe.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(sKey)); JcaPGPObjectFactory plainFact = new JcaPGPObjectFactory(clear); @@ -217,9 +217,9 @@ public class KeyBasedFileProcessor byte[] bytes = PGPExampleUtil.compressFile(fileName, CompressionAlgorithmTags.ZIP); PGPEncryptedDataGenerator encGen = new PGPEncryptedDataGenerator( - new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setWithIntegrityPacket(withIntegrityCheck).setSecureRandom(new SecureRandom()).setProvider("BC")); + new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setWithIntegrityPacket(withIntegrityCheck).setSecureRandom(new SecureRandom()).setProvider("SC")); - encGen.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(encKey).setProvider("BC")); + encGen.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(encKey).setProvider("SC")); OutputStream cOut = encGen.open(out, bytes.length); diff --git a/pg/src/main/java/org/bouncycastle/openpgp/examples/KeyBasedLargeFileProcessor.java b/pg/src/main/java/org/spongycastle/openpgp/examples/KeyBasedLargeFileProcessor.java index 2fa0d8f6..cd39d05a 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/examples/KeyBasedLargeFileProcessor.java +++ b/pg/src/main/java/org/spongycastle/openpgp/examples/KeyBasedLargeFileProcessor.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.examples; +package org.spongycastle.openpgp.examples; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -13,27 +13,27 @@ import java.security.SecureRandom; import java.security.Security; import java.util.Iterator; -import org.bouncycastle.bcpg.ArmoredOutputStream; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPCompressedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPOnePassSignatureList; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData; -import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; -import org.bouncycastle.util.io.Streams; +import org.spongycastle.bcpg.ArmoredOutputStream; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPCompressedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPEncryptedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPOnePassSignatureList; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyEncryptedData; +import org.spongycastle.openpgp.PGPSecretKeyRingCollection; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; +import org.spongycastle.util.io.Streams; /** * A simple utility class that encrypts/decrypts public key based @@ -123,7 +123,7 @@ public class KeyBasedLargeFileProcessor throw new IllegalArgumentException("secret key for message not found."); } - InputStream clear = pbe.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(sKey)); + InputStream clear = pbe.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(sKey)); JcaPGPObjectFactory plainFact = new JcaPGPObjectFactory(clear); @@ -215,9 +215,9 @@ public class KeyBasedLargeFileProcessor try { - PGPEncryptedDataGenerator cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setWithIntegrityPacket(withIntegrityCheck).setSecureRandom(new SecureRandom()).setProvider("BC")); + PGPEncryptedDataGenerator cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setWithIntegrityPacket(withIntegrityCheck).setSecureRandom(new SecureRandom()).setProvider("SC")); - cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(encKey).setProvider("BC")); + cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(encKey).setProvider("SC")); OutputStream cOut = cPk.open(out, new byte[1 << 16]); diff --git a/pg/src/main/java/org/bouncycastle/openpgp/examples/PBEFileProcessor.java b/pg/src/main/java/org/spongycastle/openpgp/examples/PBEFileProcessor.java index 20c1e8ee..5e9fc83c 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/examples/PBEFileProcessor.java +++ b/pg/src/main/java/org/spongycastle/openpgp/examples/PBEFileProcessor.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.examples; +package org.spongycastle.openpgp.examples; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -11,23 +11,23 @@ import java.security.NoSuchProviderException; import java.security.SecureRandom; import java.security.Security; -import org.bouncycastle.bcpg.ArmoredOutputStream; -import org.bouncycastle.bcpg.CompressionAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPPBEEncryptedData; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePBEDataDecryptorFactoryBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePBEKeyEncryptionMethodGenerator; -import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; -import org.bouncycastle.util.io.Streams; +import org.spongycastle.bcpg.ArmoredOutputStream; +import org.spongycastle.bcpg.CompressionAlgorithmTags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPEncryptedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPPBEEncryptedData; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePBEDataDecryptorFactoryBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePBEKeyEncryptionMethodGenerator; +import org.spongycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; +import org.spongycastle.util.io.Streams; /** * A simple utility class that encrypts/decrypts password based @@ -81,7 +81,7 @@ public class PBEFileProcessor PGPPBEEncryptedData pbe = (PGPPBEEncryptedData)enc.get(0); - InputStream clear = pbe.getDataStream(new JcePBEDataDecryptorFactoryBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(passPhrase)); + InputStream clear = pbe.getDataStream(new JcePBEDataDecryptorFactoryBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(passPhrase)); JcaPGPObjectFactory pgpFact = new JcaPGPObjectFactory(clear); @@ -157,9 +157,9 @@ public class PBEFileProcessor byte[] compressedData = PGPExampleUtil.compressFile(fileName, CompressionAlgorithmTags.ZIP); PGPEncryptedDataGenerator encGen = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5) - .setWithIntegrityPacket(withIntegrityCheck).setSecureRandom(new SecureRandom()).setProvider("BC")); + .setWithIntegrityPacket(withIntegrityCheck).setSecureRandom(new SecureRandom()).setProvider("SC")); - encGen.addMethod(new JcePBEKeyEncryptionMethodGenerator(passPhrase).setProvider("BC")); + encGen.addMethod(new JcePBEKeyEncryptionMethodGenerator(passPhrase).setProvider("SC")); OutputStream encOut = encGen.open(out, compressedData.length); diff --git a/pg/src/main/java/org/bouncycastle/openpgp/examples/PGPExampleUtil.java b/pg/src/main/java/org/spongycastle/openpgp/examples/PGPExampleUtil.java index 036c6a0d..c83ee189 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/examples/PGPExampleUtil.java +++ b/pg/src/main/java/org/spongycastle/openpgp/examples/PGPExampleUtil.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.examples; +package org.spongycastle.openpgp.examples; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; @@ -9,19 +9,19 @@ import java.io.InputStream; import java.security.NoSuchProviderException; import java.util.Iterator; -import org.bouncycastle.openpgp.PGPCompressedDataGenerator; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.PGPCompressedDataGenerator; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPPublicKeyRingCollection; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSecretKeyRingCollection; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; class PGPExampleUtil { @@ -56,7 +56,7 @@ class PGPExampleUtil return null; } - return pgpSecKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(pass)); + return pgpSecKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(pass)); } static PGPPublicKey readPublicKey(String fileName) throws IOException, PGPException diff --git a/pg/src/main/java/org/bouncycastle/openpgp/examples/PubringDump.java b/pg/src/main/java/org/spongycastle/openpgp/examples/PubringDump.java index c24c2f50..de565b96 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/examples/PubringDump.java +++ b/pg/src/main/java/org/spongycastle/openpgp/examples/PubringDump.java @@ -1,17 +1,17 @@ -package org.bouncycastle.openpgp.examples; +package org.spongycastle.openpgp.examples; import java.io.FileInputStream; import java.security.Security; import java.util.Iterator; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.util.encoders.Hex; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPPublicKeyRingCollection; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.util.encoders.Hex; /** * Basic class which just lists the contents of the public key file passed @@ -53,7 +53,7 @@ public class PubringDump { Security.addProvider(new BouncyCastleProvider()); - PGPUtil.setDefaultProvider("BC"); + PGPUtil.setDefaultProvider("SC"); // // Read the public key rings diff --git a/pg/src/main/java/org/bouncycastle/openpgp/examples/RSAKeyPairGenerator.java b/pg/src/main/java/org/spongycastle/openpgp/examples/RSAKeyPairGenerator.java index b8e9a652..de653453 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/examples/RSAKeyPairGenerator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/examples/RSAKeyPairGenerator.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.examples; +package org.spongycastle.openpgp.examples; import java.io.FileOutputStream; import java.io.IOException; @@ -11,20 +11,20 @@ import java.security.Security; import java.security.SignatureException; import java.util.Date; -import org.bouncycastle.bcpg.ArmoredOutputStream; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -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.spongycastle.bcpg.ArmoredOutputStream; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; /** * A simple utility class that generates a RSA PGPPublicKey/PGPSecretKey pair. @@ -52,7 +52,7 @@ public class RSAKeyPairGenerator PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyPair keyPair = new JcaPGPKeyPair(PGPPublicKey.RSA_GENERAL, pair, new Date()); - PGPSecretKey secretKey = new PGPSecretKey(PGPSignature.DEFAULT_CERTIFICATION, keyPair, identity, sha1Calc, null, null, new JcaPGPContentSignerBuilder(keyPair.getPublicKey().getAlgorithm(), HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.CAST5, sha1Calc).setProvider("BC").build(passPhrase)); + PGPSecretKey secretKey = new PGPSecretKey(PGPSignature.DEFAULT_CERTIFICATION, keyPair, identity, sha1Calc, null, null, new JcaPGPContentSignerBuilder(keyPair.getPublicKey().getAlgorithm(), HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.CAST5, sha1Calc).setProvider("SC").build(passPhrase)); secretKey.encode(secretOut); @@ -76,7 +76,7 @@ public class RSAKeyPairGenerator { Security.addProvider(new BouncyCastleProvider()); - KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", "SC"); kpg.initialize(1024); diff --git a/pg/src/main/java/org/bouncycastle/openpgp/examples/SignedFileProcessor.java b/pg/src/main/java/org/spongycastle/openpgp/examples/SignedFileProcessor.java index 2ea37d01..4cd79133 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/examples/SignedFileProcessor.java +++ b/pg/src/main/java/org/spongycastle/openpgp/examples/SignedFileProcessor.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.examples; +package org.spongycastle.openpgp.examples; import java.io.File; import java.io.FileInputStream; @@ -12,30 +12,30 @@ import java.security.Security; import java.security.SignatureException; import java.util.Iterator; -import org.bouncycastle.bcpg.ArmoredOutputStream; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPCompressedDataGenerator; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPOnePassSignature; -import org.bouncycastle.openpgp.PGPOnePassSignatureList; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.bcpg.ArmoredOutputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPCompressedDataGenerator; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPOnePassSignature; +import org.spongycastle.openpgp.PGPOnePassSignatureList; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRingCollection; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; /** * A simple utility class that signs and verifies files. @@ -83,7 +83,7 @@ public class SignedFileProcessor PGPPublicKey key = pgpRing.getPublicKey(ops.getKeyID()); FileOutputStream out = new FileOutputStream(p2.getFileName()); - ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), key); + ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), key); while ((ch = dIn.read()) >= 0) { @@ -133,8 +133,8 @@ public class SignedFileProcessor } PGPSecretKey pgpSec = PGPExampleUtil.readSecretKey(keyIn); - PGPPrivateKey pgpPrivKey = pgpSec.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(pass)); - PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(pgpSec.getPublicKey().getAlgorithm(), PGPUtil.SHA1).setProvider("BC")); + PGPPrivateKey pgpPrivKey = pgpSec.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(pass)); + PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(pgpSec.getPublicKey().getAlgorithm(), PGPUtil.SHA1).setProvider("SC")); sGen.init(PGPSignature.BINARY_DOCUMENT, pgpPrivKey); diff --git a/pg/src/main/java/org/bouncycastle/openpgp/jcajce/JcaPGPObjectFactory.java b/pg/src/main/java/org/spongycastle/openpgp/jcajce/JcaPGPObjectFactory.java index bff681ab..b310de39 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/jcajce/JcaPGPObjectFactory.java +++ b/pg/src/main/java/org/spongycastle/openpgp/jcajce/JcaPGPObjectFactory.java @@ -1,10 +1,10 @@ -package org.bouncycastle.openpgp.jcajce; +package org.spongycastle.openpgp.jcajce; import java.io.ByteArrayInputStream; import java.io.InputStream; -import org.bouncycastle.openpgp.PGPObjectFactory; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.PGPObjectFactory; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; /** * {@link PGPObjectFactory} that uses the sources cryptographic primitives from the JCA API. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/jcajce/JcaPGPPublicKeyRing.java b/pg/src/main/java/org/spongycastle/openpgp/jcajce/JcaPGPPublicKeyRing.java index b2281d28..218e7f2f 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/jcajce/JcaPGPPublicKeyRing.java +++ b/pg/src/main/java/org/spongycastle/openpgp/jcajce/JcaPGPPublicKeyRing.java @@ -1,11 +1,11 @@ -package org.bouncycastle.openpgp.jcajce; +package org.spongycastle.openpgp.jcajce; import java.io.IOException; import java.io.InputStream; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; public class JcaPGPPublicKeyRing extends PGPPublicKeyRing diff --git a/pg/src/main/java/org/bouncycastle/openpgp/jcajce/JcaPGPPublicKeyRingCollection.java b/pg/src/main/java/org/spongycastle/openpgp/jcajce/JcaPGPPublicKeyRingCollection.java index 3771b0d9..e23e18e6 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/jcajce/JcaPGPPublicKeyRingCollection.java +++ b/pg/src/main/java/org/spongycastle/openpgp/jcajce/JcaPGPPublicKeyRingCollection.java @@ -1,13 +1,13 @@ -package org.bouncycastle.openpgp.jcajce; +package org.spongycastle.openpgp.jcajce; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Collection; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPublicKeyRingCollection; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; public class JcaPGPPublicKeyRingCollection extends PGPPublicKeyRingCollection diff --git a/pg/src/main/java/org/bouncycastle/openpgp/jcajce/JcaPGPSecretKeyRing.java b/pg/src/main/java/org/spongycastle/openpgp/jcajce/JcaPGPSecretKeyRing.java index 735d4e57..9e1395a6 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/jcajce/JcaPGPSecretKeyRing.java +++ b/pg/src/main/java/org/spongycastle/openpgp/jcajce/JcaPGPSecretKeyRing.java @@ -1,12 +1,12 @@ -package org.bouncycastle.openpgp.jcajce; +package org.spongycastle.openpgp.jcajce; import java.io.IOException; import java.io.InputStream; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; public class JcaPGPSecretKeyRing extends PGPSecretKeyRing diff --git a/pg/src/main/java/org/bouncycastle/openpgp/jcajce/JcaPGPSecretKeyRingCollection.java b/pg/src/main/java/org/spongycastle/openpgp/jcajce/JcaPGPSecretKeyRingCollection.java index 4cde4e2b..a105ac08 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/jcajce/JcaPGPSecretKeyRingCollection.java +++ b/pg/src/main/java/org/spongycastle/openpgp/jcajce/JcaPGPSecretKeyRingCollection.java @@ -1,13 +1,13 @@ -package org.bouncycastle.openpgp.jcajce; +package org.spongycastle.openpgp.jcajce; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Collection; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPSecretKeyRingCollection; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; public class JcaPGPSecretKeyRingCollection extends PGPSecretKeyRingCollection diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/KeyFingerPrintCalculator.java b/pg/src/main/java/org/spongycastle/openpgp/operator/KeyFingerPrintCalculator.java index 1d990a63..a5a8a269 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/KeyFingerPrintCalculator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/KeyFingerPrintCalculator.java @@ -1,7 +1,7 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; -import org.bouncycastle.bcpg.PublicKeyPacket; -import org.bouncycastle.openpgp.PGPException; +import org.spongycastle.bcpg.PublicKeyPacket; +import org.spongycastle.openpgp.PGPException; public interface KeyFingerPrintCalculator { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PBEDataDecryptorFactory.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PBEDataDecryptorFactory.java index 8538e4f6..5660468e 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PBEDataDecryptorFactory.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PBEDataDecryptorFactory.java @@ -1,8 +1,8 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; -import org.bouncycastle.bcpg.S2K; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.openpgp.PGPException; +import org.spongycastle.bcpg.S2K; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.openpgp.PGPException; /** * A factory for performing PBE decryption operations. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PBEKeyEncryptionMethodGenerator.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PBEKeyEncryptionMethodGenerator.java index 2907439b..55a3e64b 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PBEKeyEncryptionMethodGenerator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PBEKeyEncryptionMethodGenerator.java @@ -1,12 +1,12 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; import java.security.SecureRandom; -import org.bouncycastle.bcpg.ContainedPacket; -import org.bouncycastle.bcpg.S2K; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyEncSessionPacket; -import org.bouncycastle.openpgp.PGPException; +import org.spongycastle.bcpg.ContainedPacket; +import org.spongycastle.bcpg.S2K; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyEncSessionPacket; +import org.spongycastle.openpgp.PGPException; /** * PGP style PBE encryption method. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PBEProtectionRemoverFactory.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PBEProtectionRemoverFactory.java index 2275a4ba..99166f6f 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PBEProtectionRemoverFactory.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PBEProtectionRemoverFactory.java @@ -1,6 +1,6 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; -import org.bouncycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPException; public interface PBEProtectionRemoverFactory { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PBESecretKeyDecryptor.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PBESecretKeyDecryptor.java index 290fa1ec..2f75702f 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PBESecretKeyDecryptor.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PBESecretKeyDecryptor.java @@ -1,7 +1,7 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; -import org.bouncycastle.bcpg.S2K; -import org.bouncycastle.openpgp.PGPException; +import org.spongycastle.bcpg.S2K; +import org.spongycastle.openpgp.PGPException; public abstract class PBESecretKeyDecryptor { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PBESecretKeyEncryptor.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PBESecretKeyEncryptor.java index 0530638c..2bd1bf8f 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PBESecretKeyEncryptor.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PBESecretKeyEncryptor.java @@ -1,9 +1,9 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; import java.security.SecureRandom; -import org.bouncycastle.bcpg.S2K; -import org.bouncycastle.openpgp.PGPException; +import org.spongycastle.bcpg.S2K; +import org.spongycastle.openpgp.PGPException; public abstract class PBESecretKeyEncryptor { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPContentSigner.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPContentSigner.java index 0427e813..7a3891e6 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPContentSigner.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPContentSigner.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; import java.io.OutputStream; diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPContentSignerBuilder.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPContentSignerBuilder.java index 77ec2e53..44f8c8dd 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPContentSignerBuilder.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPContentSignerBuilder.java @@ -1,7 +1,7 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPrivateKey; public interface PGPContentSignerBuilder { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPContentVerifier.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPContentVerifier.java index abee23af..7ed1aea6 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPContentVerifier.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPContentVerifier.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; import java.io.OutputStream; diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPContentVerifierBuilder.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPContentVerifierBuilder.java index b0dc6f84..9e8e4a94 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPContentVerifierBuilder.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPContentVerifierBuilder.java @@ -1,7 +1,7 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPublicKey; public interface PGPContentVerifierBuilder { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPContentVerifierBuilderProvider.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPContentVerifierBuilderProvider.java index 42717e04..44c138bf 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPContentVerifierBuilderProvider.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPContentVerifierBuilderProvider.java @@ -1,6 +1,6 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; -import org.bouncycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPException; public interface PGPContentVerifierBuilderProvider { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDataDecryptor.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPDataDecryptor.java index 862b342e..ceeca672 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDataDecryptor.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPDataDecryptor.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; import java.io.InputStream; diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDataDecryptorFactory.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPDataDecryptorFactory.java index 39ac30fd..7223d039 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDataDecryptorFactory.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPDataDecryptorFactory.java @@ -1,7 +1,7 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.openpgp.PGPException; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.openpgp.PGPException; /** * Base interface of factories for {@link PGPDataDecryptor}. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDataDecryptorProvider.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPDataDecryptorProvider.java index bfa2afdb..9e87a565 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDataDecryptorProvider.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPDataDecryptorProvider.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; public interface PGPDataDecryptorProvider { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDataEncryptor.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPDataEncryptor.java index fbd994a0..9811a6de 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDataEncryptor.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPDataEncryptor.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; import java.io.OutputStream; diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDataEncryptorBuilder.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPDataEncryptorBuilder.java index 91660b01..a889b3be 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDataEncryptorBuilder.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPDataEncryptorBuilder.java @@ -1,9 +1,9 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; import java.security.SecureRandom; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.openpgp.PGPException; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.openpgp.PGPException; /** * A builder for {@link PGPDataEncryptor} instances, which can be used to encrypt data objects. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDigestCalculator.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPDigestCalculator.java index 70efe8a6..a4b926b0 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDigestCalculator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPDigestCalculator.java @@ -1,8 +1,8 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; import java.io.OutputStream; -import org.bouncycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.HashAlgorithmTags; /** * A digest calculator, which consumes a stream of data and computes a digest value over it. @@ -19,7 +19,7 @@ public interface PGPDigestCalculator /** * Returns a stream that will accept data for the purpose of calculating a digest. Use - * org.bouncycastle.util.io.TeeOutputStream if you want to accumulate the data on the fly as + * org.spongycastle.util.io.TeeOutputStream if you want to accumulate the data on the fly as * well. * * @return an OutputStream that data to be digested can be written to. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDigestCalculatorProvider.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPDigestCalculatorProvider.java index dcfce65c..8ad35b13 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDigestCalculatorProvider.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPDigestCalculatorProvider.java @@ -1,7 +1,7 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.openpgp.PGPException; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.openpgp.PGPException; /** * A factory for digest algorithms. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPKeyEncryptionMethodGenerator.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPKeyEncryptionMethodGenerator.java index 97e703d6..d0a3c5b6 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPKeyEncryptionMethodGenerator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPKeyEncryptionMethodGenerator.java @@ -1,9 +1,9 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; -import org.bouncycastle.bcpg.ContainedPacket; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPException; +import org.spongycastle.bcpg.ContainedPacket; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.openpgp.PGPEncryptedDataGenerator; +import org.spongycastle.openpgp.PGPException; /** * An encryption method that can be applied to encrypt data in a {@link PGPEncryptedDataGenerator}. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPPad.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPPad.java index c9cebe7d..d3ef360c 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPPad.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPPad.java @@ -1,6 +1,6 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; -import org.bouncycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPException; /** * Utility class that provides padding addition and removal for PGP session keys. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPUtil.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPUtil.java index fc9d4c10..c318c673 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPUtil.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PGPUtil.java @@ -1,13 +1,13 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; import java.io.IOException; import java.io.OutputStream; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.S2K; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.util.Strings; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.S2K; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.util.Strings; /** * Basic utility class diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PublicKeyDataDecryptorFactory.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PublicKeyDataDecryptorFactory.java index 9042159c..35d2a01d 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PublicKeyDataDecryptorFactory.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PublicKeyDataDecryptorFactory.java @@ -1,6 +1,6 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; -import org.bouncycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPException; public interface PublicKeyDataDecryptorFactory extends PGPDataDecryptorFactory diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PublicKeyKeyEncryptionMethodGenerator.java b/pg/src/main/java/org/spongycastle/openpgp/operator/PublicKeyKeyEncryptionMethodGenerator.java index 58160a97..8030b946 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/PublicKeyKeyEncryptionMethodGenerator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/PublicKeyKeyEncryptionMethodGenerator.java @@ -1,13 +1,13 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; import java.io.IOException; import java.math.BigInteger; -import org.bouncycastle.bcpg.ContainedPacket; -import org.bouncycastle.bcpg.MPInteger; -import org.bouncycastle.bcpg.PublicKeyEncSessionPacket; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPublicKey; +import org.spongycastle.bcpg.ContainedPacket; +import org.spongycastle.bcpg.MPInteger; +import org.spongycastle.bcpg.PublicKeyEncSessionPacket; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPublicKey; public abstract class PublicKeyKeyEncryptionMethodGenerator extends PGPKeyEncryptionMethodGenerator diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/RFC6637KDFCalculator.java b/pg/src/main/java/org/spongycastle/openpgp/operator/RFC6637KDFCalculator.java index cfe75abf..bc342f68 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/RFC6637KDFCalculator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/RFC6637KDFCalculator.java @@ -1,15 +1,15 @@ -package org.bouncycastle.openpgp.operator; +package org.spongycastle.openpgp.operator; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.math.ec.ECPoint; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.util.encoders.Hex; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.math.ec.ECPoint; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.util.encoders.Hex; /** * Calculator for the EC based KDF algorithm described in RFC 6637 diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcImplProvider.java b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcImplProvider.java index 357634f4..f54870f0 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcImplProvider.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcImplProvider.java @@ -1,41 +1,41 @@ -package org.bouncycastle.openpgp.operator.bc; +package org.spongycastle.openpgp.operator.bc; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.crypto.AsymmetricBlockCipher; -import org.bouncycastle.crypto.BlockCipher; -import org.bouncycastle.crypto.Digest; -import org.bouncycastle.crypto.Signer; -import org.bouncycastle.crypto.Wrapper; -import org.bouncycastle.crypto.digests.MD2Digest; -import org.bouncycastle.crypto.digests.MD5Digest; -import org.bouncycastle.crypto.digests.RIPEMD160Digest; -import org.bouncycastle.crypto.digests.SHA1Digest; -import org.bouncycastle.crypto.digests.SHA224Digest; -import org.bouncycastle.crypto.digests.SHA256Digest; -import org.bouncycastle.crypto.digests.SHA384Digest; -import org.bouncycastle.crypto.digests.SHA512Digest; -import org.bouncycastle.crypto.digests.TigerDigest; -import org.bouncycastle.crypto.encodings.PKCS1Encoding; -import org.bouncycastle.crypto.engines.AESEngine; -import org.bouncycastle.crypto.engines.AESFastEngine; -import org.bouncycastle.crypto.engines.BlowfishEngine; -import org.bouncycastle.crypto.engines.CAST5Engine; -import org.bouncycastle.crypto.engines.CamelliaEngine; -import org.bouncycastle.crypto.engines.DESEngine; -import org.bouncycastle.crypto.engines.DESedeEngine; -import org.bouncycastle.crypto.engines.ElGamalEngine; -import org.bouncycastle.crypto.engines.IDEAEngine; -import org.bouncycastle.crypto.engines.RFC3394WrapEngine; -import org.bouncycastle.crypto.engines.RSABlindedEngine; -import org.bouncycastle.crypto.engines.TwofishEngine; -import org.bouncycastle.crypto.signers.DSADigestSigner; -import org.bouncycastle.crypto.signers.DSASigner; -import org.bouncycastle.crypto.signers.ECDSASigner; -import org.bouncycastle.crypto.signers.RSADigestSigner; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPublicKey; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.crypto.AsymmetricBlockCipher; +import org.spongycastle.crypto.BlockCipher; +import org.spongycastle.crypto.Digest; +import org.spongycastle.crypto.Signer; +import org.spongycastle.crypto.Wrapper; +import org.spongycastle.crypto.digests.MD2Digest; +import org.spongycastle.crypto.digests.MD5Digest; +import org.spongycastle.crypto.digests.RIPEMD160Digest; +import org.spongycastle.crypto.digests.SHA1Digest; +import org.spongycastle.crypto.digests.SHA224Digest; +import org.spongycastle.crypto.digests.SHA256Digest; +import org.spongycastle.crypto.digests.SHA384Digest; +import org.spongycastle.crypto.digests.SHA512Digest; +import org.spongycastle.crypto.digests.TigerDigest; +import org.spongycastle.crypto.encodings.PKCS1Encoding; +import org.spongycastle.crypto.engines.AESEngine; +import org.spongycastle.crypto.engines.AESFastEngine; +import org.spongycastle.crypto.engines.BlowfishEngine; +import org.spongycastle.crypto.engines.CAST5Engine; +import org.spongycastle.crypto.engines.CamelliaEngine; +import org.spongycastle.crypto.engines.DESEngine; +import org.spongycastle.crypto.engines.DESedeEngine; +import org.spongycastle.crypto.engines.ElGamalEngine; +import org.spongycastle.crypto.engines.IDEAEngine; +import org.spongycastle.crypto.engines.RFC3394WrapEngine; +import org.spongycastle.crypto.engines.RSABlindedEngine; +import org.spongycastle.crypto.engines.TwofishEngine; +import org.spongycastle.crypto.signers.DSADigestSigner; +import org.spongycastle.crypto.signers.DSASigner; +import org.spongycastle.crypto.signers.ECDSASigner; +import org.spongycastle.crypto.signers.RSADigestSigner; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPublicKey; class BcImplProvider { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcKeyFingerprintCalculator.java b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcKeyFingerprintCalculator.java index bb201cac..9b9b7f26 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcKeyFingerprintCalculator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcKeyFingerprintCalculator.java @@ -1,16 +1,16 @@ -package org.bouncycastle.openpgp.operator.bc; +package org.spongycastle.openpgp.operator.bc; import java.io.IOException; -import org.bouncycastle.bcpg.BCPGKey; -import org.bouncycastle.bcpg.MPInteger; -import org.bouncycastle.bcpg.PublicKeyPacket; -import org.bouncycastle.bcpg.RSAPublicBCPGKey; -import org.bouncycastle.crypto.Digest; -import org.bouncycastle.crypto.digests.MD5Digest; -import org.bouncycastle.crypto.digests.SHA1Digest; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.bcpg.BCPGKey; +import org.spongycastle.bcpg.MPInteger; +import org.spongycastle.bcpg.PublicKeyPacket; +import org.spongycastle.bcpg.RSAPublicBCPGKey; +import org.spongycastle.crypto.Digest; +import org.spongycastle.crypto.digests.MD5Digest; +import org.spongycastle.crypto.digests.SHA1Digest; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; public class BcKeyFingerprintCalculator implements KeyFingerPrintCalculator diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBEDataDecryptorFactory.java b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPBEDataDecryptorFactory.java index fdc143b7..b9a1c189 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBEDataDecryptorFactory.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPBEDataDecryptorFactory.java @@ -1,10 +1,10 @@ -package org.bouncycastle.openpgp.operator.bc; +package org.spongycastle.openpgp.operator.bc; -import org.bouncycastle.crypto.BlockCipher; -import org.bouncycastle.crypto.BufferedBlockCipher; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.operator.PBEDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.PGPDataDecryptor; +import org.spongycastle.crypto.BlockCipher; +import org.spongycastle.crypto.BufferedBlockCipher; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.operator.PBEDataDecryptorFactory; +import org.spongycastle.openpgp.operator.PGPDataDecryptor; /** * A {@link PBEDataDecryptorFactory} for handling PBE decryption operations using the Bouncy Castle diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBEKeyEncryptionMethodGenerator.java b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPBEKeyEncryptionMethodGenerator.java index 17aa28cc..2a151f0d 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBEKeyEncryptionMethodGenerator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPBEKeyEncryptionMethodGenerator.java @@ -1,14 +1,14 @@ -package org.bouncycastle.openpgp.operator.bc; +package org.spongycastle.openpgp.operator.bc; import java.security.SecureRandom; -import org.bouncycastle.bcpg.S2K; -import org.bouncycastle.crypto.BlockCipher; -import org.bouncycastle.crypto.BufferedBlockCipher; -import org.bouncycastle.crypto.InvalidCipherTextException; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.operator.PBEKeyEncryptionMethodGenerator; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.bcpg.S2K; +import org.spongycastle.crypto.BlockCipher; +import org.spongycastle.crypto.BufferedBlockCipher; +import org.spongycastle.crypto.InvalidCipherTextException; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.operator.PBEKeyEncryptionMethodGenerator; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; /** * A BC lightweight method generator for supporting PBE based encryption operations. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBESecretKeyDecryptorBuilder.java b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPBESecretKeyDecryptorBuilder.java index decf032f..bf0a0db9 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBESecretKeyDecryptorBuilder.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPBESecretKeyDecryptorBuilder.java @@ -1,10 +1,10 @@ -package org.bouncycastle.openpgp.operator.bc; +package org.spongycastle.openpgp.operator.bc; -import org.bouncycastle.crypto.BufferedBlockCipher; -import org.bouncycastle.crypto.InvalidCipherTextException; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor; -import org.bouncycastle.openpgp.operator.PGPDigestCalculatorProvider; +import org.spongycastle.crypto.BufferedBlockCipher; +import org.spongycastle.crypto.InvalidCipherTextException; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.operator.PBESecretKeyDecryptor; +import org.spongycastle.openpgp.operator.PGPDigestCalculatorProvider; public class BcPBESecretKeyDecryptorBuilder { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBESecretKeyEncryptorBuilder.java b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPBESecretKeyEncryptorBuilder.java index 2258484e..aea664ae 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBESecretKeyEncryptorBuilder.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPBESecretKeyEncryptorBuilder.java @@ -1,13 +1,13 @@ -package org.bouncycastle.openpgp.operator.bc; +package org.spongycastle.openpgp.operator.bc; import java.security.SecureRandom; -import org.bouncycastle.crypto.BlockCipher; -import org.bouncycastle.crypto.BufferedBlockCipher; -import org.bouncycastle.crypto.InvalidCipherTextException; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.crypto.BlockCipher; +import org.spongycastle.crypto.BufferedBlockCipher; +import org.spongycastle.crypto.InvalidCipherTextException; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.operator.PBESecretKeyEncryptor; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; public class BcPBESecretKeyEncryptorBuilder { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPContentSignerBuilder.java b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPGPContentSignerBuilder.java index 384727ef..cd98ef38 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPContentSignerBuilder.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPGPContentSignerBuilder.java @@ -1,17 +1,17 @@ -package org.bouncycastle.openpgp.operator.bc; +package org.spongycastle.openpgp.operator.bc; import java.io.OutputStream; import java.security.SecureRandom; -import org.bouncycastle.crypto.CryptoException; -import org.bouncycastle.crypto.Signer; -import org.bouncycastle.crypto.params.ParametersWithRandom; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.operator.PGPContentSigner; -import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.util.io.TeeOutputStream; +import org.spongycastle.crypto.CryptoException; +import org.spongycastle.crypto.Signer; +import org.spongycastle.crypto.params.ParametersWithRandom; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.operator.PGPContentSigner; +import org.spongycastle.openpgp.operator.PGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.util.io.TeeOutputStream; public class BcPGPContentSignerBuilder implements PGPContentSignerBuilder diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPContentVerifierBuilderProvider.java b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPGPContentVerifierBuilderProvider.java index e13b8132..a2cfbf91 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPContentVerifierBuilderProvider.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPGPContentVerifierBuilderProvider.java @@ -1,13 +1,13 @@ -package org.bouncycastle.openpgp.operator.bc; +package org.spongycastle.openpgp.operator.bc; import java.io.OutputStream; -import org.bouncycastle.crypto.Signer; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.operator.PGPContentVerifier; -import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilder; -import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilderProvider; +import org.spongycastle.crypto.Signer; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.operator.PGPContentVerifier; +import org.spongycastle.openpgp.operator.PGPContentVerifierBuilder; +import org.spongycastle.openpgp.operator.PGPContentVerifierBuilderProvider; public class BcPGPContentVerifierBuilderProvider implements PGPContentVerifierBuilderProvider diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPDataEncryptorBuilder.java b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPGPDataEncryptorBuilder.java index a47b3111..bfb2946a 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPDataEncryptorBuilder.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPGPDataEncryptorBuilder.java @@ -1,16 +1,16 @@ -package org.bouncycastle.openpgp.operator.bc; +package org.spongycastle.openpgp.operator.bc; import java.io.OutputStream; import java.security.SecureRandom; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.crypto.BlockCipher; -import org.bouncycastle.crypto.BufferedBlockCipher; -import org.bouncycastle.crypto.io.CipherOutputStream; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.operator.PGPDataEncryptor; -import org.bouncycastle.openpgp.operator.PGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.crypto.BlockCipher; +import org.spongycastle.crypto.BufferedBlockCipher; +import org.spongycastle.crypto.io.CipherOutputStream; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.operator.PGPDataEncryptor; +import org.spongycastle.openpgp.operator.PGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; /** * {@link PGPDataEncryptorBuilder} implementation that uses the Bouncy Castle lightweight API to diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPDigestCalculatorProvider.java b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPGPDigestCalculatorProvider.java index 2fea1487..50d5fc73 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPDigestCalculatorProvider.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPGPDigestCalculatorProvider.java @@ -1,12 +1,12 @@ -package org.bouncycastle.openpgp.operator.bc; +package org.spongycastle.openpgp.operator.bc; import java.io.IOException; import java.io.OutputStream; -import org.bouncycastle.crypto.Digest; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.openpgp.operator.PGPDigestCalculatorProvider; +import org.spongycastle.crypto.Digest; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.openpgp.operator.PGPDigestCalculatorProvider; public class BcPGPDigestCalculatorProvider implements PGPDigestCalculatorProvider diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPKeyConverter.java b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPGPKeyConverter.java index 5fa18c9c..40577467 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPKeyConverter.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPGPKeyConverter.java @@ -1,40 +1,40 @@ -package org.bouncycastle.openpgp.operator.bc; +package org.spongycastle.openpgp.operator.bc; import java.util.Date; -import org.bouncycastle.asn1.x9.ECNamedCurveTable; -import org.bouncycastle.asn1.x9.X9ECParameters; -import org.bouncycastle.bcpg.BCPGKey; -import org.bouncycastle.bcpg.DSAPublicBCPGKey; -import org.bouncycastle.bcpg.DSASecretBCPGKey; -import org.bouncycastle.bcpg.ECDHPublicBCPGKey; -import org.bouncycastle.bcpg.ECDSAPublicBCPGKey; -import org.bouncycastle.bcpg.ECPublicBCPGKey; -import org.bouncycastle.bcpg.ECSecretBCPGKey; -import org.bouncycastle.bcpg.ElGamalPublicBCPGKey; -import org.bouncycastle.bcpg.ElGamalSecretBCPGKey; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyPacket; -import org.bouncycastle.bcpg.RSAPublicBCPGKey; -import org.bouncycastle.bcpg.RSASecretBCPGKey; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.crypto.ec.CustomNamedCurves; -import org.bouncycastle.crypto.params.AsymmetricKeyParameter; -import org.bouncycastle.crypto.params.DSAParameters; -import org.bouncycastle.crypto.params.DSAPrivateKeyParameters; -import org.bouncycastle.crypto.params.DSAPublicKeyParameters; -import org.bouncycastle.crypto.params.ECNamedDomainParameters; -import org.bouncycastle.crypto.params.ECPrivateKeyParameters; -import org.bouncycastle.crypto.params.ECPublicKeyParameters; -import org.bouncycastle.crypto.params.ElGamalParameters; -import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters; -import org.bouncycastle.crypto.params.ElGamalPublicKeyParameters; -import org.bouncycastle.crypto.params.RSAKeyParameters; -import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; +import org.spongycastle.asn1.x9.ECNamedCurveTable; +import org.spongycastle.asn1.x9.X9ECParameters; +import org.spongycastle.bcpg.BCPGKey; +import org.spongycastle.bcpg.DSAPublicBCPGKey; +import org.spongycastle.bcpg.DSASecretBCPGKey; +import org.spongycastle.bcpg.ECDHPublicBCPGKey; +import org.spongycastle.bcpg.ECDSAPublicBCPGKey; +import org.spongycastle.bcpg.ECPublicBCPGKey; +import org.spongycastle.bcpg.ECSecretBCPGKey; +import org.spongycastle.bcpg.ElGamalPublicBCPGKey; +import org.spongycastle.bcpg.ElGamalSecretBCPGKey; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyPacket; +import org.spongycastle.bcpg.RSAPublicBCPGKey; +import org.spongycastle.bcpg.RSASecretBCPGKey; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.crypto.ec.CustomNamedCurves; +import org.spongycastle.crypto.params.AsymmetricKeyParameter; +import org.spongycastle.crypto.params.DSAParameters; +import org.spongycastle.crypto.params.DSAPrivateKeyParameters; +import org.spongycastle.crypto.params.DSAPublicKeyParameters; +import org.spongycastle.crypto.params.ECNamedDomainParameters; +import org.spongycastle.crypto.params.ECPrivateKeyParameters; +import org.spongycastle.crypto.params.ECPublicKeyParameters; +import org.spongycastle.crypto.params.ElGamalParameters; +import org.spongycastle.crypto.params.ElGamalPrivateKeyParameters; +import org.spongycastle.crypto.params.ElGamalPublicKeyParameters; +import org.spongycastle.crypto.params.RSAKeyParameters; +import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; public class BcPGPKeyConverter { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPKeyPair.java b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPGPKeyPair.java index 29460894..ed6a0d7e 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPKeyPair.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPGPKeyPair.java @@ -1,13 +1,13 @@ -package org.bouncycastle.openpgp.operator.bc; +package org.spongycastle.openpgp.operator.bc; import java.util.Date; -import org.bouncycastle.crypto.AsymmetricCipherKeyPair; -import org.bouncycastle.crypto.params.AsymmetricKeyParameter; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; +import org.spongycastle.crypto.AsymmetricCipherKeyPair; +import org.spongycastle.crypto.params.AsymmetricKeyParameter; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; public class BcPGPKeyPair extends PGPKeyPair diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPublicKeyDataDecryptorFactory.java b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPublicKeyDataDecryptorFactory.java index 1d77ff09..4c5124bb 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPublicKeyDataDecryptorFactory.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPublicKeyDataDecryptorFactory.java @@ -1,25 +1,25 @@ -package org.bouncycastle.openpgp.operator.bc; - -import org.bouncycastle.asn1.nist.NISTNamedCurves; -import org.bouncycastle.asn1.x9.X9ECParameters; -import org.bouncycastle.bcpg.ECDHPublicBCPGKey; -import org.bouncycastle.bcpg.ECSecretBCPGKey; -import org.bouncycastle.crypto.AsymmetricBlockCipher; -import org.bouncycastle.crypto.BlockCipher; -import org.bouncycastle.crypto.BufferedAsymmetricBlockCipher; -import org.bouncycastle.crypto.InvalidCipherTextException; -import org.bouncycastle.crypto.Wrapper; -import org.bouncycastle.crypto.params.AsymmetricKeyParameter; -import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters; -import org.bouncycastle.crypto.params.KeyParameter; -import org.bouncycastle.math.ec.ECPoint; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.operator.PGPDataDecryptor; -import org.bouncycastle.openpgp.operator.PGPPad; -import org.bouncycastle.openpgp.operator.PublicKeyDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.RFC6637KDFCalculator; +package org.spongycastle.openpgp.operator.bc; + +import org.spongycastle.asn1.nist.NISTNamedCurves; +import org.spongycastle.asn1.x9.X9ECParameters; +import org.spongycastle.bcpg.ECDHPublicBCPGKey; +import org.spongycastle.bcpg.ECSecretBCPGKey; +import org.spongycastle.crypto.AsymmetricBlockCipher; +import org.spongycastle.crypto.BlockCipher; +import org.spongycastle.crypto.BufferedAsymmetricBlockCipher; +import org.spongycastle.crypto.InvalidCipherTextException; +import org.spongycastle.crypto.Wrapper; +import org.spongycastle.crypto.params.AsymmetricKeyParameter; +import org.spongycastle.crypto.params.ElGamalPrivateKeyParameters; +import org.spongycastle.crypto.params.KeyParameter; +import org.spongycastle.math.ec.ECPoint; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.operator.PGPDataDecryptor; +import org.spongycastle.openpgp.operator.PGPPad; +import org.spongycastle.openpgp.operator.PublicKeyDataDecryptorFactory; +import org.spongycastle.openpgp.operator.RFC6637KDFCalculator; /** * A decryptor factory for handling public key decryption operations. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPublicKeyKeyEncryptionMethodGenerator.java b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPublicKeyKeyEncryptionMethodGenerator.java index b1fa548d..72d501b0 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPublicKeyKeyEncryptionMethodGenerator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcPublicKeyKeyEncryptionMethodGenerator.java @@ -1,33 +1,33 @@ -package org.bouncycastle.openpgp.operator.bc; +package org.spongycastle.openpgp.operator.bc; import java.io.IOException; import java.math.BigInteger; import java.security.SecureRandom; -import org.bouncycastle.asn1.nist.NISTNamedCurves; -import org.bouncycastle.asn1.x9.X9ECParameters; -import org.bouncycastle.bcpg.ECDHPublicBCPGKey; -import org.bouncycastle.bcpg.MPInteger; -import org.bouncycastle.crypto.AsymmetricBlockCipher; -import org.bouncycastle.crypto.EphemeralKeyPair; -import org.bouncycastle.crypto.InvalidCipherTextException; -import org.bouncycastle.crypto.KeyEncoder; -import org.bouncycastle.crypto.Wrapper; -import org.bouncycastle.crypto.generators.ECKeyPairGenerator; -import org.bouncycastle.crypto.generators.EphemeralKeyPairGenerator; -import org.bouncycastle.crypto.params.AsymmetricKeyParameter; -import org.bouncycastle.crypto.params.ECDomainParameters; -import org.bouncycastle.crypto.params.ECKeyGenerationParameters; -import org.bouncycastle.crypto.params.ECPrivateKeyParameters; -import org.bouncycastle.crypto.params.ECPublicKeyParameters; -import org.bouncycastle.crypto.params.KeyParameter; -import org.bouncycastle.crypto.params.ParametersWithRandom; -import org.bouncycastle.math.ec.ECPoint; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.operator.PGPPad; -import org.bouncycastle.openpgp.operator.PublicKeyKeyEncryptionMethodGenerator; -import org.bouncycastle.openpgp.operator.RFC6637KDFCalculator; +import org.spongycastle.asn1.nist.NISTNamedCurves; +import org.spongycastle.asn1.x9.X9ECParameters; +import org.spongycastle.bcpg.ECDHPublicBCPGKey; +import org.spongycastle.bcpg.MPInteger; +import org.spongycastle.crypto.AsymmetricBlockCipher; +import org.spongycastle.crypto.EphemeralKeyPair; +import org.spongycastle.crypto.InvalidCipherTextException; +import org.spongycastle.crypto.KeyEncoder; +import org.spongycastle.crypto.Wrapper; +import org.spongycastle.crypto.generators.ECKeyPairGenerator; +import org.spongycastle.crypto.generators.EphemeralKeyPairGenerator; +import org.spongycastle.crypto.params.AsymmetricKeyParameter; +import org.spongycastle.crypto.params.ECDomainParameters; +import org.spongycastle.crypto.params.ECKeyGenerationParameters; +import org.spongycastle.crypto.params.ECPrivateKeyParameters; +import org.spongycastle.crypto.params.ECPublicKeyParameters; +import org.spongycastle.crypto.params.KeyParameter; +import org.spongycastle.crypto.params.ParametersWithRandom; +import org.spongycastle.math.ec.ECPoint; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.operator.PGPPad; +import org.spongycastle.openpgp.operator.PublicKeyKeyEncryptionMethodGenerator; +import org.spongycastle.openpgp.operator.RFC6637KDFCalculator; /** * A method generator for supporting public key based encryption operations. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcUtil.java b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcUtil.java index ba55f34b..c3be8c83 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcUtil.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/BcUtil.java @@ -1,16 +1,16 @@ -package org.bouncycastle.openpgp.operator.bc; +package org.spongycastle.openpgp.operator.bc; import java.io.InputStream; -import org.bouncycastle.crypto.BlockCipher; -import org.bouncycastle.crypto.BufferedBlockCipher; -import org.bouncycastle.crypto.io.CipherInputStream; -import org.bouncycastle.crypto.modes.CFBBlockCipher; -import org.bouncycastle.crypto.modes.OpenPGPCFBBlockCipher; -import org.bouncycastle.crypto.params.KeyParameter; -import org.bouncycastle.crypto.params.ParametersWithIV; -import org.bouncycastle.openpgp.operator.PGPDataDecryptor; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.crypto.BlockCipher; +import org.spongycastle.crypto.BufferedBlockCipher; +import org.spongycastle.crypto.io.CipherInputStream; +import org.spongycastle.crypto.modes.CFBBlockCipher; +import org.spongycastle.crypto.modes.OpenPGPCFBBlockCipher; +import org.spongycastle.crypto.params.KeyParameter; +import org.spongycastle.crypto.params.ParametersWithIV; +import org.spongycastle.openpgp.operator.PGPDataDecryptor; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; class BcUtil { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/SHA1PGPDigestCalculator.java b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/SHA1PGPDigestCalculator.java index 979de84f..15572a39 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/SHA1PGPDigestCalculator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/SHA1PGPDigestCalculator.java @@ -1,12 +1,12 @@ -package org.bouncycastle.openpgp.operator.bc; +package org.spongycastle.openpgp.operator.bc; import java.io.IOException; import java.io.OutputStream; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.crypto.Digest; -import org.bouncycastle.crypto.digests.SHA1Digest; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.crypto.Digest; +import org.spongycastle.crypto.digests.SHA1Digest; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; class SHA1PGPDigestCalculator implements PGPDigestCalculator diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/SignerOutputStream.java b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/SignerOutputStream.java index f2bb4c97..cdc2d7e3 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/SignerOutputStream.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/bc/SignerOutputStream.java @@ -1,9 +1,9 @@ -package org.bouncycastle.openpgp.operator.bc; +package org.spongycastle.openpgp.operator.bc; import java.io.IOException; import java.io.OutputStream; -import org.bouncycastle.crypto.Signer; +import org.spongycastle.crypto.Signer; class SignerOutputStream extends OutputStream diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaKeyFingerprintCalculator.java b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaKeyFingerprintCalculator.java index e4fa495e..e72955f2 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaKeyFingerprintCalculator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaKeyFingerprintCalculator.java @@ -1,15 +1,15 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.io.IOException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import org.bouncycastle.bcpg.BCPGKey; -import org.bouncycastle.bcpg.MPInteger; -import org.bouncycastle.bcpg.PublicKeyPacket; -import org.bouncycastle.bcpg.RSAPublicBCPGKey; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.bcpg.BCPGKey; +import org.spongycastle.bcpg.MPInteger; +import org.spongycastle.bcpg.PublicKeyPacket; +import org.spongycastle.bcpg.RSAPublicBCPGKey; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; public class JcaKeyFingerprintCalculator implements KeyFingerPrintCalculator diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPContentSignerBuilder.java b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaPGPContentSignerBuilder.java index a24f0951..5cb6f007 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPContentSignerBuilder.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaPGPContentSignerBuilder.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.io.OutputStream; import java.security.InvalidKeyException; @@ -8,15 +8,15 @@ import java.security.SecureRandom; import java.security.Signature; import java.security.SignatureException; -import org.bouncycastle.jcajce.util.DefaultJcaJceHelper; -import org.bouncycastle.jcajce.util.NamedJcaJceHelper; -import org.bouncycastle.jcajce.util.ProviderJcaJceHelper; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.operator.PGPContentSigner; -import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.util.io.TeeOutputStream; +import org.spongycastle.jcajce.util.DefaultJcaJceHelper; +import org.spongycastle.jcajce.util.NamedJcaJceHelper; +import org.spongycastle.jcajce.util.ProviderJcaJceHelper; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.operator.PGPContentSigner; +import org.spongycastle.openpgp.operator.PGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.util.io.TeeOutputStream; public class JcaPGPContentSignerBuilder implements PGPContentSignerBuilder diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPContentVerifierBuilderProvider.java b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaPGPContentVerifierBuilderProvider.java index 67a6aa3f..99973776 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPContentVerifierBuilderProvider.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaPGPContentVerifierBuilderProvider.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.io.OutputStream; import java.security.InvalidKeyException; @@ -6,15 +6,15 @@ import java.security.Provider; import java.security.Signature; import java.security.SignatureException; -import org.bouncycastle.jcajce.util.DefaultJcaJceHelper; -import org.bouncycastle.jcajce.util.NamedJcaJceHelper; -import org.bouncycastle.jcajce.util.ProviderJcaJceHelper; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPRuntimeOperationException; -import org.bouncycastle.openpgp.operator.PGPContentVerifier; -import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilder; -import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilderProvider; +import org.spongycastle.jcajce.util.DefaultJcaJceHelper; +import org.spongycastle.jcajce.util.NamedJcaJceHelper; +import org.spongycastle.jcajce.util.ProviderJcaJceHelper; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPRuntimeOperationException; +import org.spongycastle.openpgp.operator.PGPContentVerifier; +import org.spongycastle.openpgp.operator.PGPContentVerifierBuilder; +import org.spongycastle.openpgp.operator.PGPContentVerifierBuilderProvider; public class JcaPGPContentVerifierBuilderProvider implements PGPContentVerifierBuilderProvider diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPDigestCalculatorProviderBuilder.java b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaPGPDigestCalculatorProviderBuilder.java index 1a8ccef5..753e289c 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPDigestCalculatorProviderBuilder.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaPGPDigestCalculatorProviderBuilder.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.io.IOException; import java.io.OutputStream; @@ -6,12 +6,12 @@ import java.security.GeneralSecurityException; import java.security.MessageDigest; import java.security.Provider; -import org.bouncycastle.jcajce.util.DefaultJcaJceHelper; -import org.bouncycastle.jcajce.util.NamedJcaJceHelper; -import org.bouncycastle.jcajce.util.ProviderJcaJceHelper; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.openpgp.operator.PGPDigestCalculatorProvider; +import org.spongycastle.jcajce.util.DefaultJcaJceHelper; +import org.spongycastle.jcajce.util.NamedJcaJceHelper; +import org.spongycastle.jcajce.util.ProviderJcaJceHelper; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.openpgp.operator.PGPDigestCalculatorProvider; /** * A builder for {@link PGPDigestCalculatorProvider} instances that obtain cryptographic primitives diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPKeyConverter.java b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaPGPKeyConverter.java index 90b9c344..2f82fdfa 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPKeyConverter.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaPGPKeyConverter.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.security.KeyFactory; import java.security.PrivateKey; @@ -20,44 +20,44 @@ import java.security.spec.RSAPrivateCrtKeySpec; import java.security.spec.RSAPublicKeySpec; import java.util.Date; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.ASN1OctetString; -import org.bouncycastle.asn1.DEROctetString; -import org.bouncycastle.asn1.nist.NISTNamedCurves; -import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; -import org.bouncycastle.asn1.x9.ECNamedCurveTable; -import org.bouncycastle.asn1.x9.X9ECParameters; -import org.bouncycastle.asn1.x9.X9ECPoint; -import org.bouncycastle.bcpg.BCPGKey; -import org.bouncycastle.bcpg.DSAPublicBCPGKey; -import org.bouncycastle.bcpg.DSASecretBCPGKey; -import org.bouncycastle.bcpg.ECDHPublicBCPGKey; -import org.bouncycastle.bcpg.ECDSAPublicBCPGKey; -import org.bouncycastle.bcpg.ECSecretBCPGKey; -import org.bouncycastle.bcpg.ElGamalPublicBCPGKey; -import org.bouncycastle.bcpg.ElGamalSecretBCPGKey; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyPacket; -import org.bouncycastle.bcpg.RSAPublicBCPGKey; -import org.bouncycastle.bcpg.RSASecretBCPGKey; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.crypto.ec.CustomNamedCurves; -import org.bouncycastle.jcajce.util.DefaultJcaJceHelper; -import org.bouncycastle.jcajce.util.NamedJcaJceHelper; -import org.bouncycastle.jcajce.util.ProviderJcaJceHelper; -import org.bouncycastle.jce.interfaces.ElGamalPrivateKey; -import org.bouncycastle.jce.interfaces.ElGamalPublicKey; -import org.bouncycastle.jce.spec.ECNamedCurveSpec; -import org.bouncycastle.jce.spec.ElGamalParameterSpec; -import org.bouncycastle.jce.spec.ElGamalPrivateKeySpec; -import org.bouncycastle.jce.spec.ElGamalPublicKeySpec; -import org.bouncycastle.openpgp.PGPAlgorithmParameters; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKdfParameters; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.ASN1OctetString; +import org.spongycastle.asn1.DEROctetString; +import org.spongycastle.asn1.nist.NISTNamedCurves; +import org.spongycastle.asn1.x509.SubjectPublicKeyInfo; +import org.spongycastle.asn1.x9.ECNamedCurveTable; +import org.spongycastle.asn1.x9.X9ECParameters; +import org.spongycastle.asn1.x9.X9ECPoint; +import org.spongycastle.bcpg.BCPGKey; +import org.spongycastle.bcpg.DSAPublicBCPGKey; +import org.spongycastle.bcpg.DSASecretBCPGKey; +import org.spongycastle.bcpg.ECDHPublicBCPGKey; +import org.spongycastle.bcpg.ECDSAPublicBCPGKey; +import org.spongycastle.bcpg.ECSecretBCPGKey; +import org.spongycastle.bcpg.ElGamalPublicBCPGKey; +import org.spongycastle.bcpg.ElGamalSecretBCPGKey; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyPacket; +import org.spongycastle.bcpg.RSAPublicBCPGKey; +import org.spongycastle.bcpg.RSASecretBCPGKey; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.crypto.ec.CustomNamedCurves; +import org.spongycastle.jcajce.util.DefaultJcaJceHelper; +import org.spongycastle.jcajce.util.NamedJcaJceHelper; +import org.spongycastle.jcajce.util.ProviderJcaJceHelper; +import org.spongycastle.jce.interfaces.ElGamalPrivateKey; +import org.spongycastle.jce.interfaces.ElGamalPublicKey; +import org.spongycastle.jce.spec.ECNamedCurveSpec; +import org.spongycastle.jce.spec.ElGamalParameterSpec; +import org.spongycastle.jce.spec.ElGamalPrivateKeySpec; +import org.spongycastle.jce.spec.ElGamalPublicKeySpec; +import org.spongycastle.openpgp.PGPAlgorithmParameters; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPKdfParameters; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; public class JcaPGPKeyConverter { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPKeyPair.java b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaPGPKeyPair.java index 8898f3e6..b32d00d7 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPKeyPair.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaPGPKeyPair.java @@ -1,15 +1,15 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.security.KeyPair; import java.security.PrivateKey; import java.security.PublicKey; import java.util.Date; -import org.bouncycastle.openpgp.PGPAlgorithmParameters; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPAlgorithmParameters; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; public class JcaPGPKeyPair extends PGPKeyPair diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPPrivateKey.java b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaPGPPrivateKey.java index 76161db1..a22f4561 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPPrivateKey.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcaPGPPrivateKey.java @@ -1,9 +1,9 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.security.PrivateKey; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; /** * A JCA PrivateKey carrier. Use this one if you're dealing with a hardware adapter. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePBEDataDecryptorFactoryBuilder.java b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePBEDataDecryptorFactoryBuilder.java index d1ef9001..d0e73b24 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePBEDataDecryptorFactoryBuilder.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePBEDataDecryptorFactoryBuilder.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.security.Provider; @@ -6,13 +6,13 @@ import javax.crypto.Cipher; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import org.bouncycastle.jcajce.util.DefaultJcaJceHelper; -import org.bouncycastle.jcajce.util.NamedJcaJceHelper; -import org.bouncycastle.jcajce.util.ProviderJcaJceHelper; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.operator.PBEDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.PGPDataDecryptor; -import org.bouncycastle.openpgp.operator.PGPDigestCalculatorProvider; +import org.spongycastle.jcajce.util.DefaultJcaJceHelper; +import org.spongycastle.jcajce.util.NamedJcaJceHelper; +import org.spongycastle.jcajce.util.ProviderJcaJceHelper; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.operator.PBEDataDecryptorFactory; +import org.spongycastle.openpgp.operator.PGPDataDecryptor; +import org.spongycastle.openpgp.operator.PGPDigestCalculatorProvider; /** * Builder for {@link PBEDataDecryptorFactory} instances that obtain cryptographic primitives using diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePBEKeyEncryptionMethodGenerator.java b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePBEKeyEncryptionMethodGenerator.java index 71429f96..510ca578 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePBEKeyEncryptionMethodGenerator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePBEKeyEncryptionMethodGenerator.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; @@ -12,13 +12,13 @@ import javax.crypto.SecretKey; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import org.bouncycastle.bcpg.S2K; -import org.bouncycastle.jcajce.util.DefaultJcaJceHelper; -import org.bouncycastle.jcajce.util.NamedJcaJceHelper; -import org.bouncycastle.jcajce.util.ProviderJcaJceHelper; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.operator.PBEKeyEncryptionMethodGenerator; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.bcpg.S2K; +import org.spongycastle.jcajce.util.DefaultJcaJceHelper; +import org.spongycastle.jcajce.util.NamedJcaJceHelper; +import org.spongycastle.jcajce.util.ProviderJcaJceHelper; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.operator.PBEKeyEncryptionMethodGenerator; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; /** * JCE based generator for password based encryption (PBE) data protection methods. diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePBEProtectionRemoverFactory.java b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePBEProtectionRemoverFactory.java index bf49da9b..1e8dc4b9 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePBEProtectionRemoverFactory.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePBEProtectionRemoverFactory.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; @@ -9,13 +9,13 @@ import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.spec.IvParameterSpec; -import org.bouncycastle.jcajce.util.DefaultJcaJceHelper; -import org.bouncycastle.jcajce.util.NamedJcaJceHelper; -import org.bouncycastle.jcajce.util.ProviderJcaJceHelper; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.operator.PBEProtectionRemoverFactory; -import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor; -import org.bouncycastle.openpgp.operator.PGPDigestCalculatorProvider; +import org.spongycastle.jcajce.util.DefaultJcaJceHelper; +import org.spongycastle.jcajce.util.NamedJcaJceHelper; +import org.spongycastle.jcajce.util.ProviderJcaJceHelper; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.operator.PBEProtectionRemoverFactory; +import org.spongycastle.openpgp.operator.PBESecretKeyDecryptor; +import org.spongycastle.openpgp.operator.PGPDigestCalculatorProvider; public class JcePBEProtectionRemoverFactory implements PBEProtectionRemoverFactory diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePBESecretKeyDecryptorBuilder.java b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePBESecretKeyDecryptorBuilder.java index 4d6b140d..15ab5358 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePBESecretKeyDecryptorBuilder.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePBESecretKeyDecryptorBuilder.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; @@ -9,12 +9,12 @@ import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.spec.IvParameterSpec; -import org.bouncycastle.jcajce.util.DefaultJcaJceHelper; -import org.bouncycastle.jcajce.util.NamedJcaJceHelper; -import org.bouncycastle.jcajce.util.ProviderJcaJceHelper; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor; -import org.bouncycastle.openpgp.operator.PGPDigestCalculatorProvider; +import org.spongycastle.jcajce.util.DefaultJcaJceHelper; +import org.spongycastle.jcajce.util.NamedJcaJceHelper; +import org.spongycastle.jcajce.util.ProviderJcaJceHelper; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.operator.PBESecretKeyDecryptor; +import org.spongycastle.openpgp.operator.PGPDigestCalculatorProvider; public class JcePBESecretKeyDecryptorBuilder { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePBESecretKeyEncryptorBuilder.java b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePBESecretKeyEncryptorBuilder.java index ce1f1517..4a137418 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePBESecretKeyEncryptorBuilder.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePBESecretKeyEncryptorBuilder.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; @@ -10,12 +10,12 @@ import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.spec.IvParameterSpec; -import org.bouncycastle.jcajce.util.DefaultJcaJceHelper; -import org.bouncycastle.jcajce.util.NamedJcaJceHelper; -import org.bouncycastle.jcajce.util.ProviderJcaJceHelper; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.jcajce.util.DefaultJcaJceHelper; +import org.spongycastle.jcajce.util.NamedJcaJceHelper; +import org.spongycastle.jcajce.util.ProviderJcaJceHelper; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.operator.PBESecretKeyEncryptor; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; public class JcePBESecretKeyEncryptorBuilder { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePGPDataEncryptorBuilder.java b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePGPDataEncryptorBuilder.java index f0c075ce..6761e607 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePGPDataEncryptorBuilder.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePGPDataEncryptorBuilder.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.io.OutputStream; import java.security.InvalidAlgorithmParameterException; @@ -10,14 +10,14 @@ import javax.crypto.Cipher; import javax.crypto.CipherOutputStream; import javax.crypto.spec.IvParameterSpec; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.jcajce.util.DefaultJcaJceHelper; -import org.bouncycastle.jcajce.util.NamedJcaJceHelper; -import org.bouncycastle.jcajce.util.ProviderJcaJceHelper; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.operator.PGPDataEncryptor; -import org.bouncycastle.openpgp.operator.PGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.jcajce.util.DefaultJcaJceHelper; +import org.spongycastle.jcajce.util.NamedJcaJceHelper; +import org.spongycastle.jcajce.util.ProviderJcaJceHelper; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.operator.PGPDataEncryptor; +import org.spongycastle.openpgp.operator.PGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; /** * {@link PGPDataEncryptorBuilder} implementation that sources cryptographic primitives using the diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePublicKeyDataDecryptorFactoryBuilder.java b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePublicKeyDataDecryptorFactoryBuilder.java index 589d17c3..51534ba9 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePublicKeyDataDecryptorFactoryBuilder.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePublicKeyDataDecryptorFactoryBuilder.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.security.InvalidKeyException; import java.security.Key; @@ -9,25 +9,25 @@ import java.security.Provider; import javax.crypto.Cipher; import javax.crypto.spec.SecretKeySpec; -import org.bouncycastle.asn1.nist.NISTNamedCurves; -import org.bouncycastle.asn1.x9.X9ECParameters; -import org.bouncycastle.bcpg.BCPGKey; -import org.bouncycastle.bcpg.ECDHPublicBCPGKey; -import org.bouncycastle.bcpg.ECSecretBCPGKey; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyPacket; -import org.bouncycastle.jcajce.util.DefaultJcaJceHelper; -import org.bouncycastle.jcajce.util.NamedJcaJceHelper; -import org.bouncycastle.jcajce.util.ProviderJcaJceHelper; -import org.bouncycastle.jce.interfaces.ElGamalKey; -import org.bouncycastle.math.ec.ECPoint; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.operator.PGPDataDecryptor; -import org.bouncycastle.openpgp.operator.PGPPad; -import org.bouncycastle.openpgp.operator.PublicKeyDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.RFC6637KDFCalculator; +import org.spongycastle.asn1.nist.NISTNamedCurves; +import org.spongycastle.asn1.x9.X9ECParameters; +import org.spongycastle.bcpg.BCPGKey; +import org.spongycastle.bcpg.ECDHPublicBCPGKey; +import org.spongycastle.bcpg.ECSecretBCPGKey; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyPacket; +import org.spongycastle.jcajce.util.DefaultJcaJceHelper; +import org.spongycastle.jcajce.util.NamedJcaJceHelper; +import org.spongycastle.jcajce.util.ProviderJcaJceHelper; +import org.spongycastle.jce.interfaces.ElGamalKey; +import org.spongycastle.math.ec.ECPoint; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.operator.PGPDataDecryptor; +import org.spongycastle.openpgp.operator.PGPPad; +import org.spongycastle.openpgp.operator.PublicKeyDataDecryptorFactory; +import org.spongycastle.openpgp.operator.RFC6637KDFCalculator; public class JcePublicKeyDataDecryptorFactoryBuilder { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePublicKeyKeyEncryptionMethodGenerator.java b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePublicKeyKeyEncryptionMethodGenerator.java index c229f9f6..bd7f4999 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePublicKeyKeyEncryptionMethodGenerator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/JcePublicKeyKeyEncryptionMethodGenerator.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.io.IOException; import java.math.BigInteger; @@ -12,29 +12,29 @@ import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.spec.SecretKeySpec; -import org.bouncycastle.asn1.nist.NISTNamedCurves; -import org.bouncycastle.asn1.x9.X9ECParameters; -import org.bouncycastle.bcpg.ECDHPublicBCPGKey; -import org.bouncycastle.bcpg.MPInteger; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.crypto.EphemeralKeyPair; -import org.bouncycastle.crypto.KeyEncoder; -import org.bouncycastle.crypto.generators.ECKeyPairGenerator; -import org.bouncycastle.crypto.generators.EphemeralKeyPairGenerator; -import org.bouncycastle.crypto.params.AsymmetricKeyParameter; -import org.bouncycastle.crypto.params.ECDomainParameters; -import org.bouncycastle.crypto.params.ECKeyGenerationParameters; -import org.bouncycastle.crypto.params.ECPrivateKeyParameters; -import org.bouncycastle.crypto.params.ECPublicKeyParameters; -import org.bouncycastle.jcajce.util.DefaultJcaJceHelper; -import org.bouncycastle.jcajce.util.NamedJcaJceHelper; -import org.bouncycastle.jcajce.util.ProviderJcaJceHelper; -import org.bouncycastle.math.ec.ECPoint; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.operator.PGPPad; -import org.bouncycastle.openpgp.operator.PublicKeyKeyEncryptionMethodGenerator; -import org.bouncycastle.openpgp.operator.RFC6637KDFCalculator; +import org.spongycastle.asn1.nist.NISTNamedCurves; +import org.spongycastle.asn1.x9.X9ECParameters; +import org.spongycastle.bcpg.ECDHPublicBCPGKey; +import org.spongycastle.bcpg.MPInteger; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.crypto.EphemeralKeyPair; +import org.spongycastle.crypto.KeyEncoder; +import org.spongycastle.crypto.generators.ECKeyPairGenerator; +import org.spongycastle.crypto.generators.EphemeralKeyPairGenerator; +import org.spongycastle.crypto.params.AsymmetricKeyParameter; +import org.spongycastle.crypto.params.ECDomainParameters; +import org.spongycastle.crypto.params.ECKeyGenerationParameters; +import org.spongycastle.crypto.params.ECPrivateKeyParameters; +import org.spongycastle.crypto.params.ECPublicKeyParameters; +import org.spongycastle.jcajce.util.DefaultJcaJceHelper; +import org.spongycastle.jcajce.util.NamedJcaJceHelper; +import org.spongycastle.jcajce.util.ProviderJcaJceHelper; +import org.spongycastle.math.ec.ECPoint; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.operator.PGPPad; +import org.spongycastle.openpgp.operator.PublicKeyKeyEncryptionMethodGenerator; +import org.spongycastle.openpgp.operator.RFC6637KDFCalculator; public class JcePublicKeyKeyEncryptionMethodGenerator extends PublicKeyKeyEncryptionMethodGenerator diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/OperatorHelper.java b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/OperatorHelper.java index 6606c77b..38e07cd0 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/OperatorHelper.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/OperatorHelper.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.io.InputStream; import java.security.GeneralSecurityException; @@ -12,13 +12,13 @@ import javax.crypto.SecretKey; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.jcajce.util.JcaJceHelper; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.operator.PGPDataDecryptor; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.jcajce.util.JcaJceHelper; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.operator.PGPDataDecryptor; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; class OperatorHelper { diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/PGPUtil.java b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/PGPUtil.java index 7da5bc5d..5edbdb82 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/PGPUtil.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/PGPUtil.java @@ -1,12 +1,12 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.openpgp.PGPException; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.openpgp.PGPException; /** * Basic utility class diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/SHA1PGPDigestCalculator.java b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/SHA1PGPDigestCalculator.java index c4f901e8..424770e6 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/SHA1PGPDigestCalculator.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/SHA1PGPDigestCalculator.java @@ -1,12 +1,12 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.io.IOException; import java.io.OutputStream; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; class SHA1PGPDigestCalculator implements PGPDigestCalculator diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/SignatureOutputStream.java b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/SignatureOutputStream.java index 750c51fe..808de300 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/SignatureOutputStream.java +++ b/pg/src/main/java/org/spongycastle/openpgp/operator/jcajce/SignatureOutputStream.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.io.IOException; import java.io.OutputStream; diff --git a/pg/src/main/javadoc/org/bouncycastle/openpgp/examples/package.html b/pg/src/main/javadoc/org/bouncycastle/openpgp/examples/package.html deleted file mode 100644 index e634dfc9..00000000 --- a/pg/src/main/javadoc/org/bouncycastle/openpgp/examples/package.html +++ /dev/null @@ -1,5 +0,0 @@ -<html> -<body bgcolor="#ffffff"> -Examples of use of the org.bouncycastle.openpgp package. -</body> -</html> diff --git a/pg/src/main/javadoc/org/bouncycastle/openpgp/examples/test/package.html b/pg/src/main/javadoc/org/bouncycastle/openpgp/examples/test/package.html deleted file mode 100644 index 6955879f..00000000 --- a/pg/src/main/javadoc/org/bouncycastle/openpgp/examples/test/package.html +++ /dev/null @@ -1,5 +0,0 @@ -<html> -<body bgcolor="#ffffff"> -Test code for the examples of use of the org.bouncycastle.openpgp package. -</body> -</html> diff --git a/pg/src/main/javadoc/org/bouncycastle/bcpg/attr/package.html b/pg/src/main/javadoc/org/spongycastle/bcpg/attr/package.html index 251824f6..251824f6 100644 --- a/pg/src/main/javadoc/org/bouncycastle/bcpg/attr/package.html +++ b/pg/src/main/javadoc/org/spongycastle/bcpg/attr/package.html diff --git a/pg/src/main/javadoc/org/bouncycastle/bcpg/package.html b/pg/src/main/javadoc/org/spongycastle/bcpg/package.html index 9791e3c8..8bf922eb 100644 --- a/pg/src/main/javadoc/org/bouncycastle/bcpg/package.html +++ b/pg/src/main/javadoc/org/spongycastle/bcpg/package.html @@ -3,7 +3,7 @@ Low level classes for dealing with OpenPGP objects. <p> These classes deal with things at a raw OpenPGP packet level. For the most part -you are probably better off looking at the org.bouncycastle.openpgp package +you are probably better off looking at the org.spongycastle.openpgp package for what you want. </body> </html> diff --git a/pg/src/main/javadoc/org/bouncycastle/bcpg/sig/package.html b/pg/src/main/javadoc/org/spongycastle/bcpg/sig/package.html index 474a1a8e..474a1a8e 100644 --- a/pg/src/main/javadoc/org/bouncycastle/bcpg/sig/package.html +++ b/pg/src/main/javadoc/org/spongycastle/bcpg/sig/package.html diff --git a/pg/src/main/javadoc/org/bouncycastle/openpgp/bc/package.html b/pg/src/main/javadoc/org/spongycastle/openpgp/bc/package.html index 3e1a4075..3e1a4075 100644 --- a/pg/src/main/javadoc/org/bouncycastle/openpgp/bc/package.html +++ b/pg/src/main/javadoc/org/spongycastle/openpgp/bc/package.html diff --git a/pg/src/main/javadoc/org/spongycastle/openpgp/examples/package.html b/pg/src/main/javadoc/org/spongycastle/openpgp/examples/package.html new file mode 100644 index 00000000..47b2cf24 --- /dev/null +++ b/pg/src/main/javadoc/org/spongycastle/openpgp/examples/package.html @@ -0,0 +1,5 @@ +<html> +<body bgcolor="#ffffff"> +Examples of use of the org.spongycastle.openpgp package. +</body> +</html> diff --git a/pg/src/main/javadoc/org/spongycastle/openpgp/examples/test/package.html b/pg/src/main/javadoc/org/spongycastle/openpgp/examples/test/package.html new file mode 100644 index 00000000..dc4161c2 --- /dev/null +++ b/pg/src/main/javadoc/org/spongycastle/openpgp/examples/test/package.html @@ -0,0 +1,5 @@ +<html> +<body bgcolor="#ffffff"> +Test code for the examples of use of the org.spongycastle.openpgp package. +</body> +</html> diff --git a/pg/src/main/javadoc/org/bouncycastle/openpgp/jcajce/package.html b/pg/src/main/javadoc/org/spongycastle/openpgp/jcajce/package.html index 8e3f89b0..8e3f89b0 100644 --- a/pg/src/main/javadoc/org/bouncycastle/openpgp/jcajce/package.html +++ b/pg/src/main/javadoc/org/spongycastle/openpgp/jcajce/package.html diff --git a/pg/src/main/javadoc/org/bouncycastle/openpgp/operator/bc/package.html b/pg/src/main/javadoc/org/spongycastle/openpgp/operator/bc/package.html index d1642127..d1642127 100644 --- a/pg/src/main/javadoc/org/bouncycastle/openpgp/operator/bc/package.html +++ b/pg/src/main/javadoc/org/spongycastle/openpgp/operator/bc/package.html diff --git a/pg/src/main/javadoc/org/bouncycastle/openpgp/operator/jcajce/package.html b/pg/src/main/javadoc/org/spongycastle/openpgp/operator/jcajce/package.html index 928425dc..928425dc 100644 --- a/pg/src/main/javadoc/org/bouncycastle/openpgp/operator/jcajce/package.html +++ b/pg/src/main/javadoc/org/spongycastle/openpgp/operator/jcajce/package.html diff --git a/pg/src/main/javadoc/org/bouncycastle/openpgp/operator/package.html b/pg/src/main/javadoc/org/spongycastle/openpgp/operator/package.html index 458018e6..16e61e10 100644 --- a/pg/src/main/javadoc/org/bouncycastle/openpgp/operator/package.html +++ b/pg/src/main/javadoc/org/spongycastle/openpgp/operator/package.html @@ -2,7 +2,7 @@ <body bgcolor="#ffffff"> Interfaces and abstract classes to provide the framework to support operations on the OpenPGP high level classes. <p> -For examples of actual implementations see the org.bouncycastle.openpgp.operator.bc and org.bouncycastle.openpgp.operator.jcajce packages. +For examples of actual implementations see the org.spongycastle.openpgp.operator.bc and org.spongycastle.openpgp.operator.jcajce packages. </p> </body> </html> diff --git a/pg/src/main/javadoc/org/bouncycastle/openpgp/package.html b/pg/src/main/javadoc/org/spongycastle/openpgp/package.html index 064527cd..fd09835c 100644 --- a/pg/src/main/javadoc/org/bouncycastle/openpgp/package.html +++ b/pg/src/main/javadoc/org/spongycastle/openpgp/package.html @@ -2,7 +2,7 @@ <body bgcolor="#ffffff"> High level classes for dealing with OpenPGP objects. <p> -<b>Note</b>: These are based on the org.bouncycastle.bcpg classes and use a streaming +<b>Note</b>: These are based on the org.spongycastle.bcpg classes and use a streaming model, so for some objects which have an input stream associated it is necessary to read to the end of the input stream on the object before trying to read another object from the orginal input stream. diff --git a/pg/src/main/jdk1.1/org/bouncycastle/openpgp/examples/DetachedSignatureProcessor.java b/pg/src/main/jdk1.1/org/spongycastle/openpgp/examples/DetachedSignatureProcessor.java index 2361756b..eca9f352 100644 --- a/pg/src/main/jdk1.1/org/bouncycastle/openpgp/examples/DetachedSignatureProcessor.java +++ b/pg/src/main/jdk1.1/org/spongycastle/openpgp/examples/DetachedSignatureProcessor.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.examples; +package org.spongycastle.openpgp.examples; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -11,23 +11,23 @@ import java.security.GeneralSecurityException; import java.security.SignatureException; import java.security.Security; -import org.bouncycastle.bcpg.ArmoredOutputStream; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPObjectFactory; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.bcpg.ArmoredOutputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPObjectFactory; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRingCollection; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; /** * A simple utility class that creates seperate signatures for files and verifies them. @@ -94,7 +94,7 @@ public class DetachedSignatureProcessor PGPSignature sig = p3.get(0); PGPPublicKey key = pgpPubRingCollection.getPublicKey(sig.getKeyID()); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), key); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), key); int ch; while ((ch = dIn.read()) >= 0) @@ -145,8 +145,8 @@ public class DetachedSignatureProcessor } PGPSecretKey pgpSec = PGPExampleUtil.readSecretKey(keyIn); - PGPPrivateKey pgpPrivKey = pgpSec.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(pass)); - PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(pgpSec.getPublicKey().getAlgorithm(), PGPUtil.SHA1).setProvider("BC")); + PGPPrivateKey pgpPrivKey = pgpSec.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(pass)); + PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(pgpSec.getPublicKey().getAlgorithm(), PGPUtil.SHA1).setProvider("SC")); sGen.init(PGPSignature.BINARY_DOCUMENT, pgpPrivKey); diff --git a/pg/src/main/jdk1.1/org/bouncycastle/openpgp/operator/jcajce/JcaPGPContentSignerBuilder.java b/pg/src/main/jdk1.1/org/spongycastle/openpgp/operator/jcajce/JcaPGPContentSignerBuilder.java index 78d4e499..a5dc297d 100644 --- a/pg/src/main/jdk1.1/org/bouncycastle/openpgp/operator/jcajce/JcaPGPContentSignerBuilder.java +++ b/pg/src/main/jdk1.1/org/spongycastle/openpgp/operator/jcajce/JcaPGPContentSignerBuilder.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.io.OutputStream; import java.security.InvalidKeyException; @@ -7,15 +7,15 @@ import java.security.SecureRandom; import java.security.Signature; import java.security.SignatureException; -import org.bouncycastle.jcajce.util.DefaultJcaJceHelper; -import org.bouncycastle.jcajce.util.NamedJcaJceHelper; -import org.bouncycastle.jcajce.util.ProviderJcaJceHelper; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.operator.PGPContentSigner; -import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.util.io.TeeOutputStream; +import org.spongycastle.jcajce.util.DefaultJcaJceHelper; +import org.spongycastle.jcajce.util.NamedJcaJceHelper; +import org.spongycastle.jcajce.util.ProviderJcaJceHelper; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.operator.PGPContentSigner; +import org.spongycastle.openpgp.operator.PGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.util.io.TeeOutputStream; public class JcaPGPContentSignerBuilder implements PGPContentSignerBuilder diff --git a/pg/src/main/jdk1.1/org/bouncycastle/openpgp/operator/jcajce/OperatorHelper.java b/pg/src/main/jdk1.1/org/spongycastle/openpgp/operator/jcajce/OperatorHelper.java index 52023662..dc20e0c3 100644 --- a/pg/src/main/jdk1.1/org/bouncycastle/openpgp/operator/jcajce/OperatorHelper.java +++ b/pg/src/main/jdk1.1/org/spongycastle/openpgp/operator/jcajce/OperatorHelper.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.io.InputStream; import java.security.GeneralSecurityException; @@ -14,13 +14,13 @@ import javax.crypto.SecretKey; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.jcajce.util.JcaJceHelper; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.operator.PGPDataDecryptor; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.jcajce.util.JcaJceHelper; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.operator.PGPDataDecryptor; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; class OperatorHelper { diff --git a/pg/src/main/jdk1.4/org/bouncycastle/openpgp/operator/jcajce/JcaPGPKeyConverter.java b/pg/src/main/jdk1.4/org/spongycastle/openpgp/operator/jcajce/JcaPGPKeyConverter.java index 828f8b13..042b74b1 100644 --- a/pg/src/main/jdk1.4/org/bouncycastle/openpgp/operator/jcajce/JcaPGPKeyConverter.java +++ b/pg/src/main/jdk1.4/org/spongycastle/openpgp/operator/jcajce/JcaPGPKeyConverter.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.operator.jcajce; +package org.spongycastle.openpgp.operator.jcajce; import java.security.KeyFactory; import java.security.PrivateKey; @@ -7,55 +7,55 @@ import java.security.PublicKey; import java.security.interfaces.DSAParams; import java.security.interfaces.DSAPrivateKey; import java.security.interfaces.DSAPublicKey; -import org.bouncycastle.jce.interfaces.ECPrivateKey; -import org.bouncycastle.jce.interfaces.ECPublicKey; +import org.spongycastle.jce.interfaces.ECPrivateKey; +import org.spongycastle.jce.interfaces.ECPublicKey; import java.security.interfaces.RSAPrivateCrtKey; import java.security.interfaces.RSAPublicKey; import java.security.spec.DSAPrivateKeySpec; import java.security.spec.DSAPublicKeySpec; -import org.bouncycastle.jce.spec.ECParameterSpec; -import org.bouncycastle.jce.spec.ECPrivateKeySpec; -import org.bouncycastle.jce.spec.ECPublicKeySpec; +import org.spongycastle.jce.spec.ECParameterSpec; +import org.spongycastle.jce.spec.ECPrivateKeySpec; +import org.spongycastle.jce.spec.ECPublicKeySpec; import java.security.spec.RSAPrivateCrtKeySpec; import java.security.spec.RSAPublicKeySpec; import java.util.Date; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.ASN1OctetString; -import org.bouncycastle.asn1.DEROctetString; -import org.bouncycastle.asn1.nist.NISTNamedCurves; -import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; -import org.bouncycastle.asn1.x9.X9ECParameters; -import org.bouncycastle.asn1.x9.X9ECPoint; -import org.bouncycastle.bcpg.BCPGKey; -import org.bouncycastle.bcpg.DSAPublicBCPGKey; -import org.bouncycastle.bcpg.DSASecretBCPGKey; -import org.bouncycastle.bcpg.ECDHPublicBCPGKey; -import org.bouncycastle.bcpg.ECDSAPublicBCPGKey; -import org.bouncycastle.bcpg.ECSecretBCPGKey; -import org.bouncycastle.bcpg.ElGamalPublicBCPGKey; -import org.bouncycastle.bcpg.ElGamalSecretBCPGKey; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyPacket; -import org.bouncycastle.bcpg.RSAPublicBCPGKey; -import org.bouncycastle.bcpg.RSASecretBCPGKey; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.jcajce.util.DefaultJcaJceHelper; -import org.bouncycastle.jcajce.util.NamedJcaJceHelper; -import org.bouncycastle.jcajce.util.ProviderJcaJceHelper; -import org.bouncycastle.jce.interfaces.ElGamalPrivateKey; -import org.bouncycastle.jce.interfaces.ElGamalPublicKey; -import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec; -import org.bouncycastle.jce.spec.ElGamalParameterSpec; -import org.bouncycastle.jce.spec.ElGamalPrivateKeySpec; -import org.bouncycastle.jce.spec.ElGamalPublicKeySpec; -import org.bouncycastle.openpgp.PGPAlgorithmParameters; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKdfParameters; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.ASN1OctetString; +import org.spongycastle.asn1.DEROctetString; +import org.spongycastle.asn1.nist.NISTNamedCurves; +import org.spongycastle.asn1.x509.SubjectPublicKeyInfo; +import org.spongycastle.asn1.x9.X9ECParameters; +import org.spongycastle.asn1.x9.X9ECPoint; +import org.spongycastle.bcpg.BCPGKey; +import org.spongycastle.bcpg.DSAPublicBCPGKey; +import org.spongycastle.bcpg.DSASecretBCPGKey; +import org.spongycastle.bcpg.ECDHPublicBCPGKey; +import org.spongycastle.bcpg.ECDSAPublicBCPGKey; +import org.spongycastle.bcpg.ECSecretBCPGKey; +import org.spongycastle.bcpg.ElGamalPublicBCPGKey; +import org.spongycastle.bcpg.ElGamalSecretBCPGKey; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyPacket; +import org.spongycastle.bcpg.RSAPublicBCPGKey; +import org.spongycastle.bcpg.RSASecretBCPGKey; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.jcajce.util.DefaultJcaJceHelper; +import org.spongycastle.jcajce.util.NamedJcaJceHelper; +import org.spongycastle.jcajce.util.ProviderJcaJceHelper; +import org.spongycastle.jce.interfaces.ElGamalPrivateKey; +import org.spongycastle.jce.interfaces.ElGamalPublicKey; +import org.spongycastle.jce.spec.ECNamedCurveParameterSpec; +import org.spongycastle.jce.spec.ElGamalParameterSpec; +import org.spongycastle.jce.spec.ElGamalPrivateKeySpec; +import org.spongycastle.jce.spec.ElGamalPublicKeySpec; +import org.spongycastle.openpgp.PGPAlgorithmParameters; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPKdfParameters; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; public class JcaPGPKeyConverter { diff --git a/pg/src/test/java/org/bouncycastle/openpgp/examples/test/AllTests.java b/pg/src/test/java/org/spongycastle/openpgp/examples/test/AllTests.java index f44d3724..f015de6f 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/examples/test/AllTests.java +++ b/pg/src/test/java/org/spongycastle/openpgp/examples/test/AllTests.java @@ -1,16 +1,16 @@ -package org.bouncycastle.openpgp.examples.test; +package org.spongycastle.openpgp.examples.test; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.openpgp.examples.ClearSignedFileProcessor; -import org.bouncycastle.openpgp.examples.DSAElGamalKeyRingGenerator; -import org.bouncycastle.openpgp.examples.KeyBasedFileProcessor; -import org.bouncycastle.openpgp.examples.KeyBasedLargeFileProcessor; -import org.bouncycastle.openpgp.examples.PBEFileProcessor; -import org.bouncycastle.openpgp.examples.RSAKeyPairGenerator; -import org.bouncycastle.openpgp.examples.SignedFileProcessor; -import org.bouncycastle.util.encoders.Base64; +import org.spongycastle.openpgp.examples.ClearSignedFileProcessor; +import org.spongycastle.openpgp.examples.DSAElGamalKeyRingGenerator; +import org.spongycastle.openpgp.examples.KeyBasedFileProcessor; +import org.spongycastle.openpgp.examples.KeyBasedLargeFileProcessor; +import org.spongycastle.openpgp.examples.PBEFileProcessor; +import org.spongycastle.openpgp.examples.RSAKeyPairGenerator; +import org.spongycastle.openpgp.examples.SignedFileProcessor; +import org.spongycastle.util.encoders.Base64; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/AllTests.java b/pg/src/test/java/org/spongycastle/openpgp/test/AllTests.java index f1c54923..81bfa301 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/AllTests.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/AllTests.java @@ -1,12 +1,12 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.security.Security; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.util.test.SimpleTestResult; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.util.test.SimpleTestResult; public class AllTests extends TestCase @@ -15,7 +15,7 @@ public class AllTests { Security.addProvider(new BouncyCastleProvider()); - org.bouncycastle.util.test.Test[] tests = RegressionTest.tests; + org.spongycastle.util.test.Test[] tests = RegressionTest.tests; for (int i = 0; i != tests.length; i++) { diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/BcPGPDSAElGamalTest.java b/pg/src/test/java/org/spongycastle/openpgp/test/BcPGPDSAElGamalTest.java index e147b396..b8311b46 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/BcPGPDSAElGamalTest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/BcPGPDSAElGamalTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -16,48 +16,48 @@ import java.util.Iterator; import javax.crypto.spec.DHParameterSpec; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.crypto.AsymmetricBlockCipher; -import org.bouncycastle.crypto.encodings.PKCS1Encoding; -import org.bouncycastle.crypto.engines.ElGamalEngine; -import org.bouncycastle.crypto.params.AsymmetricKeyParameter; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.jce.spec.ElGamalParameterSpec; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPCompressedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPOnePassSignature; -import org.bouncycastle.openpgp.PGPOnePassSignatureList; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; -import org.bouncycastle.openpgp.operator.bc.BcPGPKeyConverter; -import org.bouncycastle.openpgp.operator.bc.BcPublicKeyDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.bc.BcPublicKeyKeyEncryptionMethodGenerator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.crypto.AsymmetricBlockCipher; +import org.spongycastle.crypto.encodings.PKCS1Encoding; +import org.spongycastle.crypto.engines.ElGamalEngine; +import org.spongycastle.crypto.params.AsymmetricKeyParameter; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.jce.spec.ElGamalParameterSpec; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPCompressedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPOnePassSignature; +import org.spongycastle.openpgp.PGPOnePassSignatureList; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyEncryptedData; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; +import org.spongycastle.openpgp.operator.bc.BcPGPKeyConverter; +import org.spongycastle.openpgp.operator.bc.BcPublicKeyDataDecryptorFactory; +import org.spongycastle.openpgp.operator.bc.BcPublicKeyKeyEncryptionMethodGenerator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class BcPGPDSAElGamalTest extends SimpleTest @@ -146,7 +146,7 @@ public class BcPGPDSAElGamalTest { PGPPublicKey pubKey; - PGPUtil.setDefaultProvider("BC"); + PGPUtil.setDefaultProvider("SC"); // // Read the public key @@ -436,7 +436,7 @@ public class BcPGPDSAElGamalTest BigInteger g = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16); BigInteger p = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16); - KeyPairGenerator kpg = KeyPairGenerator.getInstance("ElGamal", "BC"); + KeyPairGenerator kpg = KeyPairGenerator.getInstance("ElGamal", "SC"); ElGamalParameterSpec elParams = new ElGamalParameterSpec(p, g); @@ -457,12 +457,12 @@ public class BcPGPDSAElGamalTest for (int pSize = 257; pSize < 264; ++pSize) { // Generate some parameters of the given size - AlgorithmParameterGenerator a = AlgorithmParameterGenerator.getInstance("ElGamal", "BC"); + AlgorithmParameterGenerator a = AlgorithmParameterGenerator.getInstance("ElGamal", "SC"); a.init(pSize, new SecureRandom()); AlgorithmParameters params = a.generateParameters(); DHParameterSpec elP = (DHParameterSpec)params.getParameterSpec(DHParameterSpec.class); - KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ElGamal", "BC"); + KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ElGamal", "SC"); keyGen.initialize(elP); diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/BcPGPDSATest.java b/pg/src/test/java/org/spongycastle/openpgp/test/BcPGPDSATest.java index 85a6d5b0..9bb70ba6 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/BcPGPDSATest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/BcPGPDSATest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -12,40 +12,40 @@ import java.security.Security; import java.util.Date; import java.util.Iterator; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPCompressedDataGenerator; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPOnePassSignature; -import org.bouncycastle.openpgp.PGPOnePassSignatureList; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator; -import org.bouncycastle.openpgp.PGPUserAttributeSubpacketVector; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyConverter; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPCompressedDataGenerator; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPOnePassSignature; +import org.spongycastle.openpgp.PGPOnePassSignatureList; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator; +import org.spongycastle.openpgp.PGPUserAttributeSubpacketVector; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyConverter; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class BcPGPDSATest extends SimpleTest @@ -397,11 +397,11 @@ public class BcPGPDSATest throws Exception { String file = null; - KeyFactory fact = KeyFactory.getInstance("DSA", "BC"); + KeyFactory fact = KeyFactory.getInstance("DSA", "SC"); PGPPublicKey pubKey = null; PrivateKey privKey = null; - PGPUtil.setDefaultProvider("BC"); + PGPUtil.setDefaultProvider("SC"); // // Read the public key @@ -586,9 +586,9 @@ public class BcPGPDSATest char [] passPhrase = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' }; sKey = new PGPSecretKeyRing(testPrivKey2, new BcKeyFingerprintCalculator()); - pgpPrivKey = sKey.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(passPhrase)); + pgpPrivKey = sKey.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(passPhrase)); - byte[] bytes = new JcaPGPKeyConverter().setProvider("BC").getPrivateKey(pgpPrivKey).getEncoded(); + byte[] bytes = new JcaPGPKeyConverter().setProvider("SC").getPrivateKey(pgpPrivKey).getEncoded(); // // reading test - aes256 encrypted passphrase. @@ -596,7 +596,7 @@ public class BcPGPDSATest sKey = new PGPSecretKeyRing(aesSecretKey, new BcKeyFingerprintCalculator()); pgpPrivKey = sKey.getSecretKey().extractPrivateKey(new BcPBESecretKeyDecryptorBuilder(new BcPGPDigestCalculatorProvider()).build(pass)); - bytes = new JcaPGPKeyConverter().setProvider("BC").getPrivateKey(pgpPrivKey).getEncoded(); + bytes = new JcaPGPKeyConverter().setProvider("SC").getPrivateKey(pgpPrivKey).getEncoded(); // // reading test - twofish encrypted passphrase. @@ -604,12 +604,12 @@ public class BcPGPDSATest sKey = new PGPSecretKeyRing(twofishSecretKey, new BcKeyFingerprintCalculator()); pgpPrivKey = sKey.getSecretKey().extractPrivateKey(new BcPBESecretKeyDecryptorBuilder(new BcPGPDigestCalculatorProvider()).build(pass)); - bytes = new JcaPGPKeyConverter().setProvider("BC").getPrivateKey(pgpPrivKey).getEncoded(); + bytes = new JcaPGPKeyConverter().setProvider("SC").getPrivateKey(pgpPrivKey).getEncoded(); // // use of PGPKeyPair // - KeyPairGenerator kpg = KeyPairGenerator.getInstance("DSA", "BC"); + KeyPairGenerator kpg = KeyPairGenerator.getInstance("DSA", "SC"); kpg.initialize(512); diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/BcPGPKeyRingTest.java b/pg/src/test/java/org/spongycastle/openpgp/test/BcPGPKeyRingTest.java index a8179c96..30de8bc3 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/BcPGPKeyRingTest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/BcPGPKeyRingTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.math.BigInteger; @@ -9,35 +9,35 @@ import java.security.Security; import java.util.Date; import java.util.Iterator; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.jce.spec.ElGamalParameterSpec; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPKeyRingGenerator; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.bc.BcPGPPublicKeyRingCollection; -import org.bouncycastle.openpgp.bc.BcPGPSecretKeyRingCollection; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; -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.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.Hex; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.jce.spec.ElGamalParameterSpec; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPKeyRingGenerator; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.bc.BcPGPPublicKeyRingCollection; +import org.spongycastle.openpgp.bc.BcPGPSecretKeyRingCollection; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.test.SimpleTest; public class BcPGPKeyRingTest extends SimpleTest @@ -1917,7 +1917,7 @@ public class BcPGPKeyRingTest throws Exception { char[] passPhrase = "hello".toCharArray(); - KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", "BC"); + KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", "SC"); dsaKpg.initialize(512); @@ -1927,7 +1927,7 @@ public class BcPGPKeyRingTest // KeyPair dsaKp = dsaKpg.generateKeyPair(); - KeyPairGenerator elgKpg = KeyPairGenerator.getInstance("ELGAMAL", "BC"); + KeyPairGenerator elgKpg = KeyPairGenerator.getInstance("ELGAMAL", "SC"); BigInteger g = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16); BigInteger p = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16); @@ -1944,7 +1944,7 @@ public class BcPGPKeyRingTest PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, dsaKeyPair, - "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); keyRingGen.addSubKey(elgKeyPair); @@ -1993,7 +1993,7 @@ public class BcPGPKeyRingTest throws Exception { char[] passPhrase = "hello".toCharArray(); - KeyPairGenerator rsaKpg = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator rsaKpg = KeyPairGenerator.getInstance("RSA", "SC"); rsaKpg.initialize(512); @@ -2006,11 +2006,11 @@ public class BcPGPKeyRingTest PGPKeyPair rsaKeyPair2 = new JcaPGPKeyPair(PGPPublicKey.RSA_GENERAL, rsaKp, new Date()); PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, rsaKeyPair1, - "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); PGPSecretKeyRing secRing1 = keyRingGen.generateSecretKeyRing(); PGPPublicKeyRing pubRing1 = keyRingGen.generatePublicKeyRing(); keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, rsaKeyPair2, - "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); PGPSecretKeyRing secRing2 = keyRingGen.generateSecretKeyRing(); PGPPublicKeyRing pubRing2 = keyRingGen.generatePublicKeyRing(); @@ -2045,7 +2045,7 @@ public class BcPGPKeyRingTest throws Exception { char[] passPhrase = "hello".toCharArray(); - KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", "BC"); + KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", "SC"); dsaKpg.initialize(512); @@ -2055,7 +2055,7 @@ public class BcPGPKeyRingTest // KeyPair dsaKp = dsaKpg.generateKeyPair(); - KeyPairGenerator elgKpg = KeyPairGenerator.getInstance("ELGAMAL", "BC"); + KeyPairGenerator elgKpg = KeyPairGenerator.getInstance("ELGAMAL", "SC"); BigInteger g = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16); BigInteger p = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16); @@ -2071,7 +2071,7 @@ public class BcPGPKeyRingTest PGPKeyPair elgKeyPair = new JcaPGPKeyPair(PGPPublicKey.ELGAMAL_ENCRYPT, elgKp, new Date()); PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, dsaKeyPair, - "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); keyRingGen.addSubKey(elgKeyPair); @@ -2213,7 +2213,7 @@ public class BcPGPKeyRingTest // // this is quicker because we are using pregenerated parameters. // - KeyPairGenerator rsaKpg = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator rsaKpg = KeyPairGenerator.getInstance("RSA", "SC"); KeyPair rsaKp = rsaKpg.generateKeyPair(); PGPKeyPair rsaKeyPair1 = new JcaPGPKeyPair(PGPPublicKey.RSA_GENERAL, rsaKp, new Date()); rsaKp = rsaKpg.generateKeyPair(); @@ -2221,7 +2221,7 @@ public class BcPGPKeyRingTest char[] passPhrase = "passwd".toCharArray(); PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, rsaKeyPair1, - userID, sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + userID, sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); PGPPublicKeyRing pubRing1 = keyRingGen.generatePublicKeyRing(); diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/BcPGPPBETest.java b/pg/src/test/java/org/spongycastle/openpgp/test/BcPGPPBETest.java index ec7ebf24..9a394d30 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/BcPGPPBETest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/BcPGPPBETest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayOutputStream; import java.io.InputStream; @@ -7,24 +7,24 @@ import java.security.SecureRandom; import java.security.Security; import java.util.Date; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPCompressedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPPBEEncryptedData; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.bc.BcPBEDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.bc.BcPBEKeyEncryptionMethodGenerator; -import org.bouncycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.Hex; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPCompressedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPEncryptedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPPBEEncryptedData; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.bc.BcPBEDataDecryptorFactory; +import org.spongycastle.openpgp.operator.bc.BcPBEKeyEncryptionMethodGenerator; +import org.spongycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class BcPGPPBETest extends SimpleTest diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/BcPGPRSATest.java b/pg/src/test/java/org/spongycastle/openpgp/test/BcPGPRSATest.java index 76843a2b..86ce820d 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/BcPGPRSATest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/BcPGPRSATest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -14,65 +14,65 @@ import java.util.Iterator; import javax.crypto.Cipher; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.CompressionAlgorithmTags; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.bcpg.attr.ImageAttribute; -import org.bouncycastle.bcpg.sig.Features; -import org.bouncycastle.bcpg.sig.KeyFlags; -import org.bouncycastle.crypto.AsymmetricCipherKeyPair; -import org.bouncycastle.crypto.generators.RSAKeyPairGenerator; -import org.bouncycastle.crypto.params.RSAKeyGenerationParameters; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPCompressedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPKeyRingGenerator; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPObjectFactory; -import org.bouncycastle.openpgp.PGPOnePassSignature; -import org.bouncycastle.openpgp.PGPOnePassSignatureList; -import org.bouncycastle.openpgp.PGPPBEEncryptedData; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator; -import org.bouncycastle.openpgp.PGPSignatureSubpacketVector; -import org.bouncycastle.openpgp.PGPUserAttributeSubpacketVector; -import org.bouncycastle.openpgp.PGPUserAttributeSubpacketVectorGenerator; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.PGPV3SignatureGenerator; -import org.bouncycastle.openpgp.operator.PublicKeyDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.bc.BcPBEDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.bc.BcPBEKeyEncryptionMethodGenerator; -import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyEncryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; -import org.bouncycastle.openpgp.operator.bc.BcPGPKeyPair; -import org.bouncycastle.openpgp.operator.bc.BcPublicKeyDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.bc.BcPublicKeyKeyEncryptionMethodGenerator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyConverter; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.Hex; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.CompressionAlgorithmTags; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.bcpg.attr.ImageAttribute; +import org.spongycastle.bcpg.sig.Features; +import org.spongycastle.bcpg.sig.KeyFlags; +import org.spongycastle.crypto.AsymmetricCipherKeyPair; +import org.spongycastle.crypto.generators.RSAKeyPairGenerator; +import org.spongycastle.crypto.params.RSAKeyGenerationParameters; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPCompressedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPEncryptedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPKeyRingGenerator; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPObjectFactory; +import org.spongycastle.openpgp.PGPOnePassSignature; +import org.spongycastle.openpgp.PGPOnePassSignatureList; +import org.spongycastle.openpgp.PGPPBEEncryptedData; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyEncryptedData; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator; +import org.spongycastle.openpgp.PGPSignatureSubpacketVector; +import org.spongycastle.openpgp.PGPUserAttributeSubpacketVector; +import org.spongycastle.openpgp.PGPUserAttributeSubpacketVectorGenerator; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.PGPV3SignatureGenerator; +import org.spongycastle.openpgp.operator.PublicKeyDataDecryptorFactory; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.bc.BcPBEDataDecryptorFactory; +import org.spongycastle.openpgp.operator.bc.BcPBEKeyEncryptionMethodGenerator; +import org.spongycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPBESecretKeyEncryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; +import org.spongycastle.openpgp.operator.bc.BcPGPKeyPair; +import org.spongycastle.openpgp.operator.bc.BcPublicKeyDataDecryptorFactory; +import org.spongycastle.openpgp.operator.bc.BcPublicKeyKeyEncryptionMethodGenerator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyConverter; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class BcPGPRSATest extends SimpleTest @@ -750,7 +750,7 @@ public class BcPGPRSATest // PGPPublicKeyRing pgpPub = new PGPPublicKeyRing(testPubKey, new BcKeyFingerprintCalculator()); - pubKey = new JcaPGPKeyConverter().setProvider("BC").getPublicKey(pgpPub.getPublicKey()); + pubKey = new JcaPGPKeyConverter().setProvider("SC").getPublicKey(pgpPub.getPublicKey()); Iterator it = pgpPub.getPublicKey().getUserIDs(); @@ -784,7 +784,7 @@ public class BcPGPRSATest // Read the public key // PGPPublicKeyRing pgpPubV3 = new PGPPublicKeyRing(testPubKeyV3, new BcKeyFingerprintCalculator()); - PublicKey pubKeyV3 = new JcaPGPKeyConverter().setProvider("BC").getPublicKey(pgpPub.getPublicKey()); + PublicKey pubKeyV3 = new JcaPGPKeyConverter().setProvider("SC").getPublicKey(pgpPub.getPublicKey()); // // write a V3 public key @@ -841,7 +841,7 @@ public class BcPGPRSATest // // test encryption // - Cipher c = Cipher.getInstance("RSA", "BC"); + Cipher c = Cipher.getInstance("RSA", "SC"); c.init(Cipher.ENCRYPT_MODE, pubKey); @@ -849,7 +849,7 @@ public class BcPGPRSATest byte[] out = c.doFinal(in); - c.init(Cipher.DECRYPT_MODE, new JcaPGPKeyConverter().setProvider("BC").getPrivateKey(pgpPrivKey)); + c.init(Cipher.DECRYPT_MODE, new JcaPGPKeyConverter().setProvider("SC").getPrivateKey(pgpPrivKey)); out = c.doFinal(out); diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/DSA2Test.java b/pg/src/test/java/org/spongycastle/openpgp/test/DSA2Test.java index 741c20a5..5e0ea682 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/DSA2Test.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/DSA2Test.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -11,26 +11,26 @@ import java.util.Date; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPOnePassSignature; -import org.bouncycastle.openpgp.PGPOnePassSignatureList; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPOnePassSignature; +import org.spongycastle.openpgp.PGPOnePassSignatureList; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.util.test.UncloseableOutputStream; /** * GPG compatability test vectors @@ -42,9 +42,9 @@ public class DSA2Test public void setUp() { - if (Security.getProvider("BC") == null) + if (Security.getProvider("SC") == null) { - Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); + Security.addProvider(new org.spongycastle.jce.provider.BouncyCastleProvider()); } } @@ -146,9 +146,9 @@ public class DSA2Test String data = "hello world!"; ByteArrayOutputStream bOut = new ByteArrayOutputStream(); ByteArrayInputStream testIn = new ByteArrayInputStream(data.getBytes()); - PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.DSA, digest).setProvider("BC")); + PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.DSA, digest).setProvider("SC")); - sGen.init(PGPSignature.BINARY_DOCUMENT, secRing.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build("test".toCharArray()))); + sGen.init(PGPSignature.BINARY_DOCUMENT, secRing.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build("test".toCharArray()))); BCPGOutputStream bcOut = new BCPGOutputStream(bOut); @@ -190,7 +190,7 @@ public class DSA2Test InputStream dIn = p2.getInputStream(); - ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pubRing.getPublicKey()); + ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pubRing.getPublicKey()); while ((ch = dIn.read()) >= 0) { @@ -225,7 +225,7 @@ public class DSA2Test InputStream dIn = p2.getInputStream(); - ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), publicKey.getPublicKey()); + ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), publicKey.getPublicKey()); int ch; while ((ch = dIn.read()) >= 0) diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPArmoredTest.java b/pg/src/test/java/org/spongycastle/openpgp/test/PGPArmoredTest.java index bdab418e..e6647026 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPArmoredTest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/PGPArmoredTest.java @@ -1,16 +1,16 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import org.bouncycastle.bcpg.ArmoredInputStream; -import org.bouncycastle.bcpg.ArmoredOutputStream; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.Strings; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.Hex; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.bcpg.ArmoredInputStream; +import org.spongycastle.bcpg.ArmoredOutputStream; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.Strings; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.test.SimpleTest; public class PGPArmoredTest extends SimpleTest diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPClearSignedSignatureTest.java b/pg/src/test/java/org/spongycastle/openpgp/test/PGPClearSignedSignatureTest.java index f7b26a27..6b3f019e 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPClearSignedSignatureTest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/PGPClearSignedSignatureTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -8,28 +8,28 @@ import java.io.OutputStream; import java.security.SignatureException; import java.util.Iterator; -import org.bouncycastle.bcpg.ArmoredInputStream; -import org.bouncycastle.bcpg.ArmoredOutputStream; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.bcpg.ArmoredInputStream; +import org.spongycastle.bcpg.ArmoredOutputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKeyRingCollection; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSecretKeyRingCollection; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; public class PGPClearSignedSignatureTest extends SimpleTest @@ -220,7 +220,7 @@ public class PGPClearSignedSignatureTest PGPSignatureList p3 = (PGPSignatureList)pgpFact.nextObject(); PGPSignature sig = p3.get(0); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pgpRings.getPublicKey(sig.getKeyID())); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pgpRings.getPublicKey(sig.getKeyID())); ByteArrayOutputStream lineOut = new ByteArrayOutputStream(); InputStream sigIn = new ByteArrayInputStream(bOut.toByteArray()); @@ -291,8 +291,8 @@ public class PGPClearSignedSignatureTest throws Exception { PGPSecretKey pgpSecKey = readSecretKey(new ByteArrayInputStream(secretKey)); - PGPPrivateKey pgpPrivKey = pgpSecKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build("".toCharArray())); - PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(pgpSecKey.getPublicKey().getAlgorithm(), PGPUtil.SHA256).setProvider("BC")); + PGPPrivateKey pgpPrivKey = pgpSecKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build("".toCharArray())); + PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(pgpSecKey.getPublicKey().getAlgorithm(), PGPUtil.SHA256).setProvider("SC")); PGPSignatureSubpacketGenerator spGen = new PGPSignatureSubpacketGenerator(); sGen.init(PGPSignature.CANONICAL_TEXT_DOCUMENT, pgpPrivKey); diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPCompressionTest.java b/pg/src/test/java/org/spongycastle/openpgp/test/PGPCompressionTest.java index 6d64efb5..a9a600f1 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPCompressionTest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/PGPCompressionTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -6,13 +6,13 @@ import java.io.InputStream; import java.io.OutputStream; import java.security.Security; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPCompressedDataGenerator; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPCompressedDataGenerator; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class PGPCompressionTest extends SimpleTest diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPDSAElGamalTest.java b/pg/src/test/java/org/spongycastle/openpgp/test/PGPDSAElGamalTest.java index 3287def2..32a2806b 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPDSAElGamalTest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/PGPDSAElGamalTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -18,44 +18,44 @@ import java.util.Iterator; import javax.crypto.Cipher; import javax.crypto.spec.DHParameterSpec; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.jce.spec.ElGamalParameterSpec; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPCompressedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPOnePassSignature; -import org.bouncycastle.openpgp.PGPOnePassSignatureList; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyConverter; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.jce.spec.ElGamalParameterSpec; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPCompressedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPOnePassSignature; +import org.spongycastle.openpgp.PGPOnePassSignatureList; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyEncryptedData; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyConverter; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class PGPDSAElGamalTest extends SimpleTest @@ -144,7 +144,7 @@ public class PGPDSAElGamalTest { PGPPublicKey pubKey = null; - PGPUtil.setDefaultProvider("BC"); + PGPUtil.setDefaultProvider("SC"); // // Read the public key @@ -164,7 +164,7 @@ public class PGPDSAElGamalTest // Read the private key // PGPSecretKeyRing sKey = new PGPSecretKeyRing(testPrivKeyRing, new JcaKeyFingerprintCalculator()); - PGPPrivateKey pgpPrivKey = sKey.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(pass)); + PGPPrivateKey pgpPrivKey = sKey.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(pass)); // // signature generation @@ -172,7 +172,7 @@ public class PGPDSAElGamalTest String data = "hello world!"; ByteArrayOutputStream bOut = new ByteArrayOutputStream(); ByteArrayInputStream testIn = new ByteArrayInputStream(data.getBytes()); - PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, PGPUtil.SHA1).setProvider("BC")); + PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, PGPUtil.SHA1).setProvider("SC")); sGen.init(PGPSignature.BINARY_DOCUMENT, pgpPrivKey); @@ -228,7 +228,7 @@ public class PGPDSAElGamalTest InputStream dIn = p2.getInputStream(); - ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pubKey); + ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pubKey); while ((ch = dIn.read()) >= 0) { @@ -260,7 +260,7 @@ public class PGPDSAElGamalTest if (pgpKey.getAlgorithm() == PGPPublicKey.ELGAMAL_ENCRYPT || pgpKey.getAlgorithm() == PGPPublicKey.ELGAMAL_GENERAL) { - pKey = new JcaPGPKeyConverter().setProvider("BC").getPublicKey(pgpKey); + pKey = new JcaPGPKeyConverter().setProvider("SC").getPublicKey(pgpKey); pgpKeyID = pgpKey.getKeyID(); if (pgpKey.getBitStrength() != 1024) { @@ -274,7 +274,7 @@ public class PGPDSAElGamalTest } } - Cipher c = Cipher.getInstance("ElGamal/None/PKCS1Padding", "BC"); + Cipher c = Cipher.getInstance("ElGamal/None/PKCS1Padding", "SC"); c.init(Cipher.ENCRYPT_MODE, pKey); @@ -282,9 +282,9 @@ public class PGPDSAElGamalTest byte[] out = c.doFinal(in); - pgpPrivKey = sKey.getSecretKey(pgpKeyID).extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(pass)); + pgpPrivKey = sKey.getSecretKey(pgpKeyID).extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(pass)); - c.init(Cipher.DECRYPT_MODE, new JcaPGPKeyConverter().setProvider("BC").getPrivateKey(pgpPrivKey)); + c.init(Cipher.DECRYPT_MODE, new JcaPGPKeyConverter().setProvider("SC").getPrivateKey(pgpPrivKey)); out = c.doFinal(out); @@ -304,7 +304,7 @@ public class PGPDSAElGamalTest PGPPublicKeyEncryptedData encP = (PGPPublicKeyEncryptedData)encList.get(0); - InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(pgpPrivKey)); + InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(pgpPrivKey)); pgpFact = new JcaPGPObjectFactory(clear); @@ -342,7 +342,7 @@ public class PGPDSAElGamalTest encP = (PGPPublicKeyEncryptedData)encList.get(0); - clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(pgpPrivKey)); + clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(pgpPrivKey)); pgpFact = new JcaPGPObjectFactory(clear); @@ -368,7 +368,7 @@ public class PGPDSAElGamalTest // // note: we use the DSA public key here. // - ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pgpPub.getPublicKey()); + ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pgpPub.getPublicKey()); while ((ch = inLd.read()) >= 0) { @@ -392,10 +392,10 @@ public class PGPDSAElGamalTest // encrypt // ByteArrayOutputStream cbOut = new ByteArrayOutputStream(); - PGPEncryptedDataGenerator cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.TRIPLE_DES).setSecureRandom(new SecureRandom()).setProvider("BC")); + PGPEncryptedDataGenerator cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.TRIPLE_DES).setSecureRandom(new SecureRandom()).setProvider("SC")); PGPPublicKey puK = sKey.getSecretKey(pgpKeyID).getPublicKey(); - cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(puK).setProvider("BC")); + cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(puK).setProvider("SC")); OutputStream cOut = cPk.open(new UncloseableOutputStream(cbOut), bOut.toByteArray().length); @@ -409,9 +409,9 @@ public class PGPDSAElGamalTest encP = (PGPPublicKeyEncryptedData)encList.get(0); - pgpPrivKey = sKey.getSecretKey(pgpKeyID).extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(pass)); + pgpPrivKey = sKey.getSecretKey(pgpKeyID).extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(pass)); - clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(pgpPrivKey)); + clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(pgpPrivKey)); bOut.reset(); @@ -433,7 +433,7 @@ public class PGPDSAElGamalTest BigInteger g = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16); BigInteger p = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16); - KeyPairGenerator kpg = KeyPairGenerator.getInstance("ElGamal", "BC"); + KeyPairGenerator kpg = KeyPairGenerator.getInstance("ElGamal", "SC"); ElGamalParameterSpec elParams = new ElGamalParameterSpec(p, g); @@ -454,12 +454,12 @@ public class PGPDSAElGamalTest for (int pSize = 257; pSize < 264; ++pSize) { // Generate some parameters of the given size - AlgorithmParameterGenerator a = AlgorithmParameterGenerator.getInstance("ElGamal", "BC"); + AlgorithmParameterGenerator a = AlgorithmParameterGenerator.getInstance("ElGamal", "SC"); a.init(pSize, new SecureRandom()); AlgorithmParameters params = a.generateParameters(); DHParameterSpec elP = (DHParameterSpec)params.getParameterSpec(DHParameterSpec.class); - KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ElGamal", "BC"); + KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ElGamal", "SC"); keyGen.initialize(elP); @@ -470,11 +470,11 @@ public class PGPDSAElGamalTest PGPKeyPair elGamalKeyPair = new JcaPGPKeyPair( PublicKeyAlgorithmTags.ELGAMAL_GENERAL, kp, new Date()); - cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).setSecureRandom(new SecureRandom()).setProvider("BC")); + cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).setSecureRandom(new SecureRandom()).setProvider("SC")); puK = elGamalKeyPair.getPublicKey(); - cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(puK).setProvider("BC")); + cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(puK).setProvider("SC")); cbOut = new ByteArrayOutputStream(); @@ -493,7 +493,7 @@ public class PGPDSAElGamalTest pgpPrivKey = elGamalKeyPair.getPrivateKey(); // Note: This is where an exception would be expected if the P size causes problems - clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(pgpPrivKey)); + clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(pgpPrivKey)); ByteArrayOutputStream dec = new ByteArrayOutputStream(); @@ -526,7 +526,7 @@ public class PGPDSAElGamalTest PGPPublicKey k = (PGPPublicKey)objF.nextObject(); - pKey = new JcaPGPKeyConverter().setProvider("BC").getPublicKey(k); + pKey = new JcaPGPKeyConverter().setProvider("SC").getPublicKey(k); pgpKeyID = k.getKeyID(); if (k.getBitStrength() != 1024) { diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPDSATest.java b/pg/src/test/java/org/spongycastle/openpgp/test/PGPDSATest.java index b6ef5d7b..53f1c58b 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPDSATest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/PGPDSATest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -12,38 +12,38 @@ import java.security.Security; import java.util.Date; import java.util.Iterator; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPCompressedDataGenerator; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPOnePassSignature; -import org.bouncycastle.openpgp.PGPOnePassSignatureList; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator; -import org.bouncycastle.openpgp.PGPUserAttributeSubpacketVector; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyConverter; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPCompressedDataGenerator; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPOnePassSignature; +import org.spongycastle.openpgp.PGPOnePassSignatureList; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator; +import org.spongycastle.openpgp.PGPUserAttributeSubpacketVector; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyConverter; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class PGPDSATest extends SimpleTest @@ -315,7 +315,7 @@ public class PGPDSATest String data = "hello world!"; ByteArrayOutputStream bOut = new ByteArrayOutputStream(); ByteArrayInputStream testIn = new ByteArrayInputStream(data.getBytes()); - PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.DSA, HashAlgorithmTags.SHA1).setProvider("BC")); + PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.DSA, HashAlgorithmTags.SHA1).setProvider("SC")); sGen.init(PGPSignature.BINARY_DOCUMENT, pgpPrivKey); @@ -376,7 +376,7 @@ public class PGPDSATest InputStream dIn = p2.getInputStream(); - ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pgpPubKey); + ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pgpPubKey); while ((ch = dIn.read()) >= 0) { @@ -395,11 +395,11 @@ public class PGPDSATest throws Exception { String file = null; - KeyFactory fact = KeyFactory.getInstance("DSA", "BC"); + KeyFactory fact = KeyFactory.getInstance("DSA", "SC"); PGPPublicKey pubKey = null; PrivateKey privKey = null; - PGPUtil.setDefaultProvider("BC"); + PGPUtil.setDefaultProvider("SC"); // // Read the public key @@ -412,7 +412,7 @@ public class PGPDSATest // Read the private key // PGPSecretKeyRing sKey = new PGPSecretKeyRing(testPrivKey, new JcaKeyFingerprintCalculator()); - PGPPrivateKey pgpPrivKey = sKey.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(pass)); + PGPPrivateKey pgpPrivKey = sKey.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(pass)); // // test signature message @@ -432,7 +432,7 @@ public class PGPDSATest InputStream dIn = p2.getInputStream(); int ch; - ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pubKey); + ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pubKey); while ((ch = dIn.read()) >= 0) { @@ -457,7 +457,7 @@ public class PGPDSATest String data = "hello world!"; ByteArrayOutputStream bOut = new ByteArrayOutputStream(); ByteArrayInputStream testIn = new ByteArrayInputStream(data.getBytes()); - PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, PGPUtil.SHA1).setProvider("BC")); + PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, PGPUtil.SHA1).setProvider("SC")); sGen.init(PGPSignature.CANONICAL_TEXT_DOCUMENT, pgpPrivKey); @@ -511,7 +511,7 @@ public class PGPDSATest dIn = p2.getInputStream(); - ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pubKey); + ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pubKey); while ((ch = dIn.read()) >= 0) { @@ -584,30 +584,30 @@ public class PGPDSATest char [] passPhrase = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' }; sKey = new PGPSecretKeyRing(testPrivKey2, new JcaKeyFingerprintCalculator()); - pgpPrivKey = sKey.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(passPhrase)); + pgpPrivKey = sKey.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(passPhrase)); - byte[] bytes = new JcaPGPKeyConverter().setProvider("BC").getPrivateKey(pgpPrivKey).getEncoded(); + byte[] bytes = new JcaPGPKeyConverter().setProvider("SC").getPrivateKey(pgpPrivKey).getEncoded(); // // reading test - aes256 encrypted passphrase. // sKey = new PGPSecretKeyRing(aesSecretKey, new JcaKeyFingerprintCalculator()); - pgpPrivKey = sKey.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(pass)); + pgpPrivKey = sKey.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(pass)); - bytes = new JcaPGPKeyConverter().setProvider("BC").getPrivateKey(pgpPrivKey).getEncoded(); + bytes = new JcaPGPKeyConverter().setProvider("SC").getPrivateKey(pgpPrivKey).getEncoded(); // // reading test - twofish encrypted passphrase. // sKey = new PGPSecretKeyRing(twofishSecretKey, new JcaKeyFingerprintCalculator()); - pgpPrivKey = sKey.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(pass)); + pgpPrivKey = sKey.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(pass)); - bytes = new JcaPGPKeyConverter().setProvider("BC").getPrivateKey(pgpPrivKey).getEncoded(); + bytes = new JcaPGPKeyConverter().setProvider("SC").getPrivateKey(pgpPrivKey).getEncoded(); // // use of PGPKeyPair // - KeyPairGenerator kpg = KeyPairGenerator.getInstance("DSA", "BC"); + KeyPairGenerator kpg = KeyPairGenerator.getInstance("DSA", "SC"); kpg.initialize(512); diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPECDHTest.java b/pg/src/test/java/org/spongycastle/openpgp/test/PGPECDHTest.java index 77fc1e36..1526e825 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPECDHTest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/PGPECDHTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayOutputStream; import java.io.InputStream; @@ -12,52 +12,52 @@ import java.security.spec.ECGenParameterSpec; import java.util.Date; import java.util.Iterator; -import org.bouncycastle.asn1.nist.NISTNamedCurves; -import org.bouncycastle.asn1.x9.X9ECParameters; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.crypto.AsymmetricCipherKeyPair; -import org.bouncycastle.crypto.generators.ECKeyPairGenerator; -import org.bouncycastle.crypto.params.ECKeyGenerationParameters; -import org.bouncycastle.crypto.params.ECNamedDomainParameters; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPKeyRingGenerator; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPKeyPair; -import org.bouncycastle.openpgp.operator.bc.BcPublicKeyDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.bc.BcPublicKeyKeyEncryptionMethodGenerator; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.asn1.nist.NISTNamedCurves; +import org.spongycastle.asn1.x9.X9ECParameters; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.crypto.AsymmetricCipherKeyPair; +import org.spongycastle.crypto.generators.ECKeyPairGenerator; +import org.spongycastle.crypto.params.ECKeyGenerationParameters; +import org.spongycastle.crypto.params.ECNamedDomainParameters; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPEncryptedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPKeyRingGenerator; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyEncryptedData; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPKeyPair; +import org.spongycastle.openpgp.operator.bc.BcPublicKeyDataDecryptorFactory; +import org.spongycastle.openpgp.operator.bc.BcPublicKeyKeyEncryptionMethodGenerator; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class PGPECDHTest extends SimpleTest @@ -100,7 +100,7 @@ public class PGPECDHTest // // Generate a master key // - KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDSA", "BC"); + KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDSA", "SC"); keyGen.initialize(new ECGenParameterSpec("P-256")); @@ -111,7 +111,7 @@ public class PGPECDHTest // // Generate an encryption key // - keyGen = KeyPairGenerator.getInstance("ECDH", "BC"); + keyGen = KeyPairGenerator.getInstance("ECDH", "SC"); keyGen.initialize(new ECGenParameterSpec("P-256")); @@ -127,7 +127,7 @@ public class PGPECDHTest PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, ecdsaKeyPair, "test@bouncycastle.org", sha1Calc, null, null, new JcaPGPContentSignerBuilder(ecdsaKeyPair.getPublicKey().getAlgorithm(), HashAlgorithmTags.SHA1), - new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256, sha1Calc).setProvider("BC").build(passPhrase)); + new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256, sha1Calc).setProvider("SC").build(passPhrase)); keyRingGen.addSubKey(ecdhKeyPair); @@ -154,7 +154,7 @@ public class PGPECDHTest fail("secret key ring encoding failed"); } - PGPPrivateKey pgpPrivKey = secRing.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(passPhrase)); + PGPPrivateKey pgpPrivKey = secRing.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(passPhrase)); } private void testDecrypt(PGPSecretKeyRing secretKeyRing) @@ -170,7 +170,7 @@ public class PGPECDHTest // PGPPrivateKey pgpPrivKey = secretKey.extractPrivateKey(new JcePBESecretKeyEncryptorBuilder()); -// clear = encP.getDataStream(pgpPrivKey, "BC"); +// clear = encP.getDataStream(pgpPrivKey, "SC"); // // bOut.reset(); // @@ -193,7 +193,7 @@ public class PGPECDHTest byte[] text = { (byte)'h', (byte)'e', (byte)'l', (byte)'l', (byte)'o', (byte)' ', (byte)'w', (byte)'o', (byte)'r', (byte)'l', (byte)'d', (byte)'!', (byte)'\n' }; - KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDH", "BC"); + KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDH", "SC"); keyGen.initialize(new ECGenParameterSpec("P-256")); @@ -213,9 +213,9 @@ public class PGPECDHTest ByteArrayOutputStream cbOut = new ByteArrayOutputStream(); - PGPEncryptedDataGenerator cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).setProvider("BC").setSecureRandom(new SecureRandom())); + PGPEncryptedDataGenerator cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).setProvider("SC").setSecureRandom(new SecureRandom())); - cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(ecdhKeyPair.getPublicKey()).setProvider("BC")); + cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(ecdhKeyPair.getPublicKey()).setProvider("SC")); OutputStream cOut = cPk.open(new UncloseableOutputStream(cbOut), data.length); @@ -229,7 +229,7 @@ public class PGPECDHTest PGPPublicKeyEncryptedData encP = (PGPPublicKeyEncryptedData)encList.get(0); - InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(ecdhKeyPair.getPrivateKey())); + InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(ecdhKeyPair.getPrivateKey())); pgpF = new JcaPGPObjectFactory(clear); @@ -321,7 +321,7 @@ public class PGPECDHTest public void performTest() throws Exception { - PGPUtil.setDefaultProvider("BC"); + PGPUtil.setDefaultProvider("SC"); // // Read the public key @@ -368,7 +368,7 @@ public class PGPECDHTest { PGPSignature certification = (PGPSignature)sigIt.next(); - certification.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pubKeyRing.getPublicKey()); + certification.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pubKeyRing.getPublicKey()); if (!certification.verifyCertification((String)pubKeyRing.getPublicKey().getUserIDs().next(), pubKeyRing.getPublicKey())) { diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPECDSATest.java b/pg/src/test/java/org/spongycastle/openpgp/test/PGPECDSATest.java index e59c9760..b7a6bcc3 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPECDSATest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/PGPECDSATest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.security.KeyPair; @@ -9,43 +9,43 @@ import java.security.spec.ECGenParameterSpec; import java.util.Date; import java.util.Iterator; -import org.bouncycastle.asn1.nist.NISTNamedCurves; -import org.bouncycastle.asn1.x9.X9ECParameters; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.crypto.AsymmetricCipherKeyPair; -import org.bouncycastle.crypto.generators.ECKeyPairGenerator; -import org.bouncycastle.crypto.params.ECKeyGenerationParameters; -import org.bouncycastle.crypto.params.ECNamedDomainParameters; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPKeyRingGenerator; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; -import org.bouncycastle.openpgp.operator.bc.BcPGPKeyPair; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair; -import org.bouncycastle.openpgp.operator.jcajce.JcePBEProtectionRemoverFactory; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.asn1.nist.NISTNamedCurves; +import org.spongycastle.asn1.x9.X9ECParameters; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.crypto.AsymmetricCipherKeyPair; +import org.spongycastle.crypto.generators.ECKeyPairGenerator; +import org.spongycastle.crypto.params.ECKeyGenerationParameters; +import org.spongycastle.crypto.params.ECNamedDomainParameters; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPKeyRingGenerator; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; +import org.spongycastle.openpgp.operator.bc.BcPGPKeyPair; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair; +import org.spongycastle.openpgp.operator.jcajce.JcePBEProtectionRemoverFactory; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; public class PGPECDSATest extends SimpleTest @@ -86,7 +86,7 @@ public class PGPECDSATest private void generateAndSign() throws Exception { - KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDSA", "BC"); + KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDSA", "SC"); keyGen.initialize(new ECGenParameterSpec("P-256")); @@ -97,7 +97,7 @@ public class PGPECDSATest // // try a signature // - PGPSignatureGenerator signGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.ECDSA, HashAlgorithmTags.SHA256).setProvider("BC")); + PGPSignatureGenerator signGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.ECDSA, HashAlgorithmTags.SHA256).setProvider("SC")); signGen.init(PGPSignature.BINARY_DOCUMENT, ecdsaKeyPair.getPrivateKey()); @@ -105,7 +105,7 @@ public class PGPECDSATest PGPSignature sig = signGen.generate(); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), ecdsaKeyPair.getPublicKey()); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), ecdsaKeyPair.getPublicKey()); sig.update("hello world!".getBytes()); @@ -120,7 +120,7 @@ public class PGPECDSATest char[] passPhrase = "test".toCharArray(); PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, ecdsaKeyPair, - "test@bouncycastle.org", sha1Calc, null, null, new JcaPGPContentSignerBuilder(ecdsaKeyPair.getPublicKey().getAlgorithm(), HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256, sha1Calc).setProvider("BC").build(passPhrase)); + "test@bouncycastle.org", sha1Calc, null, null, new JcaPGPContentSignerBuilder(ecdsaKeyPair.getPublicKey().getAlgorithm(), HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256, sha1Calc).setProvider("SC").build(passPhrase)); PGPPublicKeyRing pubRing = keyRingGen.generatePublicKeyRing(); @@ -146,15 +146,15 @@ public class PGPECDSATest // // try a signature using encoded key // - signGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.ECDSA, HashAlgorithmTags.SHA256).setProvider("BC")); + signGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.ECDSA, HashAlgorithmTags.SHA256).setProvider("SC")); - signGen.init(PGPSignature.BINARY_DOCUMENT, secRing.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(passPhrase))); + signGen.init(PGPSignature.BINARY_DOCUMENT, secRing.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(passPhrase))); signGen.update("hello world!".getBytes()); sig = signGen.generate(); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), secRing.getSecretKey().getPublicKey()); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), secRing.getSecretKey().getPublicKey()); sig.update("hello world!".getBytes()); @@ -202,7 +202,7 @@ public class PGPECDSATest char[] passPhrase = "test".toCharArray(); PGPDigestCalculator sha1Calc = new BcPGPDigestCalculatorProvider().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, ecdsaKeyPair, - "test@bouncycastle.org", sha1Calc, null, null, new BcPGPContentSignerBuilder(ecdsaKeyPair.getPublicKey().getAlgorithm(), HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256, sha1Calc).setProvider("BC").build(passPhrase)); + "test@bouncycastle.org", sha1Calc, null, null, new BcPGPContentSignerBuilder(ecdsaKeyPair.getPublicKey().getAlgorithm(), HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256, sha1Calc).setProvider("SC").build(passPhrase)); PGPPublicKeyRing pubRing = keyRingGen.generatePublicKeyRing(); @@ -249,7 +249,7 @@ public class PGPECDSATest public void performTest() throws Exception { - PGPUtil.setDefaultProvider("BC"); + PGPUtil.setDefaultProvider("SC"); // // Read the public key @@ -260,7 +260,7 @@ public class PGPECDSATest { PGPSignature certification = (PGPSignature)it.next(); - certification.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pubKeyRing.getPublicKey()); + certification.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pubKeyRing.getPublicKey()); if (!certification.verifyCertification((String)pubKeyRing.getPublicKey().getUserIDs().next(), pubKeyRing.getPublicKey())) { @@ -281,7 +281,7 @@ public class PGPECDSATest // PGPSecretKey key = PGPSecretKey.parseSecretKeyFromSExpr(new ByteArrayInputStream(sExprKey), new JcePBEProtectionRemoverFactory("test".toCharArray()), new JcaKeyFingerprintCalculator()); - PGPSignatureGenerator signGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.ECDSA, HashAlgorithmTags.SHA256).setProvider("BC")); + PGPSignatureGenerator signGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.ECDSA, HashAlgorithmTags.SHA256).setProvider("SC")); signGen.init(PGPSignature.BINARY_DOCUMENT, key.extractPrivateKey(null)); @@ -289,7 +289,7 @@ public class PGPECDSATest PGPSignature sig = signGen.generate(); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), key.getPublicKey()); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), key.getPublicKey()); sig.update("hello world!".getBytes()); diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPECMessageTest.java b/pg/src/test/java/org/spongycastle/openpgp/test/PGPECMessageTest.java index 7183b91f..a3112227 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPECMessageTest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/PGPECMessageTest.java @@ -1,34 +1,34 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.security.Security; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPObjectFactory; -import org.bouncycastle.openpgp.PGPOnePassSignature; -import org.bouncycastle.openpgp.PGPOnePassSignatureList; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.jcajce.JcaPGPPublicKeyRing; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.bc.BcPublicKeyDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcePBEProtectionRemoverFactory; -import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPObjectFactory; +import org.spongycastle.openpgp.PGPOnePassSignature; +import org.spongycastle.openpgp.PGPOnePassSignatureList; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyEncryptedData; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.jcajce.JcaPGPPublicKeyRing; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.bc.BcPublicKeyDataDecryptorFactory; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcePBEProtectionRemoverFactory; +import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; public class PGPECMessageTest extends SimpleTest @@ -89,7 +89,7 @@ public class PGPECMessageTest { PGPSecretKey key = PGPSecretKey.parseSecretKeyFromSExpr(new ByteArrayInputStream(sExprKeyMaster), new JcePBEProtectionRemoverFactory("test".toCharArray()), new JcaKeyFingerprintCalculator()); - PGPSignatureGenerator signGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.ECDSA, HashAlgorithmTags.SHA256).setProvider("BC")); + PGPSignatureGenerator signGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.ECDSA, HashAlgorithmTags.SHA256).setProvider("SC")); signGen.init(PGPSignature.BINARY_DOCUMENT, key.extractPrivateKey(null)); @@ -99,7 +99,7 @@ public class PGPECMessageTest PGPPublicKey publicKey = new JcaPGPPublicKeyRing(testPubKey).getPublicKey(); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), publicKey); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), publicKey); sig.update("hello world!".getBytes()); @@ -122,7 +122,7 @@ public class PGPECMessageTest PGPSecretKey secretKey = PGPSecretKey.parseSecretKeyFromSExpr(new ByteArrayInputStream(sExprKeySub), new JcePBEProtectionRemoverFactory("test".toCharArray()), publicKey); - InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(secretKey.extractPrivateKey(null))); + InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(secretKey.extractPrivateKey(null))); PGPObjectFactory plainFact = new PGPObjectFactory(clear, new BcKeyFingerprintCalculator()); @@ -153,7 +153,7 @@ public class PGPECMessageTest PGPSecretKey secretKey = PGPSecretKey.parseSecretKeyFromSExpr(new ByteArrayInputStream(sExprKeySub), new JcePBEProtectionRemoverFactory("test".toCharArray()), publicKey); - InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(secretKey.extractPrivateKey(null))); + InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(secretKey.extractPrivateKey(null))); PGPObjectFactory plainFact = new PGPObjectFactory(clear, new BcKeyFingerprintCalculator()); @@ -175,7 +175,7 @@ public class PGPECMessageTest InputStream dIn = lData .getInputStream(); int ch; - ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), publicKeyRing.getPublicKey(ops.getKeyID())); + ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), publicKeyRing.getPublicKey(ops.getKeyID())); while ((ch = dIn.read()) >= 0) { @@ -234,7 +234,7 @@ public class PGPECMessageTest PGPSecretKey secretKey = PGPSecretKey.parseSecretKeyFromSExpr(new ByteArrayInputStream(sExprKeySub), new JcePBEProtectionRemoverFactory("test".toCharArray()), publicKey); - InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(secretKey.extractPrivateKey(null))); + InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(secretKey.extractPrivateKey(null))); PGPObjectFactory plainFact = new PGPObjectFactory(clear, new BcKeyFingerprintCalculator()); @@ -256,7 +256,7 @@ public class PGPECMessageTest InputStream dIn = lData .getInputStream(); int ch; - ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), publicKeyRing.getPublicKey(ops.getKeyID())); + ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), publicKeyRing.getPublicKey(ops.getKeyID())); while ((ch = dIn.read()) >= 0) { diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPKeyRingTest.java b/pg/src/test/java/org/spongycastle/openpgp/test/PGPKeyRingTest.java index d692df7d..442ceedd 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPKeyRingTest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/PGPKeyRingTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.math.BigInteger; @@ -10,38 +10,38 @@ import java.util.Iterator; import javax.crypto.Cipher; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.jce.spec.ElGamalParameterSpec; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPKeyRingGenerator; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.jcajce.JcaPGPPublicKeyRing; -import org.bouncycastle.openpgp.jcajce.JcaPGPPublicKeyRingCollection; -import org.bouncycastle.openpgp.jcajce.JcaPGPSecretKeyRingCollection; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.openpgp.operator.PGPDigestCalculatorProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyConverter; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPPrivateKey; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.Hex; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.jce.spec.ElGamalParameterSpec; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPKeyRingGenerator; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.jcajce.JcaPGPPublicKeyRing; +import org.spongycastle.openpgp.jcajce.JcaPGPPublicKeyRingCollection; +import org.spongycastle.openpgp.jcajce.JcaPGPSecretKeyRingCollection; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.openpgp.operator.PGPDigestCalculatorProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyConverter; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPPrivateKey; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.test.SimpleTest; public class PGPKeyRingTest extends SimpleTest @@ -1515,12 +1515,12 @@ public class PGPKeyRingTest if (k.getKeyID() == -4049084404703773049L || k.getKeyID() == -1413891222336124627L) { - k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(sec2pass1)); + k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(sec2pass1)); } else if (k.getKeyID() == -6498553574938125416L || k.getKeyID() == 59034765524361024L) { - k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(sec2pass2)); + k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(sec2pass2)); } } @@ -1610,7 +1610,7 @@ public class PGPKeyRingTest PGPSecretKey k = (PGPSecretKey)it.next(); - k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(sec3pass1)); + k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(sec3pass1)); } if (keyCount != 2) @@ -1656,7 +1656,7 @@ public class PGPKeyRingTest PGPSecretKey k = (PGPSecretKey)it.next(); - k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(sec3pass1)); + k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(sec3pass1)); } if (keyCount != 2) @@ -1762,7 +1762,7 @@ public class PGPKeyRingTest PGPSecretKey k = (PGPSecretKey)it.next(); - k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(sec5pass1)); + k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(sec5pass1)); } if (keyCount != 2) @@ -1781,7 +1781,7 @@ public class PGPKeyRingTest { try { - Cipher.getInstance("IDEA", "BC"); + Cipher.getInstance("IDEA", "SC"); return false; } @@ -1859,7 +1859,7 @@ public class PGPKeyRingTest fail("wrong number of revocations in test7."); } - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), masterKey); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), masterKey); if (!sig.verifyCertification(masterKey)) { @@ -1900,7 +1900,7 @@ public class PGPKeyRingTest fail("wrong signature found"); } - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), masterKey); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), masterKey); if (!sig.verifyCertification(masterKey, k)) { @@ -1981,7 +1981,7 @@ public class PGPKeyRingTest PGPSecretKey k = (PGPSecretKey)it.next(); - k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(sec8pass)); + k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(sec8pass)); } if (keyCount != 2) @@ -2027,7 +2027,7 @@ public class PGPKeyRingTest PGPSecretKey k = (PGPSecretKey)it.next(); - PGPPrivateKey pKey = k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(sec9pass)); + PGPPrivateKey pKey = k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(sec9pass)); if (keyCount == 1 && pKey != null) { fail("primary secret key found, null expected"); @@ -2090,7 +2090,7 @@ public class PGPKeyRingTest throws Exception { char[] passPhrase = "hello".toCharArray(); - KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", "BC"); + KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", "SC"); dsaKpg.initialize(512); @@ -2100,7 +2100,7 @@ public class PGPKeyRingTest // KeyPair dsaKp = dsaKpg.generateKeyPair(); - KeyPairGenerator elgKpg = KeyPairGenerator.getInstance("ELGAMAL", "BC"); + KeyPairGenerator elgKpg = KeyPairGenerator.getInstance("ELGAMAL", "SC"); BigInteger g = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16); BigInteger p = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16); @@ -2116,14 +2116,14 @@ public class PGPKeyRingTest PGPKeyPair elgKeyPair = new JcaPGPKeyPair(PGPPublicKey.ELGAMAL_ENCRYPT, elgKp, new Date()); PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, dsaKeyPair, - "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); keyRingGen.addSubKey(elgKeyPair); PGPSecretKeyRing keyRing = keyRingGen.generateSecretKeyRing(); - keyRing.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(passPhrase)); + keyRing.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(passPhrase)); PGPPublicKeyRing pubRing = keyRingGen.generatePublicKeyRing(); @@ -2152,7 +2152,7 @@ public class PGPKeyRingTest if (sig.getKeyID() == vKey.getKeyID() && sig.getSignatureType() == PGPSignature.SUBKEY_BINDING) { - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), vKey); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), vKey); if (!sig.verifyCertification(vKey, sKey)) { @@ -2166,7 +2166,7 @@ public class PGPKeyRingTest throws Exception { char[] passPhrase = "hello".toCharArray(); - KeyPairGenerator rsaKpg = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator rsaKpg = KeyPairGenerator.getInstance("RSA", "SC"); rsaKpg.initialize(512); @@ -2179,11 +2179,11 @@ public class PGPKeyRingTest PGPKeyPair rsaKeyPair2 = new JcaPGPKeyPair(PGPPublicKey.RSA_GENERAL, rsaKp, new Date()); PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, rsaKeyPair1, - "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); PGPSecretKeyRing secRing1 = keyRingGen.generateSecretKeyRing(); PGPPublicKeyRing pubRing1 = keyRingGen.generatePublicKeyRing(); keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, rsaKeyPair2, - "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); PGPSecretKeyRing secRing2 = keyRingGen.generateSecretKeyRing(); PGPPublicKeyRing pubRing2 = keyRingGen.generatePublicKeyRing(); @@ -2218,7 +2218,7 @@ public class PGPKeyRingTest throws Exception { char[] passPhrase = "hello".toCharArray(); - KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", "BC"); + KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", "SC"); dsaKpg.initialize(512); @@ -2228,7 +2228,7 @@ public class PGPKeyRingTest // KeyPair dsaKp = dsaKpg.generateKeyPair(); - KeyPairGenerator elgKpg = KeyPairGenerator.getInstance("ELGAMAL", "BC"); + KeyPairGenerator elgKpg = KeyPairGenerator.getInstance("ELGAMAL", "SC"); BigInteger g = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16); BigInteger p = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16); @@ -2244,14 +2244,14 @@ public class PGPKeyRingTest PGPKeyPair elgKeyPair = new JcaPGPKeyPair(PGPPublicKey.ELGAMAL_ENCRYPT, elgKp, new Date()); PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, dsaKeyPair, - "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); keyRingGen.addSubKey(elgKeyPair); PGPSecretKeyRing keyRing = keyRingGen.generateSecretKeyRing(); - keyRing.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(passPhrase)); + keyRing.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(passPhrase)); if (!keyRing.getSecretKey().getPublicKey().equals(keyRing.getPublicKey())) { @@ -2296,7 +2296,7 @@ public class PGPKeyRingTest if (sig.getKeyID() == vKey.getKeyID() && sig.getSignatureType() == PGPSignature.SUBKEY_BINDING) { - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), vKey); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), vKey); if (!sig.verifyCertification(vKey, sKey)) { @@ -2348,7 +2348,7 @@ public class PGPKeyRingTest pgpPriv = PGPSecretKeyRing.removeSecretKey(pgpPriv, pgpKey); pgpKey = PGPSecretKey.copyWithNewPassword( pgpKey, - new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(rewrapPass), + new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(rewrapPass), null); pgpPriv = PGPSecretKeyRing.insertSecretKey(pgpPriv, pgpKey); @@ -2373,11 +2373,11 @@ public class PGPKeyRingTest pgpKey = PGPSecretKey.copyWithNewPassword( pgpKey, null, - new JcePBESecretKeyEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).setProvider("BC").build(newPass)); + new JcePBESecretKeyEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).setProvider("SC").build(newPass)); pgpPriv = PGPSecretKeyRing.insertSecretKey(pgpPriv, pgpKey); // this should succeed - PGPPrivateKey privTmp = pgpKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(newPass)); + PGPPrivateKey privTmp = pgpKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(newPass)); if (pgpKey.getKeyID() != oldKeyID) { @@ -2413,7 +2413,7 @@ public class PGPKeyRingTest pgpKey = PGPSecretKey.copyWithNewPassword( pgpKey, - new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(v3KeyPass), + new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(v3KeyPass), null); pgpPriv = PGPSecretKeyRing.insertSecretKey(pgpPriv, pgpKey); @@ -2438,11 +2438,11 @@ public class PGPKeyRingTest pgpKey = PGPSecretKey.copyWithNewPassword( pgpKey, null, - new JcePBESecretKeyEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5, new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build().get(HashAlgorithmTags.MD5)).setProvider("BC").build(newPass)); + new JcePBESecretKeyEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5, new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build().get(HashAlgorithmTags.MD5)).setProvider("SC").build(newPass)); pgpPriv = PGPSecretKeyRing.insertSecretKey(pgpPriv, pgpKey); // this should succeed - PGPPrivateKey privTmp = pgpKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(newPass)); + PGPPrivateKey privTmp = pgpKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(newPass)); if (pgpKey.getKeyID() != oldKeyID) { @@ -2468,7 +2468,7 @@ public class PGPKeyRingTest Iterator it = pgpPriv.getSecretKeys(); - PGPDigestCalculatorProvider calcProvider = new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build(); + PGPDigestCalculatorProvider calcProvider = new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build(); while (it.hasNext()) { @@ -2479,7 +2479,7 @@ public class PGPKeyRingTest pgpPriv = PGPSecretKeyRing.removeSecretKey(pgpPriv, pgpKey); pgpKey = PGPSecretKey.copyWithNewPassword( pgpKey, - new JcePBESecretKeyDecryptorBuilder(calcProvider).setProvider("BC").build(rewrapPass), + new JcePBESecretKeyDecryptorBuilder(calcProvider).setProvider("SC").build(rewrapPass), null); pgpPriv = PGPSecretKeyRing.insertSecretKey(pgpPriv, pgpKey); @@ -2504,11 +2504,11 @@ public class PGPKeyRingTest pgpKey = PGPSecretKey.copyWithNewPassword( pgpKey, null, - new JcePBESecretKeyEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5, calcProvider.get(HashAlgorithmTags.MD5)).setProvider("BC").build(newPass)); + new JcePBESecretKeyEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5, calcProvider.get(HashAlgorithmTags.MD5)).setProvider("SC").build(newPass)); pgpPriv = PGPSecretKeyRing.insertSecretKey(pgpPriv, pgpKey); // this should succeed - PGPPrivateKey privTmp = pgpKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(calcProvider).setProvider("BC").build(newPass)); + PGPPrivateKey privTmp = pgpKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(calcProvider).setProvider("SC").build(newPass)); if (pgpKey.getKeyID() != oldKeyID) { @@ -2550,7 +2550,7 @@ public class PGPKeyRingTest if (sig.getSignatureType() == PGPSignature.POSITIVE_CERTIFICATION) { - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pub); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pub); if (!sig.verifyCertification(userID, pub)) { @@ -2562,7 +2562,7 @@ public class PGPKeyRingTest // // this is quicker because we are using pregenerated parameters. // - KeyPairGenerator rsaKpg = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator rsaKpg = KeyPairGenerator.getInstance("RSA", "SC"); KeyPair rsaKp = rsaKpg.generateKeyPair(); PGPKeyPair rsaKeyPair1 = new JcaPGPKeyPair(PGPPublicKey.RSA_GENERAL, rsaKp, new Date()); rsaKp = rsaKpg.generateKeyPair(); @@ -2570,7 +2570,7 @@ public class PGPKeyRingTest char[] passPhrase = "passwd".toCharArray(); PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, rsaKeyPair1, - userID, sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + userID, sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); PGPPublicKeyRing pubRing1 = keyRingGen.generatePublicKeyRing(); @@ -2583,7 +2583,7 @@ public class PGPKeyRingTest if (sig.getSignatureType() == PGPSignature.POSITIVE_CERTIFICATION) { - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pub); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pub); if (!sig.verifyCertification(userID, pub)) { @@ -2676,7 +2676,7 @@ public class PGPKeyRingTest PGPSignature sig = (PGPSignature)it.next(); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pubKey); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pubKey); if (!sig.verifyCertification(rawID, pubKey)) { @@ -2687,7 +2687,7 @@ public class PGPKeyRingTest public void testNoExportPrivateKey() throws Exception { - KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSA", "SC"); kpGen.initialize(1024); @@ -2718,7 +2718,7 @@ public class PGPKeyRingTest { PGPSignature sig = (PGPSignature)it.next(); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pubKey); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pubKey); if (!sig.verifyCertification("test", pubKey)) { diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPMarkerTest.java b/pg/src/test/java/org/spongycastle/openpgp/test/PGPMarkerTest.java index 078efa8b..1f638f44 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPMarkerTest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/PGPMarkerTest.java @@ -1,12 +1,12 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPMarker; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTestResult; -import org.bouncycastle.util.test.Test; -import org.bouncycastle.util.test.TestResult; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPMarker; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTestResult; +import org.spongycastle.util.test.Test; +import org.spongycastle.util.test.TestResult; public class PGPMarkerTest implements Test diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPNoPrivateKeyTest.java b/pg/src/test/java/org/spongycastle/openpgp/test/PGPNoPrivateKeyTest.java index ed5f88f6..e4761fa4 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPNoPrivateKeyTest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/PGPNoPrivateKeyTest.java @@ -1,24 +1,24 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.security.Security; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; public class PGPNoPrivateKeyTest extends SimpleTest { String pgpOldPass = "test"; String pgpNewPass = "newtest"; - String BOUNCY_CASTLE_PROVIDER_NAME = "BC"; + String BOUNCY_CASTLE_PROVIDER_NAME = "SC"; byte[] pgpPrivateEmpty = Base64.decode( "lQCVBFGSNGwBBACwABZRIEW/4vDQajcO0FW39yNDcsHBDwPkGT95D7jiVTTRoSs6" diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPPBETest.java b/pg/src/test/java/org/spongycastle/openpgp/test/PGPPBETest.java index d76c09de..f35f4fca 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPPBETest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/PGPPBETest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayOutputStream; import java.io.InputStream; @@ -7,24 +7,24 @@ import java.security.SecureRandom; import java.security.Security; import java.util.Date; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPCompressedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPPBEEncryptedData; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePBEDataDecryptorFactoryBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePBEKeyEncryptionMethodGenerator; -import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.Hex; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPCompressedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPEncryptedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPPBEEncryptedData; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePBEDataDecryptorFactoryBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePBEKeyEncryptionMethodGenerator; +import org.spongycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class PGPPBETest extends SimpleTest @@ -70,7 +70,7 @@ public class PGPPBETest PGPEncryptedDataList enc = (PGPEncryptedDataList)pgpF.nextObject(); PGPPBEEncryptedData pbe = (PGPPBEEncryptedData)enc.get(0); - InputStream clear = pbe.getDataStream(new JcePBEDataDecryptorFactoryBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(pass)); + InputStream clear = pbe.getDataStream(new JcePBEDataDecryptorFactoryBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(pass)); JcaPGPObjectFactory pgpFact = new JcaPGPObjectFactory(clear); PGPCompressedData cData = (PGPCompressedData)pgpFact.nextObject(); @@ -115,7 +115,7 @@ public class PGPPBETest PGPEncryptedDataList enc = (PGPEncryptedDataList)pgpF.nextObject(); PGPPBEEncryptedData pbe = (PGPPBEEncryptedData)enc.get(0); - InputStream clear = pbe.getDataStream(new JcePBEDataDecryptorFactoryBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(pass)); + InputStream clear = pbe.getDataStream(new JcePBEDataDecryptorFactoryBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(pass)); JcaPGPObjectFactory pgpFact = new JcaPGPObjectFactory(clear); PGPCompressedData cData = (PGPCompressedData)pgpFact.nextObject(); @@ -195,9 +195,9 @@ public class PGPPBETest // encrypt - with stream close // ByteArrayOutputStream cbOut = new ByteArrayOutputStream(); - PGPEncryptedDataGenerator cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setSecureRandom(new SecureRandom()).setProvider("BC")); + PGPEncryptedDataGenerator cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setSecureRandom(new SecureRandom()).setProvider("SC")); - cPk.addMethod(new JcePBEKeyEncryptionMethodGenerator(pass).setProvider("BC")); + cPk.addMethod(new JcePBEKeyEncryptionMethodGenerator(pass).setProvider("SC")); OutputStream cOut = cPk.open(new UncloseableOutputStream(cbOut), bOut.toByteArray().length); @@ -216,9 +216,9 @@ public class PGPPBETest // encrypt - with generator close // cbOut = new ByteArrayOutputStream(); - cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setSecureRandom(new SecureRandom()).setProvider("BC")); + cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setSecureRandom(new SecureRandom()).setProvider("SC")); - cPk.addMethod(new JcePBEKeyEncryptionMethodGenerator(pass).setProvider("BC")); + cPk.addMethod(new JcePBEKeyEncryptionMethodGenerator(pass).setProvider("SC")); cOut = cPk.open(new UncloseableOutputStream(cbOut), bOut.toByteArray().length); @@ -260,9 +260,9 @@ public class PGPPBETest comOut.close(); cbOut = new ByteArrayOutputStream(); - cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setSecureRandom(rand).setProvider("BC")); + cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setSecureRandom(rand).setProvider("SC")); - cPk.addMethod(new JcePBEKeyEncryptionMethodGenerator(pass).setProvider("BC")); + cPk.addMethod(new JcePBEKeyEncryptionMethodGenerator(pass).setProvider("SC")); cOut = cPk.open(new UncloseableOutputStream(cbOut), new byte[16]); @@ -280,9 +280,9 @@ public class PGPPBETest // with integrity packet // cbOut = new ByteArrayOutputStream(); - cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setWithIntegrityPacket(true).setSecureRandom(rand).setProvider("BC")); + cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setWithIntegrityPacket(true).setSecureRandom(rand).setProvider("SC")); - cPk.addMethod(new JcePBEKeyEncryptionMethodGenerator(pass).setProvider("BC")); + cPk.addMethod(new JcePBEKeyEncryptionMethodGenerator(pass).setProvider("SC")); cOut = cPk.open(new UncloseableOutputStream(cbOut), new byte[16]); @@ -314,7 +314,7 @@ public class PGPPBETest PGPPBEEncryptedData pbe = (PGPPBEEncryptedData)enc.get(1); - InputStream clear = pbe.getDataStream(new JcePBEDataDecryptorFactoryBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build("password".toCharArray())); + InputStream clear = pbe.getDataStream(new JcePBEDataDecryptorFactoryBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build("password".toCharArray())); pgpFact = new JcaPGPObjectFactory(clear); @@ -359,9 +359,9 @@ public class PGPPBETest comOut.close(); cbOut = new ByteArrayOutputStream(); - cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setWithIntegrityPacket(true).setSecureRandom(rand).setProvider("BC")); + cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setWithIntegrityPacket(true).setSecureRandom(rand).setProvider("SC")); - cPk.addMethod(new JcePBEKeyEncryptionMethodGenerator(pass).setProvider("BC")); + cPk.addMethod(new JcePBEKeyEncryptionMethodGenerator(pass).setProvider("SC")); cOut = cPk.open(new UncloseableOutputStream(cbOut), new byte[16]); diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPPacketTest.java b/pg/src/test/java/org/spongycastle/openpgp/test/PGPPacketTest.java index c6d4a9bb..e7087942 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPPacketTest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/PGPPacketTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -8,12 +8,12 @@ import java.security.Security; import java.util.Date; import java.util.Random; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class PGPPacketTest extends SimpleTest diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPParsingTest.java b/pg/src/test/java/org/spongycastle/openpgp/test/PGPParsingTest.java index 4ef4d0b2..764321c8 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPParsingTest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/PGPParsingTest.java @@ -1,12 +1,12 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.security.Security; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPPublicKeyRingCollection; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.util.test.SimpleTest; public class PGPParsingTest extends SimpleTest diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPRSATest.java b/pg/src/test/java/org/spongycastle/openpgp/test/PGPRSATest.java index 99e4c7f5..ba5f88ba 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPRSATest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/PGPRSATest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -15,63 +15,63 @@ import java.util.Iterator; import javax.crypto.Cipher; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.CompressionAlgorithmTags; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.bcpg.attr.ImageAttribute; -import org.bouncycastle.bcpg.sig.Features; -import org.bouncycastle.bcpg.sig.KeyFlags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPCompressedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPKeyRingGenerator; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPOnePassSignature; -import org.bouncycastle.openpgp.PGPOnePassSignatureList; -import org.bouncycastle.openpgp.PGPPBEEncryptedData; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator; -import org.bouncycastle.openpgp.PGPSignatureSubpacketVector; -import org.bouncycastle.openpgp.PGPUserAttributeSubpacketVector; -import org.bouncycastle.openpgp.PGPUserAttributeSubpacketVectorGenerator; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.PGPV3SignatureGenerator; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.openpgp.operator.PublicKeyDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyConverter; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair; -import org.bouncycastle.openpgp.operator.jcajce.JcePBEDataDecryptorFactoryBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePBEKeyEncryptionMethodGenerator; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.Hex; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.CompressionAlgorithmTags; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.bcpg.attr.ImageAttribute; +import org.spongycastle.bcpg.sig.Features; +import org.spongycastle.bcpg.sig.KeyFlags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPCompressedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPEncryptedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPKeyRingGenerator; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPOnePassSignature; +import org.spongycastle.openpgp.PGPOnePassSignatureList; +import org.spongycastle.openpgp.PGPPBEEncryptedData; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyEncryptedData; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator; +import org.spongycastle.openpgp.PGPSignatureSubpacketVector; +import org.spongycastle.openpgp.PGPUserAttributeSubpacketVector; +import org.spongycastle.openpgp.PGPUserAttributeSubpacketVectorGenerator; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.PGPV3SignatureGenerator; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.openpgp.operator.PublicKeyDataDecryptorFactory; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyConverter; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair; +import org.spongycastle.openpgp.operator.jcajce.JcePBEDataDecryptorFactoryBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePBEKeyEncryptionMethodGenerator; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class PGPRSATest extends SimpleTest @@ -445,11 +445,11 @@ public class PGPRSATest ByteArrayOutputStream bcOut = new ByteArrayOutputStream(); - PGPEncryptedDataGenerator encGen = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.AES_128).setWithIntegrityPacket(true).setSecureRandom(new SecureRandom()).setProvider("BC")); + PGPEncryptedDataGenerator encGen = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.AES_128).setWithIntegrityPacket(true).setSecureRandom(new SecureRandom()).setProvider("SC")); - encGen.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(pgpPubKey).setProvider("BC")); + encGen.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(pgpPubKey).setProvider("SC")); - encGen.addMethod(new JcePBEKeyEncryptionMethodGenerator("password".toCharArray()).setProvider("BC")); + encGen.addMethod(new JcePBEKeyEncryptionMethodGenerator("password".toCharArray()).setProvider("SC")); OutputStream cOut = encGen.open(bcOut, bytes.length); @@ -468,7 +468,7 @@ public class PGPRSATest PGPPublicKeyEncryptedData encP = (PGPPublicKeyEncryptedData)encList.get(0); - InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(pgpPrivKey)); + InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(pgpPrivKey)); JcaPGPObjectFactory pgpFact = new JcaPGPObjectFactory(clear); @@ -483,7 +483,7 @@ public class PGPRSATest PGPPBEEncryptedData encPbe = (PGPPBEEncryptedData)encList.get(1); - clear = encPbe.getDataStream(new JcePBEDataDecryptorFactoryBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build("password".toCharArray())); + clear = encPbe.getDataStream(new JcePBEDataDecryptorFactoryBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build("password".toCharArray())); pgpF = new JcaPGPObjectFactory(clear); @@ -533,7 +533,7 @@ public class PGPRSATest { PGPSignature sig = (PGPSignature)sigs.next(); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pubKey); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pubKey); if (!sig.verifyCertification(attributes, pubKey)) { @@ -570,9 +570,9 @@ public class PGPRSATest PGPUserAttributeSubpacketVector uVec = vGen.generate(); - PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.RSA_GENERAL, HashAlgorithmTags.SHA1).setProvider("BC")); + PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.RSA_GENERAL, HashAlgorithmTags.SHA1).setProvider("SC")); - sGen.init(PGPSignature.POSITIVE_CERTIFICATION, pgpSec.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(pass))); + sGen.init(PGPSignature.POSITIVE_CERTIFICATION, pgpSec.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(pass))); PGPSignature sig = sGen.generateCertification(uVec, pubKey); @@ -590,7 +590,7 @@ public class PGPRSATest { PGPSignature s = (PGPSignature)sigs.next(); - s.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pubKey); + s.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pubKey); if (!s.verifyCertification(attributes, pubKey)) { @@ -631,7 +631,7 @@ public class PGPRSATest String identity = "TEST <test@test.org>"; Date date = new Date(); Security.addProvider(new BouncyCastleProvider()); - KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", "SC"); kpg.initialize(2048); KeyPair kpSgn = kpg.generateKeyPair(); KeyPair kpEnc = kpg.generateKeyPair(); @@ -663,7 +663,7 @@ public class PGPRSATest PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, sgnKeyPair, - identity, sha1Calc, hashedPcks, unhashedPcks, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + identity, sha1Calc, hashedPcks, unhashedPcks, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); svg = new PGPSignatureSubpacketGenerator(); svg.setKeyExpirationTime(true, 86400L * 366 * 2); @@ -746,7 +746,7 @@ public class PGPRSATest String identity = "TEST <test@test.org>"; Date date = new Date(); Security.addProvider(new BouncyCastleProvider()); - KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", "SC"); kpg.initialize(2048); KeyPair kpSgn = kpg.generateKeyPair(); KeyPair kpEnc = kpg.generateKeyPair(); @@ -780,7 +780,7 @@ public class PGPRSATest PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, sgnKeyPair, identity, - sha1Calc, hashedPcks, unhashedPcks, new JcaPGPContentSignerBuilder(sgnKeyPair.getPublicKey().getAlgorithm(), HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + sha1Calc, hashedPcks, unhashedPcks, new JcaPGPContentSignerBuilder(sgnKeyPair.getPublicKey().getAlgorithm(), HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); svg = new PGPSignatureSubpacketGenerator(); svg.setKeyExpirationTime(true, 86400L * 366 * 2); @@ -799,7 +799,7 @@ public class PGPRSATest { PGPPublicKey pKey = (PGPPublicKey)it.next(); - PGPSignatureGenerator keySigGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1).setProvider("BC")); + PGPSignatureGenerator keySigGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1).setProvider("SC")); if (pKey.isMasterKey()) { @@ -845,7 +845,7 @@ public class PGPRSATest // PGPPublicKeyRing pgpPub = new PGPPublicKeyRing(testPubKey, new JcaKeyFingerprintCalculator()); - pubKey = new JcaPGPKeyConverter().setProvider("BC").getPublicKey(pgpPub.getPublicKey()); + pubKey = new JcaPGPKeyConverter().setProvider("SC").getPublicKey(pgpPub.getPublicKey()); Iterator it = pgpPub.getPublicKey().getUserIDs(); @@ -855,7 +855,7 @@ public class PGPRSATest PGPSignature sig = (PGPSignature)it.next(); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pgpPub.getPublicKey()); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pgpPub.getPublicKey()); if (!sig.verifyCertification(uid, pgpPub.getPublicKey())) { @@ -879,7 +879,7 @@ public class PGPRSATest // Read the public key // PGPPublicKeyRing pgpPubV3 = new PGPPublicKeyRing(testPubKeyV3, new JcaKeyFingerprintCalculator()); - PublicKey pubKeyV3 = new JcaPGPKeyConverter().setProvider("BC").getPublicKey(pgpPub.getPublicKey()); + PublicKey pubKeyV3 = new JcaPGPKeyConverter().setProvider("SC").getPublicKey(pgpPub.getPublicKey()); // // write a V3 public key @@ -897,7 +897,7 @@ public class PGPRSATest if (!noIDEA()) { PGPSecretKeyRing pgpPriv = new PGPSecretKeyRing(testPrivKeyV3, new JcaKeyFingerprintCalculator()); - PGPPrivateKey pgpPrivKey = pgpPriv.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(passP)); + PGPPrivateKey pgpPrivKey = pgpPriv.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(passP)); // // write a v3 private key @@ -917,7 +917,7 @@ public class PGPRSATest // Read the private key // PGPSecretKeyRing pgpPriv = new PGPSecretKeyRing(testPrivKey, new JcaKeyFingerprintCalculator()); - PGPPrivateKey pgpPrivKey = pgpPriv.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(pass)); + PGPPrivateKey pgpPrivKey = pgpPriv.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(pass)); // // write a private key @@ -936,7 +936,7 @@ public class PGPRSATest // // test encryption // - Cipher c = Cipher.getInstance("RSA", "BC"); + Cipher c = Cipher.getInstance("RSA", "SC"); c.init(Cipher.ENCRYPT_MODE, pubKey); @@ -944,7 +944,7 @@ public class PGPRSATest byte[] out = c.doFinal(in); - c.init(Cipher.DECRYPT_MODE, new JcaPGPKeyConverter().setProvider("BC").getPrivateKey(pgpPrivKey)); + c.init(Cipher.DECRYPT_MODE, new JcaPGPKeyConverter().setProvider("SC").getPrivateKey(pgpPrivKey)); out = c.doFinal(out); @@ -971,7 +971,7 @@ public class PGPRSATest InputStream dIn = p2.getInputStream(); int ch; - ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pgpPub.getPublicKey(ops.getKeyID())); + ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pgpPub.getPublicKey(ops.getKeyID())); while ((ch = dIn.read()) >= 0) { @@ -1001,9 +1001,9 @@ public class PGPRSATest PGPPublicKeyEncryptedData encP = (PGPPublicKeyEncryptedData)encList.get(0); - pgpPrivKey = pgpPriv.getSecretKey(encP.getKeyID()).extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(pass)); + pgpPrivKey = pgpPriv.getSecretKey(encP.getKeyID()).extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(pass)); - InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(pgpPrivKey)); + InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(pgpPrivKey)); pgpFact = new JcaPGPObjectFactory(clear); @@ -1038,10 +1038,10 @@ public class PGPRSATest byte[] shortText = { (byte)'h', (byte)'e', (byte)'l', (byte)'l', (byte)'o' }; ByteArrayOutputStream cbOut = new ByteArrayOutputStream(); - PGPEncryptedDataGenerator cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).setSecureRandom(new SecureRandom()).setProvider("BC")); + PGPEncryptedDataGenerator cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).setSecureRandom(new SecureRandom()).setProvider("SC")); PGPPublicKey puK = pgpPriv.getSecretKey(encP.getKeyID()).getPublicKey(); - cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(puK).setProvider("BC")); + cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(puK).setProvider("SC")); OutputStream cOut = cPk.open(new UncloseableOutputStream(cbOut), shortText.length); @@ -1055,9 +1055,9 @@ public class PGPRSATest encP = (PGPPublicKeyEncryptedData)encList.get(0); - pgpPrivKey = pgpPriv.getSecretKey(encP.getKeyID()).extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(pass)); + pgpPrivKey = pgpPriv.getSecretKey(encP.getKeyID()).extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(pass)); - PublicKeyDataDecryptorFactory dataDecryptorFactory = new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(pgpPrivKey); + PublicKeyDataDecryptorFactory dataDecryptorFactory = new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(pgpPrivKey); if (encP.getSymmetricAlgorithm(dataDecryptorFactory) != SymmetricKeyAlgorithmTags.CAST5) { fail("symmetric algorithm mismatch"); @@ -1083,10 +1083,10 @@ public class PGPRSATest // encrypt // cbOut = new ByteArrayOutputStream(); - cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).setSecureRandom(new SecureRandom()).setProvider("BC")); + cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).setSecureRandom(new SecureRandom()).setProvider("SC")); puK = pgpPriv.getSecretKey(encP.getKeyID()).getPublicKey(); - cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(puK).setProvider("BC")); + cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(puK).setProvider("SC")); cOut = cPk.open(new UncloseableOutputStream(cbOut), text.length); @@ -1100,9 +1100,9 @@ public class PGPRSATest encP = (PGPPublicKeyEncryptedData)encList.get(0); - pgpPrivKey = pgpPriv.getSecretKey(encP.getKeyID()).extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(pass)); + pgpPrivKey = pgpPriv.getSecretKey(encP.getKeyID()).extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(pass)); - clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(pgpPrivKey)); + clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(pgpPrivKey)); bOut.reset(); @@ -1134,7 +1134,7 @@ public class PGPRSATest // char[] passPhrase = "hello".toCharArray(); - KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", "SC"); kpg.initialize(1024); @@ -1143,7 +1143,7 @@ public class PGPRSATest PGPSecretKey secretKey = new PGPSecretKey( PGPSignature.DEFAULT_CERTIFICATION, new JcaPGPKeyPair(PublicKeyAlgorithmTags.RSA_GENERAL, kp, new Date()), "fred", - null, null, new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.RSA_SIGN, HashAlgorithmTags.SHA1).setProvider("BC"), + null, null, new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.RSA_SIGN, HashAlgorithmTags.SHA1).setProvider("SC"), new JcePBESecretKeyEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).build(passPhrase)); PGPPublicKey key = secretKey.getPublicKey(); @@ -1156,14 +1156,14 @@ public class PGPRSATest sig = (PGPSignature)it.next(); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), key); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), key); if (!sig.verifyCertification(uid, key)) { fail("failed to verify certification"); } - pgpPrivKey = secretKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(passPhrase)); + pgpPrivKey = secretKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(passPhrase)); key = PGPPublicKey.removeCertification(key, uid, sig); @@ -1178,9 +1178,9 @@ public class PGPRSATest keyEnc = key.getEncoded(); - PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.RSA_GENERAL, HashAlgorithmTags.SHA1).setProvider("BC")); + PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.RSA_GENERAL, HashAlgorithmTags.SHA1).setProvider("SC")); - sGen.init(PGPSignature.KEY_REVOCATION, secretKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(passPhrase))); + sGen.init(PGPSignature.KEY_REVOCATION, secretKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(passPhrase))); sig = sGen.generateCertification(key); @@ -1196,7 +1196,7 @@ public class PGPRSATest sig = (PGPSignature)sgIt.next(); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), key); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), key); if (!sig.verifyCertification(key)) { @@ -1224,10 +1224,10 @@ public class PGPRSATest secretKey = new PGPSecretKey( PGPSignature.DEFAULT_CERTIFICATION, new JcaPGPKeyPair(PublicKeyAlgorithmTags.RSA_GENERAL, kp, new Date()), "fred", - null, null, new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.RSA_SIGN, HashAlgorithmTags.SHA1).setProvider("BC"), + null, null, new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.RSA_SIGN, HashAlgorithmTags.SHA1).setProvider("SC"), new JcePBESecretKeyEncryptorBuilder(SymmetricKeyAlgorithmTags.AES_256).build(passPhrase)); - secretKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(passPhrase)); + secretKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(passPhrase)); secretKey.encode(new ByteArrayOutputStream()); @@ -1236,9 +1236,9 @@ public class PGPRSATest // String newPass = "newPass"; - secretKey = PGPSecretKey.copyWithNewPassword(secretKey, new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(passPhrase), new JcePBESecretKeyEncryptorBuilder(secretKey.getKeyEncryptionAlgorithm()).setProvider("BC").setSecureRandom(new SecureRandom()).build(newPass.toCharArray())); + secretKey = PGPSecretKey.copyWithNewPassword(secretKey, new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(passPhrase), new JcePBESecretKeyEncryptorBuilder(secretKey.getKeyEncryptionAlgorithm()).setProvider("SC").setSecureRandom(new SecureRandom()).build(newPass.toCharArray())); - secretKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(newPass.toCharArray())); + secretKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(newPass.toCharArray())); secretKey.encode(new ByteArrayOutputStream()); @@ -1254,14 +1254,14 @@ public class PGPRSATest sig = (PGPSignature)it.next(); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), key); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), key); if (!sig.verifyCertification(uid, key)) { fail("failed to verify certification"); } - pgpPrivKey = secretKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(newPass.toCharArray())); + pgpPrivKey = secretKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(newPass.toCharArray())); // // signature generation @@ -1272,7 +1272,7 @@ public class PGPRSATest ByteArrayInputStream testIn = new ByteArrayInputStream(data.getBytes()); - sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.RSA_GENERAL, HashAlgorithmTags.SHA1).setProvider("BC")); + sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.RSA_GENERAL, HashAlgorithmTags.SHA1).setProvider("SC")); sGen.init(PGPSignature.BINARY_DOCUMENT, pgpPrivKey); @@ -1327,7 +1327,7 @@ public class PGPRSATest dIn = p2.getInputStream(); - ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), secretKey.getPublicKey()); + ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), secretKey.getPublicKey()); while ((ch = dIn.read()) >= 0) { @@ -1347,7 +1347,7 @@ public class PGPRSATest bOut = new ByteArrayOutputStream(); testIn = new ByteArrayInputStream(data.getBytes()); - PGPV3SignatureGenerator sGenV3 = new PGPV3SignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_GENERAL, PGPUtil.SHA1).setProvider("BC")); + PGPV3SignatureGenerator sGenV3 = new PGPV3SignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_GENERAL, PGPUtil.SHA1).setProvider("SC")); sGenV3.init(PGPSignature.BINARY_DOCUMENT, pgpPrivKey); @@ -1399,7 +1399,7 @@ public class PGPRSATest dIn = p2.getInputStream(); - ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), secretKey.getPublicKey()); + ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), secretKey.getPublicKey()); while ((ch = dIn.read()) >= 0) { @@ -1420,7 +1420,7 @@ public class PGPRSATest secretKey = pgpPriv.getSecretKey(); - pgpPrivKey = secretKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(pgp8Pass)); + pgpPrivKey = secretKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(pgp8Pass)); // // expiry @@ -1464,7 +1464,7 @@ public class PGPRSATest { try { - Cipher.getInstance("IDEA", "BC"); + Cipher.getInstance("IDEA", "SC"); return false; } diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPSignatureTest.java b/pg/src/test/java/org/spongycastle/openpgp/test/PGPSignatureTest.java index dce348bf..12f68a53 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPSignatureTest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/PGPSignatureTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -11,42 +11,42 @@ import java.security.SignatureException; import java.util.Date; import java.util.Iterator; -import org.bouncycastle.bcpg.CompressionAlgorithmTags; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.SignatureSubpacketTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.bcpg.sig.KeyFlags; -import org.bouncycastle.bcpg.sig.NotationData; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPOnePassSignature; -import org.bouncycastle.openpgp.PGPOnePassSignatureList; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator; -import org.bouncycastle.openpgp.PGPSignatureSubpacketVector; -import org.bouncycastle.openpgp.PGPUserAttributeSubpacketVector; -import org.bouncycastle.openpgp.PGPV3SignatureGenerator; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.io.Streams; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.bcpg.CompressionAlgorithmTags; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.SignatureSubpacketTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.bcpg.sig.KeyFlags; +import org.spongycastle.bcpg.sig.NotationData; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPOnePassSignature; +import org.spongycastle.openpgp.PGPOnePassSignatureList; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator; +import org.spongycastle.openpgp.PGPSignatureSubpacketVector; +import org.spongycastle.openpgp.PGPUserAttributeSubpacketVector; +import org.spongycastle.openpgp.PGPV3SignatureGenerator; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.io.Streams; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class PGPSignatureTest extends SimpleTest @@ -368,7 +368,7 @@ public class PGPSignatureTest // PGPSecretKeyRing pgpPriv = new PGPSecretKeyRing(rsaKeyRing, new JcaKeyFingerprintCalculator()); PGPSecretKey secretKey = pgpPriv.getSecretKey(); - PGPPrivateKey pgpPrivKey = secretKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(rsaPass)); + PGPPrivateKey pgpPrivKey = secretKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(rsaPass)); try { @@ -395,13 +395,13 @@ public class PGPSignatureTest // // certifications // - PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.RSA_GENERAL, HashAlgorithmTags.SHA1).setProvider("BC")); + PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.RSA_GENERAL, HashAlgorithmTags.SHA1).setProvider("SC")); sGen.init(PGPSignature.KEY_REVOCATION, pgpPrivKey); PGPSignature sig = sGen.generateCertification(secretKey.getPublicKey()); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), secretKey.getPublicKey()); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), secretKey.getPublicKey()); if (!sig.verifyCertification(secretKey.getPublicKey())) { @@ -410,9 +410,9 @@ public class PGPSignatureTest PGPSecretKeyRing pgpDSAPriv = new PGPSecretKeyRing(dsaKeyRing, new JcaKeyFingerprintCalculator()); PGPSecretKey secretDSAKey = pgpDSAPriv.getSecretKey(); - PGPPrivateKey pgpPrivDSAKey = secretDSAKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(dsaPass)); + PGPPrivateKey pgpPrivDSAKey = secretDSAKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(dsaPass)); - sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.DSA, HashAlgorithmTags.SHA1).setProvider("BC")); + sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.DSA, HashAlgorithmTags.SHA1).setProvider("SC")); sGen.init(PGPSignature.SUBKEY_BINDING, pgpPrivDSAKey); @@ -436,7 +436,7 @@ public class PGPSignatureTest sig = ((PGPSignatureList) f.nextObject()).get(0); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), secretDSAKey.getPublicKey()); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), secretDSAKey.getPublicKey()); if (!sig.verifyCertification(secretDSAKey.getPublicKey(), secretKey.getPublicKey())) { @@ -495,7 +495,7 @@ public class PGPSignatureTest // // no packets passed // - sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.DSA, HashAlgorithmTags.SHA1).setProvider("BC")); + sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.DSA, HashAlgorithmTags.SHA1).setProvider("SC")); sGen.init(PGPSignature.SUBKEY_BINDING, pgpPrivDSAKey); @@ -504,7 +504,7 @@ public class PGPSignatureTest sig = sGen.generateCertification(TEST_USER_ID, secretKey.getPublicKey()); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), secretDSAKey.getPublicKey()); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), secretDSAKey.getPublicKey()); if (!sig.verifyCertification(TEST_USER_ID, secretKey.getPublicKey())) { @@ -539,7 +539,7 @@ public class PGPSignatureTest // // override hash packets // - sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.DSA, HashAlgorithmTags.SHA1).setProvider("BC")); + sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PublicKeyAlgorithmTags.DSA, HashAlgorithmTags.SHA1).setProvider("SC")); sGen.init(PGPSignature.SUBKEY_BINDING, pgpPrivDSAKey); @@ -553,7 +553,7 @@ public class PGPSignatureTest sig = sGen.generateCertification(TEST_USER_ID, secretKey.getPublicKey()); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), secretDSAKey.getPublicKey()); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), secretDSAKey.getPublicKey()); if (!sig.verifyCertification(TEST_USER_ID, secretKey.getPublicKey())) { @@ -632,7 +632,7 @@ public class PGPSignatureTest // pgpPriv = new PGPSecretKeyRing(dsaKeyRing, new JcaKeyFingerprintCalculator()); secretKey = pgpPriv.getSecretKey(); - pgpPrivKey = secretKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(dsaPass)); + pgpPrivKey = secretKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(dsaPass)); try { @@ -953,7 +953,7 @@ public class PGPSignatureTest { ByteArrayOutputStream bOut = new ByteArrayOutputStream(); ByteArrayInputStream testIn = new ByteArrayInputStream(TEST_DATA); - PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(encAlgorithm, hashAlgorithm).setProvider("BC")); + PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(encAlgorithm, hashAlgorithm).setProvider("SC")); sGen.init(PGPSignature.BINARY_DOCUMENT, privKey); sGen.generateOnePassVersion(false).encode(bOut); @@ -992,7 +992,7 @@ public class PGPSignatureTest byte[] canonicalData) throws Exception { - PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(encAlgorithm, HashAlgorithmTags.SHA1).setProvider("BC")); + PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(encAlgorithm, HashAlgorithmTags.SHA1).setProvider("SC")); ByteArrayOutputStream bOut = new ByteArrayOutputStream(); ByteArrayInputStream testIn = new ByteArrayInputStream(data); Date creationTime = new Date(); @@ -1049,7 +1049,7 @@ public class PGPSignatureTest { ByteArrayOutputStream bOut = new ByteArrayOutputStream(); ByteArrayInputStream testIn = new ByteArrayInputStream(TEST_DATA); - PGPV3SignatureGenerator sGen = new PGPV3SignatureGenerator(new JcaPGPContentSignerBuilder(encAlgorithm, hashAlgorithm).setProvider("BC")); + PGPV3SignatureGenerator sGen = new PGPV3SignatureGenerator(new JcaPGPContentSignerBuilder(encAlgorithm, hashAlgorithm).setProvider("SC")); sGen.init(PGPSignature.BINARY_DOCUMENT, privKey); sGen.generateOnePassVersion(false).encode(bOut); @@ -1088,7 +1088,7 @@ public class PGPSignatureTest byte[] canonicalData) throws Exception { - PGPV3SignatureGenerator sGen = new PGPV3SignatureGenerator(new JcaPGPContentSignerBuilder(encAlgorithm, HashAlgorithmTags.SHA1).setProvider("BC")); + PGPV3SignatureGenerator sGen = new PGPV3SignatureGenerator(new JcaPGPContentSignerBuilder(encAlgorithm, HashAlgorithmTags.SHA1).setProvider("SC")); ByteArrayOutputStream bOut = new ByteArrayOutputStream(); ByteArrayInputStream testIn = new ByteArrayInputStream(data); @@ -1140,7 +1140,7 @@ public class PGPSignatureTest PGPLiteralData p2 = (PGPLiteralData)pgpFact.nextObject(); InputStream dIn = p2.getInputStream(); - ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pubKey); + ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pubKey); int ch; @@ -1172,7 +1172,7 @@ public class PGPSignatureTest fail("Failed generated signature check - " + hashAlgorithm); } - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pubKey); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pubKey); for (int i = 0; i != original.length; i++) { diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPUnicodeTest.java b/pg/src/test/java/org/spongycastle/openpgp/test/PGPUnicodeTest.java index 543334d3..7a043c65 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPUnicodeTest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/PGPUnicodeTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.BufferedReader; import java.io.FileInputStream; @@ -11,17 +11,17 @@ import java.security.Security; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; -import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor; -import org.bouncycastle.openpgp.operator.PGPDigestCalculatorProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSecretKeyRingCollection; +import org.spongycastle.openpgp.operator.PBESecretKeyDecryptor; +import org.spongycastle.openpgp.operator.PGPDigestCalculatorProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; public class PGPUnicodeTest extends TestCase @@ -30,9 +30,9 @@ public class PGPUnicodeTest public void setUp() { - if (Security.getProvider("BC") == null) + if (Security.getProvider("SC") == null) { - Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); + Security.addProvider(new org.spongycastle.jce.provider.BouncyCastleProvider()); } } diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/RegressionTest.java b/pg/src/test/java/org/spongycastle/openpgp/test/RegressionTest.java index b0990d62..da3cd486 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/RegressionTest.java +++ b/pg/src/test/java/org/spongycastle/openpgp/test/RegressionTest.java @@ -1,9 +1,9 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.security.Security; -import org.bouncycastle.util.test.Test; -import org.bouncycastle.util.test.TestResult; +import org.spongycastle.util.test.Test; +import org.spongycastle.util.test.TestResult; public class RegressionTest { @@ -34,7 +34,7 @@ public class RegressionTest public static void main( String[] args) { - Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); + Security.addProvider(new org.spongycastle.jce.provider.BouncyCastleProvider()); for (int i = 0; i != tests.length; i++) { diff --git a/pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/BcPGPDSAElGamalTest.java b/pg/src/test/jdk1.1/org/spongycastle/openpgp/test/BcPGPDSAElGamalTest.java index 161aff87..73770e5d 100644 --- a/pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/BcPGPDSAElGamalTest.java +++ b/pg/src/test/jdk1.1/org/spongycastle/openpgp/test/BcPGPDSAElGamalTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -16,48 +16,48 @@ import java.util.Iterator; import javax.crypto.spec.DHParameterSpec; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.crypto.AsymmetricBlockCipher; -import org.bouncycastle.crypto.encodings.PKCS1Encoding; -import org.bouncycastle.crypto.engines.ElGamalEngine; -import org.bouncycastle.crypto.params.AsymmetricKeyParameter; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.jce.spec.ElGamalParameterSpec; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPCompressedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPOnePassSignature; -import org.bouncycastle.openpgp.PGPOnePassSignatureList; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; -import org.bouncycastle.openpgp.operator.bc.BcPGPKeyConverter; -import org.bouncycastle.openpgp.operator.bc.BcPublicKeyDataDecryptorFactory; -import org.bouncycastle.openpgp.operator.bc.BcPublicKeyKeyEncryptionMethodGenerator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.crypto.AsymmetricBlockCipher; +import org.spongycastle.crypto.encodings.PKCS1Encoding; +import org.spongycastle.crypto.engines.ElGamalEngine; +import org.spongycastle.crypto.params.AsymmetricKeyParameter; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.jce.spec.ElGamalParameterSpec; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPCompressedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPOnePassSignature; +import org.spongycastle.openpgp.PGPOnePassSignatureList; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyEncryptedData; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; +import org.spongycastle.openpgp.operator.bc.BcPGPKeyConverter; +import org.spongycastle.openpgp.operator.bc.BcPublicKeyDataDecryptorFactory; +import org.spongycastle.openpgp.operator.bc.BcPublicKeyKeyEncryptionMethodGenerator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class BcPGPDSAElGamalTest extends SimpleTest @@ -146,7 +146,7 @@ public class BcPGPDSAElGamalTest { PGPPublicKey pubKey; - PGPUtil.setDefaultProvider("BC"); + PGPUtil.setDefaultProvider("SC"); // // Read the public key @@ -436,7 +436,7 @@ public class BcPGPDSAElGamalTest BigInteger g = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16); BigInteger p = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16); - KeyPairGenerator kpg = KeyPairGenerator.getInstance("ElGamal", "BC"); + KeyPairGenerator kpg = KeyPairGenerator.getInstance("ElGamal", "SC"); ElGamalParameterSpec elParams = new ElGamalParameterSpec(p, g); @@ -457,12 +457,12 @@ public class BcPGPDSAElGamalTest for (int pSize = 257; pSize < 264; ++pSize) { // Generate some parameters of the given size - AlgorithmParameterGenerator a = AlgorithmParameterGenerator.getInstance("ElGamal", "BC"); + AlgorithmParameterGenerator a = AlgorithmParameterGenerator.getInstance("ElGamal", "SC"); a.init(pSize, new SecureRandom()); AlgorithmParameters params = a.generateParameters(); DHParameterSpec elP = (DHParameterSpec)params.getParameterSpec(DHParameterSpec.class); - KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ElGamal", "BC"); + KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ElGamal", "SC"); keyGen.initialize(512); diff --git a/pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/BcPGPKeyRingTest.java b/pg/src/test/jdk1.1/org/spongycastle/openpgp/test/BcPGPKeyRingTest.java index d5c16973..4d06227d 100644 --- a/pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/BcPGPKeyRingTest.java +++ b/pg/src/test/jdk1.1/org/spongycastle/openpgp/test/BcPGPKeyRingTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.math.BigInteger; @@ -9,35 +9,35 @@ import java.security.Security; import java.util.Date; import java.util.Iterator; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.jce.spec.ElGamalParameterSpec; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPKeyRingGenerator; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.bc.BcPGPPublicKeyRingCollection; -import org.bouncycastle.openpgp.bc.BcPGPSecretKeyRingCollection; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; -import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; -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.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.Hex; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.jce.spec.ElGamalParameterSpec; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPKeyRingGenerator; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.bc.BcPGPPublicKeyRingCollection; +import org.spongycastle.openpgp.bc.BcPGPSecretKeyRingCollection; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.test.SimpleTest; public class BcPGPKeyRingTest extends SimpleTest @@ -1917,7 +1917,7 @@ public class BcPGPKeyRingTest throws Exception { char[] passPhrase = "hello".toCharArray(); - KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", "BC"); + KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", "SC"); dsaKpg.initialize(512); @@ -1927,7 +1927,7 @@ public class BcPGPKeyRingTest // KeyPair dsaKp = dsaKpg.generateKeyPair(); - KeyPairGenerator elgKpg = KeyPairGenerator.getInstance("ELGAMAL", "BC"); + KeyPairGenerator elgKpg = KeyPairGenerator.getInstance("ELGAMAL", "SC"); BigInteger g = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16); BigInteger p = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16); @@ -1944,7 +1944,7 @@ public class BcPGPKeyRingTest PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, dsaKeyPair, - "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); keyRingGen.addSubKey(elgKeyPair); @@ -1993,7 +1993,7 @@ public class BcPGPKeyRingTest throws Exception { char[] passPhrase = "hello".toCharArray(); - KeyPairGenerator rsaKpg = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator rsaKpg = KeyPairGenerator.getInstance("RSA", "SC"); rsaKpg.initialize(512); @@ -2006,11 +2006,11 @@ public class BcPGPKeyRingTest PGPKeyPair rsaKeyPair2 = new JcaPGPKeyPair(PGPPublicKey.RSA_GENERAL, rsaKp, new Date()); PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, rsaKeyPair1, - "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); PGPSecretKeyRing secRing1 = keyRingGen.generateSecretKeyRing(); PGPPublicKeyRing pubRing1 = keyRingGen.generatePublicKeyRing(); keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, rsaKeyPair2, - "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); PGPSecretKeyRing secRing2 = keyRingGen.generateSecretKeyRing(); PGPPublicKeyRing pubRing2 = keyRingGen.generatePublicKeyRing(); @@ -2045,7 +2045,7 @@ public class BcPGPKeyRingTest throws Exception { char[] passPhrase = "hello".toCharArray(); - KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", "BC"); + KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", "SC"); dsaKpg.initialize(512); @@ -2055,7 +2055,7 @@ public class BcPGPKeyRingTest // KeyPair dsaKp = dsaKpg.generateKeyPair(); - KeyPairGenerator elgKpg = KeyPairGenerator.getInstance("ELGAMAL", "BC"); + KeyPairGenerator elgKpg = KeyPairGenerator.getInstance("ELGAMAL", "SC"); BigInteger g = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16); BigInteger p = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16); @@ -2071,7 +2071,7 @@ public class BcPGPKeyRingTest PGPKeyPair elgKeyPair = new JcaPGPKeyPair(PGPPublicKey.ELGAMAL_ENCRYPT, elgKp, new Date()); PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, dsaKeyPair, - "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); keyRingGen.addSubKey(elgKeyPair); @@ -2213,7 +2213,7 @@ public class BcPGPKeyRingTest // // this is quicker because we are using pregenerated parameters. // - KeyPairGenerator rsaKpg = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator rsaKpg = KeyPairGenerator.getInstance("RSA", "SC"); KeyPair rsaKp = rsaKpg.generateKeyPair(); PGPKeyPair rsaKeyPair1 = new JcaPGPKeyPair(PGPPublicKey.RSA_GENERAL, rsaKp, new Date()); rsaKp = rsaKpg.generateKeyPair(); @@ -2221,7 +2221,7 @@ public class BcPGPKeyRingTest char[] passPhrase = "passwd".toCharArray(); PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, rsaKeyPair1, - userID, sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + userID, sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); PGPPublicKeyRing pubRing1 = keyRingGen.generatePublicKeyRing(); diff --git a/pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/PGPDSAElGamalTest.java b/pg/src/test/jdk1.1/org/spongycastle/openpgp/test/PGPDSAElGamalTest.java index c8e1477b..75448cf7 100644 --- a/pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/PGPDSAElGamalTest.java +++ b/pg/src/test/jdk1.1/org/spongycastle/openpgp/test/PGPDSAElGamalTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -18,44 +18,44 @@ import java.util.Iterator; import javax.crypto.Cipher; import javax.crypto.spec.DHParameterSpec; -import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.jce.spec.ElGamalParameterSpec; -import org.bouncycastle.openpgp.PGPCompressedData; -import org.bouncycastle.openpgp.PGPCompressedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPOnePassSignature; -import org.bouncycastle.openpgp.PGPOnePassSignatureList; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPSignatureList; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyConverter; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.bcpg.BCPGOutputStream; +import org.spongycastle.bcpg.PublicKeyAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.jce.spec.ElGamalParameterSpec; +import org.spongycastle.openpgp.PGPCompressedData; +import org.spongycastle.openpgp.PGPCompressedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPOnePassSignature; +import org.spongycastle.openpgp.PGPOnePassSignatureList; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyEncryptedData; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureList; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyConverter; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class PGPDSAElGamalTest extends SimpleTest @@ -144,7 +144,7 @@ public class PGPDSAElGamalTest { PGPPublicKey pubKey = null; - PGPUtil.setDefaultProvider("BC"); + PGPUtil.setDefaultProvider("SC"); // // Read the public key @@ -164,7 +164,7 @@ public class PGPDSAElGamalTest // Read the private key // PGPSecretKeyRing sKey = new PGPSecretKeyRing(testPrivKeyRing, new JcaKeyFingerprintCalculator()); - PGPPrivateKey pgpPrivKey = sKey.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(pass)); + PGPPrivateKey pgpPrivKey = sKey.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(pass)); // // signature generation @@ -172,7 +172,7 @@ public class PGPDSAElGamalTest String data = "hello world!"; ByteArrayOutputStream bOut = new ByteArrayOutputStream(); ByteArrayInputStream testIn = new ByteArrayInputStream(data.getBytes()); - PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, PGPUtil.SHA1).setProvider("BC")); + PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, PGPUtil.SHA1).setProvider("SC")); sGen.init(PGPSignature.BINARY_DOCUMENT, pgpPrivKey); @@ -228,7 +228,7 @@ public class PGPDSAElGamalTest InputStream dIn = p2.getInputStream(); - ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pubKey); + ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pubKey); while ((ch = dIn.read()) >= 0) { @@ -260,7 +260,7 @@ public class PGPDSAElGamalTest if (pgpKey.getAlgorithm() == PGPPublicKey.ELGAMAL_ENCRYPT || pgpKey.getAlgorithm() == PGPPublicKey.ELGAMAL_GENERAL) { - pKey = new JcaPGPKeyConverter().setProvider("BC").getPublicKey(pgpKey); + pKey = new JcaPGPKeyConverter().setProvider("SC").getPublicKey(pgpKey); pgpKeyID = pgpKey.getKeyID(); if (pgpKey.getBitStrength() != 1024) { @@ -274,7 +274,7 @@ public class PGPDSAElGamalTest } } - Cipher c = Cipher.getInstance("ElGamal/None/PKCS1Padding", "BC"); + Cipher c = Cipher.getInstance("ElGamal/None/PKCS1Padding", "SC"); c.init(Cipher.ENCRYPT_MODE, pKey); @@ -282,9 +282,9 @@ public class PGPDSAElGamalTest byte[] out = c.doFinal(in); - pgpPrivKey = sKey.getSecretKey(pgpKeyID).extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(pass)); + pgpPrivKey = sKey.getSecretKey(pgpKeyID).extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(pass)); - c.init(Cipher.DECRYPT_MODE, new JcaPGPKeyConverter().setProvider("BC").getPrivateKey(pgpPrivKey)); + c.init(Cipher.DECRYPT_MODE, new JcaPGPKeyConverter().setProvider("SC").getPrivateKey(pgpPrivKey)); out = c.doFinal(out); @@ -304,7 +304,7 @@ public class PGPDSAElGamalTest PGPPublicKeyEncryptedData encP = (PGPPublicKeyEncryptedData)encList.get(0); - InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(pgpPrivKey)); + InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(pgpPrivKey)); pgpFact = new JcaPGPObjectFactory(clear); @@ -342,7 +342,7 @@ public class PGPDSAElGamalTest encP = (PGPPublicKeyEncryptedData)encList.get(0); - clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(pgpPrivKey)); + clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(pgpPrivKey)); pgpFact = new JcaPGPObjectFactory(clear); @@ -368,7 +368,7 @@ public class PGPDSAElGamalTest // // note: we use the DSA public key here. // - ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pgpPub.getPublicKey()); + ops.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pgpPub.getPublicKey()); while ((ch = inLd.read()) >= 0) { @@ -392,10 +392,10 @@ public class PGPDSAElGamalTest // encrypt // ByteArrayOutputStream cbOut = new ByteArrayOutputStream(); - PGPEncryptedDataGenerator cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.TRIPLE_DES).setSecureRandom(new SecureRandom()).setProvider("BC")); + PGPEncryptedDataGenerator cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.TRIPLE_DES).setSecureRandom(new SecureRandom()).setProvider("SC")); PGPPublicKey puK = sKey.getSecretKey(pgpKeyID).getPublicKey(); - cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(puK).setProvider("BC")); + cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(puK).setProvider("SC")); OutputStream cOut = cPk.open(new UncloseableOutputStream(cbOut), bOut.toByteArray().length); @@ -409,9 +409,9 @@ public class PGPDSAElGamalTest encP = (PGPPublicKeyEncryptedData)encList.get(0); - pgpPrivKey = sKey.getSecretKey(pgpKeyID).extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(pass)); + pgpPrivKey = sKey.getSecretKey(pgpKeyID).extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(pass)); - clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(pgpPrivKey)); + clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(pgpPrivKey)); bOut.reset(); @@ -433,7 +433,7 @@ public class PGPDSAElGamalTest BigInteger g = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16); BigInteger p = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16); - KeyPairGenerator kpg = KeyPairGenerator.getInstance("ElGamal", "BC"); + KeyPairGenerator kpg = KeyPairGenerator.getInstance("ElGamal", "SC"); ElGamalParameterSpec elParams = new ElGamalParameterSpec(p, g); @@ -454,12 +454,12 @@ public class PGPDSAElGamalTest for (int pSize = 257; pSize < 264; ++pSize) { // Generate some parameters of the given size - AlgorithmParameterGenerator a = AlgorithmParameterGenerator.getInstance("ElGamal", "BC"); + AlgorithmParameterGenerator a = AlgorithmParameterGenerator.getInstance("ElGamal", "SC"); a.init(pSize, new SecureRandom()); AlgorithmParameters params = a.generateParameters(); DHParameterSpec elP = (DHParameterSpec)params.getParameterSpec(DHParameterSpec.class); - KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ElGamal", "BC"); + KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ElGamal", "SC"); keyGen.initialize(512); @@ -470,11 +470,11 @@ public class PGPDSAElGamalTest PGPKeyPair elGamalKeyPair = new JcaPGPKeyPair( PublicKeyAlgorithmTags.ELGAMAL_GENERAL, kp, new Date()); - cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).setSecureRandom(new SecureRandom()).setProvider("BC")); + cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).setSecureRandom(new SecureRandom()).setProvider("SC")); puK = elGamalKeyPair.getPublicKey(); - cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(puK).setProvider("BC")); + cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(puK).setProvider("SC")); cbOut = new ByteArrayOutputStream(); @@ -493,7 +493,7 @@ public class PGPDSAElGamalTest pgpPrivKey = elGamalKeyPair.getPrivateKey(); // Note: This is where an exception would be expected if the P size causes problems - clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(pgpPrivKey)); + clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(pgpPrivKey)); ByteArrayOutputStream dec = new ByteArrayOutputStream(); @@ -526,7 +526,7 @@ public class PGPDSAElGamalTest PGPPublicKey k = (PGPPublicKey)objF.nextObject(); - pKey = new JcaPGPKeyConverter().setProvider("BC").getPublicKey(k); + pKey = new JcaPGPKeyConverter().setProvider("SC").getPublicKey(k); pgpKeyID = k.getKeyID(); if (k.getBitStrength() != 1024) { diff --git a/pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/PGPECDHTest.java b/pg/src/test/jdk1.1/org/spongycastle/openpgp/test/PGPECDHTest.java index 6573dae2..997b73fc 100644 --- a/pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/PGPECDHTest.java +++ b/pg/src/test/jdk1.1/org/spongycastle/openpgp/test/PGPECDHTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayOutputStream; import java.io.InputStream; @@ -8,44 +8,44 @@ import java.security.KeyPairGenerator; import java.security.SecureRandom; import java.security.Security; import java.security.SignatureException; -import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec; +import org.spongycastle.jce.spec.ECNamedCurveGenParameterSpec; import java.util.Date; import java.util.Iterator; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPKeyRingGenerator; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPObjectFactory; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPEncryptedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPKeyRingGenerator; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPObjectFactory; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyEncryptedData; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class PGPECDHTest extends SimpleTest @@ -88,7 +88,7 @@ public class PGPECDHTest // // Generate a master key // - KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDSA", "BC"); + KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDSA", "SC"); keyGen.initialize(256); @@ -99,7 +99,7 @@ public class PGPECDHTest // // Generate an encryption key // - keyGen = KeyPairGenerator.getInstance("ECDH", "BC"); + keyGen = KeyPairGenerator.getInstance("ECDH", "SC"); keyGen.initialize(256); @@ -115,7 +115,7 @@ public class PGPECDHTest PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, ecdsaKeyPair, "test@bouncycastle.org", sha1Calc, null, null, new JcaPGPContentSignerBuilder(ecdsaKeyPair.getPublicKey().getAlgorithm(), HashAlgorithmTags.SHA1), - new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256, sha1Calc).setProvider("BC").build(passPhrase)); + new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256, sha1Calc).setProvider("SC").build(passPhrase)); keyRingGen.addSubKey(ecdhKeyPair); @@ -156,7 +156,7 @@ public class PGPECDHTest // // PGPPrivateKey pgpPrivKey = secretKey.extractPrivateKey()extractPrivateKey(null); // -// clear = encP.getDataStream(pgpPrivKey, "BC"); +// clear = encP.getDataStream(pgpPrivKey, "SC"); // // bOut.reset(); // @@ -179,7 +179,7 @@ public class PGPECDHTest byte[] text = { (byte)'h', (byte)'e', (byte)'l', (byte)'l', (byte)'o', (byte)' ', (byte)'w', (byte)'o', (byte)'r', (byte)'l', (byte)'d', (byte)'!', (byte)'\n' }; - KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDH", "BC"); + KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDH", "SC"); keyGen.initialize(256); @@ -199,9 +199,9 @@ public class PGPECDHTest ByteArrayOutputStream cbOut = new ByteArrayOutputStream(); - PGPEncryptedDataGenerator cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).setProvider("BC").setSecureRandom(new SecureRandom())); + PGPEncryptedDataGenerator cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).setProvider("SC").setSecureRandom(new SecureRandom())); - cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(ecdhKeyPair.getPublicKey()).setProvider("BC")); + cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(ecdhKeyPair.getPublicKey()).setProvider("SC")); OutputStream cOut = cPk.open(new UncloseableOutputStream(cbOut), data.length); @@ -215,7 +215,7 @@ public class PGPECDHTest PGPPublicKeyEncryptedData encP = (PGPPublicKeyEncryptedData)encList.get(0); - InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(ecdhKeyPair.getPrivateKey())); + InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(ecdhKeyPair.getPrivateKey())); pgpF = new PGPObjectFactory(clear); @@ -241,7 +241,7 @@ public class PGPECDHTest public void performTest() throws Exception { - PGPUtil.setDefaultProvider("BC"); + PGPUtil.setDefaultProvider("SC"); // // Read the public key @@ -287,7 +287,7 @@ public class PGPECDHTest { PGPSignature certification = (PGPSignature)sigIt.next(); - certification.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pubKeyRing.getPublicKey()); + certification.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pubKeyRing.getPublicKey()); if (!certification.verifyCertification((String)pubKeyRing.getPublicKey().getUserIDs().next(), pubKeyRing.getPublicKey())) { diff --git a/pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/PGPECDSATest.java b/pg/src/test/jdk1.1/org/spongycastle/openpgp/test/PGPECDSATest.java index 7330987d..a879d835 100644 --- a/pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/PGPECDSATest.java +++ b/pg/src/test/jdk1.1/org/spongycastle/openpgp/test/PGPECDSATest.java @@ -1,34 +1,34 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.Security; -import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec; +import org.spongycastle.jce.spec.ECNamedCurveGenParameterSpec; import java.util.Date; import java.util.Iterator; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPKeyRingGenerator; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPKeyRingGenerator; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; public class PGPECDSATest extends SimpleTest @@ -56,7 +56,7 @@ public class PGPECDSATest private void generateAndSign() throws Exception { - KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDSA", "BC"); + KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDSA", "SC"); keyGen.initialize(256); @@ -67,7 +67,7 @@ public class PGPECDSATest // // try a signature // - PGPSignatureGenerator signGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.ECDSA, HashAlgorithmTags.SHA256).setProvider("BC")); + PGPSignatureGenerator signGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.ECDSA, HashAlgorithmTags.SHA256).setProvider("SC")); signGen.init(PGPSignature.BINARY_DOCUMENT, ecdsaKeyPair.getPrivateKey()); @@ -75,7 +75,7 @@ public class PGPECDSATest PGPSignature sig = signGen.generate(); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), ecdsaKeyPair.getPublicKey()); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), ecdsaKeyPair.getPublicKey()); sig.update("hello world!".getBytes()); @@ -90,7 +90,7 @@ public class PGPECDSATest char[] passPhrase = "test".toCharArray(); PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, ecdsaKeyPair, - "test@bouncycastle.org", sha1Calc, null, null, new JcaPGPContentSignerBuilder(ecdsaKeyPair.getPublicKey().getAlgorithm(), HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256, sha1Calc).setProvider("BC").build(passPhrase)); + "test@bouncycastle.org", sha1Calc, null, null, new JcaPGPContentSignerBuilder(ecdsaKeyPair.getPublicKey().getAlgorithm(), HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256, sha1Calc).setProvider("SC").build(passPhrase)); PGPPublicKeyRing pubRing = keyRingGen.generatePublicKeyRing(); @@ -116,7 +116,7 @@ public class PGPECDSATest public void performTest() throws Exception { - PGPUtil.setDefaultProvider("BC"); + PGPUtil.setDefaultProvider("SC"); // // Read the public key @@ -127,7 +127,7 @@ public class PGPECDSATest { PGPSignature certification = (PGPSignature)it.next(); - certification.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pubKeyRing.getPublicKey()); + certification.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pubKeyRing.getPublicKey()); if (!certification.verifyCertification((String)pubKeyRing.getPublicKey().getUserIDs().next(), pubKeyRing.getPublicKey())) { diff --git a/pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/PGPKeyRingTest.java b/pg/src/test/jdk1.1/org/spongycastle/openpgp/test/PGPKeyRingTest.java index 92e6343d..0373e9e7 100644 --- a/pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/PGPKeyRingTest.java +++ b/pg/src/test/jdk1.1/org/spongycastle/openpgp/test/PGPKeyRingTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayInputStream; import java.math.BigInteger; @@ -10,38 +10,38 @@ import java.util.Iterator; import javax.crypto.Cipher; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.jce.spec.ElGamalParameterSpec; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPKeyRingGenerator; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.jcajce.JcaPGPPublicKeyRing; -import org.bouncycastle.openpgp.jcajce.JcaPGPPublicKeyRingCollection; -import org.bouncycastle.openpgp.jcajce.JcaPGPSecretKeyRingCollection; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.openpgp.operator.PGPDigestCalculatorProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyConverter; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPPrivateKey; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.Hex; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.jce.spec.ElGamalParameterSpec; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPKeyRingGenerator; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.jcajce.JcaPGPPublicKeyRing; +import org.spongycastle.openpgp.jcajce.JcaPGPPublicKeyRingCollection; +import org.spongycastle.openpgp.jcajce.JcaPGPSecretKeyRingCollection; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.openpgp.operator.PGPDigestCalculatorProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyConverter; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPPrivateKey; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.test.SimpleTest; public class PGPKeyRingTest extends SimpleTest @@ -1515,12 +1515,12 @@ public class PGPKeyRingTest if (k.getKeyID() == -4049084404703773049L || k.getKeyID() == -1413891222336124627L) { - k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(sec2pass1)); + k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(sec2pass1)); } else if (k.getKeyID() == -6498553574938125416L || k.getKeyID() == 59034765524361024L) { - k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(sec2pass2)); + k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(sec2pass2)); } } @@ -1610,7 +1610,7 @@ public class PGPKeyRingTest PGPSecretKey k = (PGPSecretKey)it.next(); - k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(sec3pass1)); + k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(sec3pass1)); } if (keyCount != 2) @@ -1656,7 +1656,7 @@ public class PGPKeyRingTest PGPSecretKey k = (PGPSecretKey)it.next(); - k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(sec3pass1)); + k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(sec3pass1)); } if (keyCount != 2) @@ -1762,7 +1762,7 @@ public class PGPKeyRingTest PGPSecretKey k = (PGPSecretKey)it.next(); - k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(sec5pass1)); + k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(sec5pass1)); } if (keyCount != 2) @@ -1781,7 +1781,7 @@ public class PGPKeyRingTest { try { - Cipher.getInstance("IDEA", "BC"); + Cipher.getInstance("IDEA", "SC"); return false; } @@ -1859,7 +1859,7 @@ public class PGPKeyRingTest fail("wrong number of revocations in test7."); } - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), masterKey); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), masterKey); if (!sig.verifyCertification(masterKey)) { @@ -1900,7 +1900,7 @@ public class PGPKeyRingTest fail("wrong signature found"); } - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), masterKey); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), masterKey); if (!sig.verifyCertification(masterKey, k)) { @@ -1981,7 +1981,7 @@ public class PGPKeyRingTest PGPSecretKey k = (PGPSecretKey)it.next(); - k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(sec8pass)); + k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(sec8pass)); } if (keyCount != 2) @@ -2027,7 +2027,7 @@ public class PGPKeyRingTest PGPSecretKey k = (PGPSecretKey)it.next(); - PGPPrivateKey pKey = k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(sec9pass)); + PGPPrivateKey pKey = k.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(sec9pass)); if (keyCount == 1 && pKey != null) { fail("primary secret key found, null expected"); @@ -2090,7 +2090,7 @@ public class PGPKeyRingTest throws Exception { char[] passPhrase = "hello".toCharArray(); - KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", "BC"); + KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", "SC"); dsaKpg.initialize(512); @@ -2100,7 +2100,7 @@ public class PGPKeyRingTest // KeyPair dsaKp = dsaKpg.generateKeyPair(); - KeyPairGenerator elgKpg = KeyPairGenerator.getInstance("ELGAMAL", "BC"); + KeyPairGenerator elgKpg = KeyPairGenerator.getInstance("ELGAMAL", "SC"); BigInteger g = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16); BigInteger p = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16); @@ -2116,14 +2116,14 @@ public class PGPKeyRingTest PGPKeyPair elgKeyPair = new JcaPGPKeyPair(PGPPublicKey.ELGAMAL_ENCRYPT, elgKp, new Date()); PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, dsaKeyPair, - "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); keyRingGen.addSubKey(elgKeyPair); PGPSecretKeyRing keyRing = keyRingGen.generateSecretKeyRing(); - keyRing.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(passPhrase)); + keyRing.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(passPhrase)); PGPPublicKeyRing pubRing = keyRingGen.generatePublicKeyRing(); @@ -2152,7 +2152,7 @@ public class PGPKeyRingTest if (sig.getKeyID() == vKey.getKeyID() && sig.getSignatureType() == PGPSignature.SUBKEY_BINDING) { - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), vKey); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), vKey); if (!sig.verifyCertification(vKey, sKey)) { @@ -2166,7 +2166,7 @@ public class PGPKeyRingTest throws Exception { char[] passPhrase = "hello".toCharArray(); - KeyPairGenerator rsaKpg = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator rsaKpg = KeyPairGenerator.getInstance("RSA", "SC"); rsaKpg.initialize(512); @@ -2179,11 +2179,11 @@ public class PGPKeyRingTest PGPKeyPair rsaKeyPair2 = new JcaPGPKeyPair(PGPPublicKey.RSA_GENERAL, rsaKp, new Date()); PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, rsaKeyPair1, - "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); PGPSecretKeyRing secRing1 = keyRingGen.generateSecretKeyRing(); PGPPublicKeyRing pubRing1 = keyRingGen.generatePublicKeyRing(); keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, rsaKeyPair2, - "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); PGPSecretKeyRing secRing2 = keyRingGen.generateSecretKeyRing(); PGPPublicKeyRing pubRing2 = keyRingGen.generatePublicKeyRing(); @@ -2218,7 +2218,7 @@ public class PGPKeyRingTest throws Exception { char[] passPhrase = "hello".toCharArray(); - KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", "BC"); + KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", "SC"); dsaKpg.initialize(512); @@ -2228,7 +2228,7 @@ public class PGPKeyRingTest // KeyPair dsaKp = dsaKpg.generateKeyPair(); - KeyPairGenerator elgKpg = KeyPairGenerator.getInstance("ELGAMAL", "BC"); + KeyPairGenerator elgKpg = KeyPairGenerator.getInstance("ELGAMAL", "SC"); BigInteger g = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16); BigInteger p = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16); @@ -2244,14 +2244,14 @@ public class PGPKeyRingTest PGPKeyPair elgKeyPair = new JcaPGPKeyPair(PGPPublicKey.ELGAMAL_ENCRYPT, elgKp, new Date()); PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, dsaKeyPair, - "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + "test", sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.DSA, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); keyRingGen.addSubKey(elgKeyPair); PGPSecretKeyRing keyRing = keyRingGen.generateSecretKeyRing(); - keyRing.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("BC").build(passPhrase)); + keyRing.getSecretKey().extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider("SC").build(passPhrase)); if (!keyRing.getSecretKey().getPublicKey().equals(keyRing.getPublicKey())) { @@ -2296,7 +2296,7 @@ public class PGPKeyRingTest if (sig.getKeyID() == vKey.getKeyID() && sig.getSignatureType() == PGPSignature.SUBKEY_BINDING) { - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), vKey); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), vKey); if (!sig.verifyCertification(vKey, sKey)) { @@ -2348,7 +2348,7 @@ public class PGPKeyRingTest pgpPriv = PGPSecretKeyRing.removeSecretKey(pgpPriv, pgpKey); pgpKey = PGPSecretKey.copyWithNewPassword( pgpKey, - new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(rewrapPass), + new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(rewrapPass), null); pgpPriv = PGPSecretKeyRing.insertSecretKey(pgpPriv, pgpKey); @@ -2373,11 +2373,11 @@ public class PGPKeyRingTest pgpKey = PGPSecretKey.copyWithNewPassword( pgpKey, null, - new JcePBESecretKeyEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).setProvider("BC").build(newPass)); + new JcePBESecretKeyEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).setProvider("SC").build(newPass)); pgpPriv = PGPSecretKeyRing.insertSecretKey(pgpPriv, pgpKey); // this should succeed - PGPPrivateKey privTmp = pgpKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(newPass)); + PGPPrivateKey privTmp = pgpKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(newPass)); if (pgpKey.getKeyID() != oldKeyID) { @@ -2413,7 +2413,7 @@ public class PGPKeyRingTest pgpKey = PGPSecretKey.copyWithNewPassword( pgpKey, - new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(v3KeyPass), + new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(v3KeyPass), null); pgpPriv = PGPSecretKeyRing.insertSecretKey(pgpPriv, pgpKey); @@ -2438,11 +2438,11 @@ public class PGPKeyRingTest pgpKey = PGPSecretKey.copyWithNewPassword( pgpKey, null, - new JcePBESecretKeyEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5, new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build().get(HashAlgorithmTags.MD5)).setProvider("BC").build(newPass)); + new JcePBESecretKeyEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5, new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build().get(HashAlgorithmTags.MD5)).setProvider("SC").build(newPass)); pgpPriv = PGPSecretKeyRing.insertSecretKey(pgpPriv, pgpKey); // this should succeed - PGPPrivateKey privTmp = pgpKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(newPass)); + PGPPrivateKey privTmp = pgpKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build()).setProvider("SC").build(newPass)); if (pgpKey.getKeyID() != oldKeyID) { @@ -2468,7 +2468,7 @@ public class PGPKeyRingTest Iterator it = pgpPriv.getSecretKeys(); - PGPDigestCalculatorProvider calcProvider = new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build(); + PGPDigestCalculatorProvider calcProvider = new JcaPGPDigestCalculatorProviderBuilder().setProvider("SC").build(); while (it.hasNext()) { @@ -2479,7 +2479,7 @@ public class PGPKeyRingTest pgpPriv = PGPSecretKeyRing.removeSecretKey(pgpPriv, pgpKey); pgpKey = PGPSecretKey.copyWithNewPassword( pgpKey, - new JcePBESecretKeyDecryptorBuilder(calcProvider).setProvider("BC").build(rewrapPass), + new JcePBESecretKeyDecryptorBuilder(calcProvider).setProvider("SC").build(rewrapPass), null); pgpPriv = PGPSecretKeyRing.insertSecretKey(pgpPriv, pgpKey); @@ -2504,11 +2504,11 @@ public class PGPKeyRingTest pgpKey = PGPSecretKey.copyWithNewPassword( pgpKey, null, - new JcePBESecretKeyEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5, calcProvider.get(HashAlgorithmTags.MD5)).setProvider("BC").build(newPass)); + new JcePBESecretKeyEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5, calcProvider.get(HashAlgorithmTags.MD5)).setProvider("SC").build(newPass)); pgpPriv = PGPSecretKeyRing.insertSecretKey(pgpPriv, pgpKey); // this should succeed - PGPPrivateKey privTmp = pgpKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(calcProvider).setProvider("BC").build(newPass)); + PGPPrivateKey privTmp = pgpKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(calcProvider).setProvider("SC").build(newPass)); if (pgpKey.getKeyID() != oldKeyID) { @@ -2550,7 +2550,7 @@ public class PGPKeyRingTest if (sig.getSignatureType() == PGPSignature.POSITIVE_CERTIFICATION) { - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pub); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pub); if (!sig.verifyCertification(userID, pub)) { @@ -2562,7 +2562,7 @@ public class PGPKeyRingTest // // this is quicker because we are using pregenerated parameters. // - KeyPairGenerator rsaKpg = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator rsaKpg = KeyPairGenerator.getInstance("RSA", "SC"); KeyPair rsaKp = rsaKpg.generateKeyPair(); PGPKeyPair rsaKeyPair1 = new JcaPGPKeyPair(PGPPublicKey.RSA_GENERAL, rsaKp, new Date()); rsaKp = rsaKpg.generateKeyPair(); @@ -2570,7 +2570,7 @@ public class PGPKeyRingTest char[] passPhrase = "passwd".toCharArray(); PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, rsaKeyPair1, - userID, sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build(passPhrase)); + userID, sha1Calc, null, null, new JcaPGPContentSignerBuilder(PGPPublicKey.RSA_SIGN, HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("SC").build(passPhrase)); PGPPublicKeyRing pubRing1 = keyRingGen.generatePublicKeyRing(); @@ -2583,7 +2583,7 @@ public class PGPKeyRingTest if (sig.getSignatureType() == PGPSignature.POSITIVE_CERTIFICATION) { - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pub); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pub); if (!sig.verifyCertification(userID, pub)) { @@ -2676,7 +2676,7 @@ public class PGPKeyRingTest PGPSignature sig = (PGPSignature)it.next(); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pubKey); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pubKey); if (!sig.verifyCertification(rawID, pubKey)) { @@ -2687,7 +2687,7 @@ public class PGPKeyRingTest public void testNoExportPrivateKey() throws Exception { - KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSA", "SC"); kpGen.initialize(1024); @@ -2718,7 +2718,7 @@ public class PGPKeyRingTest { PGPSignature sig = (PGPSignature)it.next(); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pubKey); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pubKey); if (!sig.verifyCertification("test", pubKey)) { diff --git a/pg/src/test/jdk1.3/org/bouncycastle/openpgp/test/AllTests.java b/pg/src/test/jdk1.3/org/spongycastle/openpgp/test/AllTests.java index 7ca7f57d..e7469c0f 100644 --- a/pg/src/test/jdk1.3/org/bouncycastle/openpgp/test/AllTests.java +++ b/pg/src/test/jdk1.3/org/spongycastle/openpgp/test/AllTests.java @@ -1,12 +1,12 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.security.Security; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.util.test.SimpleTestResult; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.util.test.SimpleTestResult; public class AllTests extends TestCase @@ -15,7 +15,7 @@ public class AllTests { Security.addProvider(new BouncyCastleProvider()); - org.bouncycastle.util.test.Test[] tests = RegressionTest.tests; + org.spongycastle.util.test.Test[] tests = RegressionTest.tests; for (int i = 0; i != tests.length; i++) { diff --git a/pg/src/test/jdk1.4/org/bouncycastle/openpgp/test/PGPECDHTest.java b/pg/src/test/jdk1.4/org/spongycastle/openpgp/test/PGPECDHTest.java index e8124318..99a4053e 100644 --- a/pg/src/test/jdk1.4/org/bouncycastle/openpgp/test/PGPECDHTest.java +++ b/pg/src/test/jdk1.4/org/spongycastle/openpgp/test/PGPECDHTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.io.ByteArrayOutputStream; import java.io.InputStream; @@ -8,44 +8,44 @@ import java.security.KeyPairGenerator; import java.security.SecureRandom; import java.security.Security; import java.security.SignatureException; -import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec; +import org.spongycastle.jce.spec.ECNamedCurveGenParameterSpec; import java.util.Date; import java.util.Iterator; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPEncryptedDataList; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPKeyRingGenerator; -import org.bouncycastle.openpgp.PGPLiteralData; -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.bouncycastle.openpgp.PGPObjectFactory; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.UncloseableOutputStream; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPEncryptedDataGenerator; +import org.spongycastle.openpgp.PGPEncryptedDataList; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPKeyRingGenerator; +import org.spongycastle.openpgp.PGPLiteralData; +import org.spongycastle.openpgp.PGPLiteralDataGenerator; +import org.spongycastle.openpgp.PGPObjectFactory; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyEncryptedData; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.UncloseableOutputStream; public class PGPECDHTest extends SimpleTest @@ -88,7 +88,7 @@ public class PGPECDHTest // // Generate a master key // - KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDSA", "BC"); + KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDSA", "SC"); keyGen.initialize(new ECNamedCurveGenParameterSpec("P-256")); @@ -99,7 +99,7 @@ public class PGPECDHTest // // Generate an encryption key // - keyGen = KeyPairGenerator.getInstance("ECDH", "BC"); + keyGen = KeyPairGenerator.getInstance("ECDH", "SC"); keyGen.initialize(new ECNamedCurveGenParameterSpec("P-256")); @@ -115,7 +115,7 @@ public class PGPECDHTest PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, ecdsaKeyPair, "test@bouncycastle.org", sha1Calc, null, null, new JcaPGPContentSignerBuilder(ecdsaKeyPair.getPublicKey().getAlgorithm(), HashAlgorithmTags.SHA1), - new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256, sha1Calc).setProvider("BC").build(passPhrase)); + new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256, sha1Calc).setProvider("SC").build(passPhrase)); keyRingGen.addSubKey(ecdhKeyPair); @@ -156,7 +156,7 @@ public class PGPECDHTest // // PGPPrivateKey pgpPrivKey = secretKey.extractPrivateKey()extractPrivateKey(null); // -// clear = encP.getDataStream(pgpPrivKey, "BC"); +// clear = encP.getDataStream(pgpPrivKey, "SC"); // // bOut.reset(); // @@ -179,7 +179,7 @@ public class PGPECDHTest byte[] text = { (byte)'h', (byte)'e', (byte)'l', (byte)'l', (byte)'o', (byte)' ', (byte)'w', (byte)'o', (byte)'r', (byte)'l', (byte)'d', (byte)'!', (byte)'\n' }; - KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDH", "BC"); + KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDH", "SC"); keyGen.initialize(new ECNamedCurveGenParameterSpec("P-256")); @@ -199,9 +199,9 @@ public class PGPECDHTest ByteArrayOutputStream cbOut = new ByteArrayOutputStream(); - PGPEncryptedDataGenerator cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).setProvider("BC").setSecureRandom(new SecureRandom())); + PGPEncryptedDataGenerator cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).setProvider("SC").setSecureRandom(new SecureRandom())); - cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(ecdhKeyPair.getPublicKey()).setProvider("BC")); + cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(ecdhKeyPair.getPublicKey()).setProvider("SC")); OutputStream cOut = cPk.open(new UncloseableOutputStream(cbOut), data.length); @@ -215,7 +215,7 @@ public class PGPECDHTest PGPPublicKeyEncryptedData encP = (PGPPublicKeyEncryptedData)encList.get(0); - InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("BC").build(ecdhKeyPair.getPrivateKey())); + InputStream clear = encP.getDataStream(new JcePublicKeyDataDecryptorFactoryBuilder().setProvider("SC").build(ecdhKeyPair.getPrivateKey())); pgpF = new PGPObjectFactory(clear); @@ -241,7 +241,7 @@ public class PGPECDHTest public void performTest() throws Exception { - PGPUtil.setDefaultProvider("BC"); + PGPUtil.setDefaultProvider("SC"); // // Read the public key @@ -287,7 +287,7 @@ public class PGPECDHTest { PGPSignature certification = (PGPSignature)sigIt.next(); - certification.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pubKeyRing.getPublicKey()); + certification.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pubKeyRing.getPublicKey()); if (!certification.verifyCertification((String)pubKeyRing.getPublicKey().getUserIDs().next(), pubKeyRing.getPublicKey())) { diff --git a/pg/src/test/jdk1.4/org/bouncycastle/openpgp/test/PGPECDSATest.java b/pg/src/test/jdk1.4/org/spongycastle/openpgp/test/PGPECDSATest.java index 71826e5d..94c82756 100644 --- a/pg/src/test/jdk1.4/org/bouncycastle/openpgp/test/PGPECDSATest.java +++ b/pg/src/test/jdk1.4/org/spongycastle/openpgp/test/PGPECDSATest.java @@ -1,34 +1,34 @@ -package org.bouncycastle.openpgp.test; +package org.spongycastle.openpgp.test; import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.Security; -import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec; +import org.spongycastle.jce.spec.ECNamedCurveGenParameterSpec; import java.util.Date; import java.util.Iterator; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPEncryptedData; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPKeyRingGenerator; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPSecretKeyRing; -import org.bouncycastle.openpgp.PGPSignature; -import org.bouncycastle.openpgp.PGPSignatureGenerator; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair; -import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openpgp.PGPEncryptedData; +import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPKeyRingGenerator; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPUtil; +import org.spongycastle.openpgp.operator.KeyFingerPrintCalculator; +import org.spongycastle.openpgp.operator.PGPDigestCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; +import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair; +import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; public class PGPECDSATest extends SimpleTest @@ -56,7 +56,7 @@ public class PGPECDSATest private void generateAndSign() throws Exception { - KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDSA", "BC"); + KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDSA", "SC"); keyGen.initialize(new ECNamedCurveGenParameterSpec("P-256")); @@ -67,7 +67,7 @@ public class PGPECDSATest // // try a signature // - PGPSignatureGenerator signGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.ECDSA, HashAlgorithmTags.SHA256).setProvider("BC")); + PGPSignatureGenerator signGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(PGPPublicKey.ECDSA, HashAlgorithmTags.SHA256).setProvider("SC")); signGen.init(PGPSignature.BINARY_DOCUMENT, ecdsaKeyPair.getPrivateKey()); @@ -75,7 +75,7 @@ public class PGPECDSATest PGPSignature sig = signGen.generate(); - sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), ecdsaKeyPair.getPublicKey()); + sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), ecdsaKeyPair.getPublicKey()); sig.update("hello world!".getBytes()); @@ -90,7 +90,7 @@ public class PGPECDSATest char[] passPhrase = "test".toCharArray(); PGPDigestCalculator sha1Calc = new JcaPGPDigestCalculatorProviderBuilder().build().get(HashAlgorithmTags.SHA1); PGPKeyRingGenerator keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, ecdsaKeyPair, - "test@bouncycastle.org", sha1Calc, null, null, new JcaPGPContentSignerBuilder(ecdsaKeyPair.getPublicKey().getAlgorithm(), HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256, sha1Calc).setProvider("BC").build(passPhrase)); + "test@bouncycastle.org", sha1Calc, null, null, new JcaPGPContentSignerBuilder(ecdsaKeyPair.getPublicKey().getAlgorithm(), HashAlgorithmTags.SHA1), new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256, sha1Calc).setProvider("SC").build(passPhrase)); PGPPublicKeyRing pubRing = keyRingGen.generatePublicKeyRing(); @@ -116,7 +116,7 @@ public class PGPECDSATest public void performTest() throws Exception { - PGPUtil.setDefaultProvider("BC"); + PGPUtil.setDefaultProvider("SC"); // // Read the public key @@ -127,7 +127,7 @@ public class PGPECDSATest { PGPSignature certification = (PGPSignature)it.next(); - certification.init(new JcaPGPContentVerifierBuilderProvider().setProvider("BC"), pubKeyRing.getPublicKey()); + certification.init(new JcaPGPContentVerifierBuilderProvider().setProvider("SC"), pubKeyRing.getPublicKey()); if (!certification.verifyCertification((String)pubKeyRing.getPublicKey().getUserIDs().next(), pubKeyRing.getPublicKey())) { diff --git a/pg/src/test/resources/org/bouncycastle/openpgp/test/bigpub.asc b/pg/src/test/resources/org/spongycastle/openpgp/test/bigpub.asc index a3b0766c..a3b0766c 100644 --- a/pg/src/test/resources/org/bouncycastle/openpgp/test/bigpub.asc +++ b/pg/src/test/resources/org/spongycastle/openpgp/test/bigpub.asc |