PORTABLE fixes

novotnyllc · Oct 17, 2021 · 4143808 · 4143808
1 parent 4e7e7f5
commit 4143808
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/crypto/src/bcpg/BcpgInputStream.cs b/crypto/src/bcpg/BcpgInputStream.cs
@@ -196,7 +196,12 @@ public Packet ReadPacket()
             else
             {
                 PartialInputStream pis = new PartialInputStream(this, partial, bodyLen);
-                objStream = new BcpgInputStream(new BufferedStream(pis));
+#if NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE
+                Stream buf = pis;
+#else
+				Stream buf = new BufferedStream(pis);
+#endif
+                objStream = new BcpgInputStream(buf);
             }
 
             switch (tag)

diff --git a/crypto/src/tls/HandshakeMessageInput.cs b/crypto/src/tls/HandshakeMessageInput.cs
@@ -13,7 +13,11 @@ public sealed class HandshakeMessageInput
         private readonly int m_offset;
 
         internal HandshakeMessageInput(byte[] buf, int offset, int length)
+#if PORTABLE
+            : base(buf, offset, length, false)
+#else
             : base(buf, offset, length, false, true)
+#endif
         {
 #if PORTABLE
             this.m_offset = 0;

diff --git a/crypto/test/src/cmp/test/ProtectedMessageTest.cs b/crypto/test/src/cmp/test/ProtectedMessageTest.cs
@@ -73,9 +73,9 @@ public void TestNotBeforeNotAfter()
             rsaKeyPairGenerator.Init(new RsaKeyGenerationParameters(BigInteger.ValueOf(65537), new SecureRandom(), 2048, 100));
             AsymmetricCipherKeyPair rsaKeyPair = rsaKeyPairGenerator.GenerateKeyPair();
 
-            doNotBeforeNotAfterTest(rsaKeyPair, new DateTime(1, 1, 1, 0, 0, 1), new DateTime(1, 1, 1, 0, 0, 10));
-            doNotBeforeNotAfterTest(rsaKeyPair, DateTime.MinValue, new DateTime(1, 1, 1, 0, 0, 10));
-            doNotBeforeNotAfterTest(rsaKeyPair, new DateTime(1, 1, 1, 0, 0, 1), DateTime.MinValue);
+            doNotBeforeNotAfterTest(rsaKeyPair, MakeUtcDateTime(1, 1, 1, 0, 0, 1), MakeUtcDateTime(1, 1, 1, 0, 0, 10));
+            doNotBeforeNotAfterTest(rsaKeyPair, DateTime.MinValue, MakeUtcDateTime(1, 1, 1, 0, 0, 10));
+            doNotBeforeNotAfterTest(rsaKeyPair, MakeUtcDateTime(1, 1, 1, 0, 0, 1), DateTime.MinValue);
         }
 
         private void doNotBeforeNotAfterTest(AsymmetricCipherKeyPair kp, DateTime notBefore, DateTime notAfter)

diff --git a/crypto/test/src/tsp/test/NewTspTest.cs b/crypto/test/src/tsp/test/NewTspTest.cs
@@ -17,14 +17,15 @@
 using Org.BouncyCastle.Math;
 using Org.BouncyCastle.Utilities;
 using Org.BouncyCastle.Utilities.Date;
+using Org.BouncyCastle.Utilities.Test;
 using Org.BouncyCastle.X509;
 using Org.BouncyCastle.X509.Store;
 
 namespace Org.BouncyCastle.Tsp.Tests
 {
 	public class NewTspTest
 	{
-		private static DateTime UnixEpoch = new DateTime(1970, 1, 1, 0, 0, 0);
+		private static DateTime UnixEpoch = SimpleTest.MakeUtcDateTime(1970, 1, 1, 0, 0, 0);
 
 		[Test]
 		public void TestGeneral()