diff options
Diffstat (limited to 'pg/src/test/java')
| -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 |
26 files changed, 865 insertions, 865 deletions
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++) { |