diff options
Diffstat (limited to 'crypto/test/src/openpgp')
-rw-r--r-- | crypto/test/src/openpgp/test/DSA2Test.cs | 2 | ||||
-rw-r--r-- | crypto/test/src/openpgp/test/PGPCompressionTest.cs | 8 | ||||
-rw-r--r-- | crypto/test/src/openpgp/test/PGPDSAElGamalTest.cs | 4 | ||||
-rw-r--r-- | crypto/test/src/openpgp/test/PGPDSATest.cs | 8 | ||||
-rw-r--r-- | crypto/test/src/openpgp/test/PGPPBETest.cs | 10 | ||||
-rw-r--r-- | crypto/test/src/openpgp/test/PGPPacketTest.cs | 2 | ||||
-rw-r--r-- | crypto/test/src/openpgp/test/PGPRSATest.cs | 2 | ||||
-rw-r--r-- | crypto/test/src/openpgp/test/PGPSignatureTest.cs | 8 |
8 files changed, 22 insertions, 22 deletions
diff --git a/crypto/test/src/openpgp/test/DSA2Test.cs b/crypto/test/src/openpgp/test/DSA2Test.cs index 54c2cb2b5..dc7dffe81 100644 --- a/crypto/test/src/openpgp/test/DSA2Test.cs +++ b/crypto/test/src/openpgp/test/DSA2Test.cs @@ -144,7 +144,7 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests sGen.Update((byte)ch); } - lGen.Close(); + lGen.Dispose(); sGen.Generate().Encode(bcOut); diff --git a/crypto/test/src/openpgp/test/PGPCompressionTest.cs b/crypto/test/src/openpgp/test/PGPCompressionTest.cs index 456cf1537..21f1616af 100644 --- a/crypto/test/src/openpgp/test/PGPCompressionTest.cs +++ b/crypto/test/src/openpgp/test/PGPCompressionTest.cs @@ -74,19 +74,19 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests if (streamClose) { - os.Close(); + os.Dispose(); } else { - cPacket.Close(); + cPacket.Dispose(); } ValidateData(data, bOut.ToArray()); try { - os.Close(); - cPacket.Close(); + os.Dispose(); + cPacket.Dispose(); } catch (Exception) { diff --git a/crypto/test/src/openpgp/test/PGPDSAElGamalTest.cs b/crypto/test/src/openpgp/test/PGPDSAElGamalTest.cs index 07c4d7eb6..a5de29622 100644 --- a/crypto/test/src/openpgp/test/PGPDSAElGamalTest.cs +++ b/crypto/test/src/openpgp/test/PGPDSAElGamalTest.cs @@ -157,11 +157,11 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests sGen.Update((byte) ch); } - lGen.Close(); + lGen.Dispose(); sGen.Generate().Encode(bcOut); - cGen.Close(); + cGen.Dispose(); // // verify Generated signature diff --git a/crypto/test/src/openpgp/test/PGPDSATest.cs b/crypto/test/src/openpgp/test/PGPDSATest.cs index 70aca8e1f..357753a3c 100644 --- a/crypto/test/src/openpgp/test/PGPDSATest.cs +++ b/crypto/test/src/openpgp/test/PGPDSATest.cs @@ -321,11 +321,11 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests sGen.Update((byte)ch); } - lGen.Close(); + lGen.Dispose(); sGen.Generate().Encode(bcOut); - cGen.Close(); + cGen.Dispose(); PgpObjectFactory pgpFact = new PgpObjectFactory(bOut.ToArray()); PgpCompressedData c1 = (PgpCompressedData)pgpFact.NextPgpObject(); @@ -446,11 +446,11 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests sGen.Update((byte)ch); } - lGen.Close(); + lGen.Dispose(); sGen.Generate().Encode(bcOut); - cGen.Close(); + cGen.Dispose(); // // verify Generated signature - canconical text diff --git a/crypto/test/src/openpgp/test/PGPPBETest.cs b/crypto/test/src/openpgp/test/PGPPBETest.cs index 6b3718ecc..db7782144 100644 --- a/crypto/test/src/openpgp/test/PGPPBETest.cs +++ b/crypto/test/src/openpgp/test/PGPPBETest.cs @@ -194,7 +194,7 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests cOut = cPk.Open(new UncloseableStream(cbOut), bOutData.Length); cOut.Write(bOutData, 0, bOutData.Length); - cPk.Close(); + cPk.Dispose(); data = DecryptMessage(cbOut.ToArray()); @@ -226,9 +226,9 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests new byte[16]); ldOut.Write(test, 0, test.Length); - lData.Close(); + lData.Dispose(); - comData.Close(); + comData.Dispose(); cbOut = new UncloseableMemoryStream(); cPk = new PgpEncryptedDataGenerator( SymmetricKeyAlgorithmTag.Cast5, rand); @@ -241,7 +241,7 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests cOut.Write(tmp, 0, tmp.Length); } - cPk.Close(); + cPk.Dispose(); data = DecryptMessage(cbOut.ToArray()); if (!Arrays.AreEqual(data, test)) @@ -261,7 +261,7 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests cOut = cPk.Open(new UncloseableStream(cbOut), new byte[16]); bOutData = bOut.ToArray(); cOut.Write(bOutData, 0, bOutData.Length); - cPk.Close(); + cPk.Dispose(); data = DecryptMessage(cbOut.ToArray()); if (!Arrays.AreEqual(data, test)) diff --git a/crypto/test/src/openpgp/test/PGPPacketTest.cs b/crypto/test/src/openpgp/test/PGPPacketTest.cs index f2b523d04..737ba6578 100644 --- a/crypto/test/src/openpgp/test/PGPPacketTest.cs +++ b/crypto/test/src/openpgp/test/PGPPacketTest.cs @@ -34,7 +34,7 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests outputStream.Write(buf, 0, i); - generator.Close(); + generator.Dispose(); PgpObjectFactory fact = new PgpObjectFactory(bOut.ToArray()); diff --git a/crypto/test/src/openpgp/test/PGPRSATest.cs b/crypto/test/src/openpgp/test/PGPRSATest.cs index fa573de65..e3ed2f021 100644 --- a/crypto/test/src/openpgp/test/PGPRSATest.cs +++ b/crypto/test/src/openpgp/test/PGPRSATest.cs @@ -363,7 +363,7 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests lOut.Write(text, 0, text.Length); - lGen.Close(); + lGen.Dispose(); byte[] bytes = bOut.ToArray(); diff --git a/crypto/test/src/openpgp/test/PGPSignatureTest.cs b/crypto/test/src/openpgp/test/PGPSignatureTest.cs index ea9df9567..2ca0aef0a 100644 --- a/crypto/test/src/openpgp/test/PGPSignatureTest.cs +++ b/crypto/test/src/openpgp/test/PGPSignatureTest.cs @@ -857,7 +857,7 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests lOut.Write(TEST_DATA, 0, TEST_DATA.Length); sGen.Update(TEST_DATA); - lGen.Close(); + lGen.Dispose(); sGen.Generate().Encode(bOut); @@ -898,7 +898,7 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests lOut.Write(data, 0, data.Length); sGen.Update(data); - lGen.Close(); + lGen.Dispose(); PgpSignature sig = sGen.Generate(); @@ -953,7 +953,7 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests lOut.Write(TEST_DATA, 0, TEST_DATA.Length); sGen.Update(TEST_DATA); - lGen.Close(); + lGen.Dispose(); sGen.Generate().Encode(bOut); @@ -993,7 +993,7 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests lOut.Write(data, 0, data.Length); sGen.Update(data); - lGen.Close(); + lGen.Dispose(); PgpSignature sig = sGen.Generate(); |