Check if save_iv is not null in CryptoDevTransform before copying. Us…

…ing PtrToStringAuto in OpenSslUtil.
mono · Sep 25, 2013 · bdec80a · bdec80a
1 parent 937ed08
commit bdec80a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/class/Crimson.CryptoDev/Crimson.CryptoDev/CryptoDevTransform.cs b/class/Crimson.CryptoDev/Crimson.CryptoDev/CryptoDevTransform.cs
@@ -104,7 +104,7 @@ protected override void Transform (byte[] input, int inputOffset, byte[] output,
 				fixed (byte *v = iv)
 				fixed (byte *i = &input [inputOffset])
 				fixed (byte *o = &output [outputOffset]) {
-					if (iv != null) {
+					if (save_iv != null) {
 						context.iv = (IntPtr) v;
 
 						if (!encrypt) {
@@ -127,7 +127,7 @@ protected override void Transform (byte[] input, int inputOffset, byte[] output,
 					}
 				}
 
-				if (iv != null) {
+				if (save_iv != null) {
 					if (encrypt)
 						Buffer.BlockCopy (output, outputOffset + size - BlockSizeByte, iv, 0, BlockSizeByte);
 					else

diff --git a/class/Crimson.OpenSsl/Crimson.OpenSsl/OpenSslUtil.cs b/class/Crimson.OpenSsl/Crimson.OpenSsl/OpenSslUtil.cs
@@ -55,7 +55,7 @@ public static void EnsureAvailability()
 
 		public static string GetVersionInfo()
 		{
-			return Marshal.PtrToStringUni(Native.SSLeay_version (Native.SSLEAY_VERSION));
+			return Marshal.PtrToStringAuto(Native.SSLeay_version (Native.SSLEAY_VERSION));
 		}
 	}
 }