Added #if directives around AES code for CF and 1.1 frameworks

Author: David Pierson

mkDistribution.bat

@@ -6,8 +6,8 @@ if exist current (
 
 mkdir current
 
-mkdir current\netcf-10
-nant -t:netcf-1.0 -D:build.output.dir=current\netcf-10 -buildfile:sharpZLib.build build
+REM mkdir current\netcf-10
+REM nant -t:netcf-1.0 -D:build.output.dir=current\netcf-10 -buildfile:sharpZLib.build build
 
 mkdir current\netcf-20
 nant -t:netcf-2.0 -D:build.output.dir=current\netcf-20 -buildfile:sharpZLib.build build

src/BZip2/BZip2.cs

@@ -1,6 +1,6 @@
 // BZip2.cs
 //
-// Copyright (C) 2001 Mike Krueger
+// Copyright (C) 2010 David Pierson
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -33,94 +33,73 @@
 // obligated to do so.  If you do not wish to do so, delete this
 // exception statement from your version.
 
+// Suppress this in CF and 1.1, not needed. Static classes introduced in C# version 2.0
+#if !NETCF_2_0 && !NET_1_1
+
 using System;
 using System.IO;
 
-namespace ICSharpCode.SharpZipLib.BZip2
-{
+namespace ICSharpCode.SharpZipLib.BZip2 {
 
 	/// <summary>
-	/// A helper class to simplify compressing and decompressing streams.
+	/// An example class to demonstrate compression and decompression of BZip2 streams.
 	/// </summary>
-	public sealed class BZip2
+	public static class BZip2
 	{
 		/// <summary>
-		/// Decompress <paramref name="inStream">input</paramref> writing 
-		/// decompressed data to the <paramref name="outStream">output stream</paramref>
+		/// Decompress the <paramref name="inStream">input</paramref> writing 
+		/// uncompressed data to the <paramref name="outStream">output stream</paramref>
 		/// </summary>
-		/// <param name="inStream">The stream containing data to decompress.</param>
-		/// <param name="outStream">The stream to write decompressed data to.</param>
-		/// <remarks>Both streams are closed on completion</remarks>
-		public static void Decompress(Stream inStream, Stream outStream) 
+		/// <param name="inStream">The readable stream containing data to decompress.</param>
+		/// <param name="outStream">The output stream to receive the decompressed data.</param>
+		/// <param name="isStreamOwner">Both streams are closed on completion if true.</param>
+		public static void Decompress(Stream inStream, Stream outStream, bool isStreamOwner) 
 		{
-			if ( inStream == null ) {
-				throw new ArgumentNullException("inStream");
-			}
-			
-			if ( outStream == null ) {
-				throw new ArgumentNullException("outStream");
+			if (inStream == null || outStream == null) {
+				throw new Exception("Null Stream");
 			}
 
-			using ( outStream ) {
-				using ( BZip2InputStream bzis = new BZip2InputStream(inStream) ) {
-					int ch = bzis.ReadByte();
-					while (ch != -1) {
-						outStream.WriteByte((byte)ch);
-						ch = bzis.ReadByte();
-					}
+			try {
+				using (BZip2InputStream bzipInput = new BZip2InputStream(inStream)) {
+					bzipInput.IsStreamOwner = isStreamOwner;
+					Core.StreamUtils.Copy(bzipInput, outStream, new byte[4096]);
+				}
+			} finally {
+				if (isStreamOwner) {
+					// inStream is closed by the BZip2InputStream if stream owner
+					outStream.Close();
 				}
 			}
 		}
 
 		/// <summary>
-		/// Compress <paramref name="inStream">input stream</paramref> sending 
-		/// result to <paramref name="outStream">output stream</paramref>
+		/// Compress the <paramref name="inStream">input stream</paramref> sending 
+		/// result data to <paramref name="outStream">output stream</paramref>
 		/// </summary>
-		/// <param name="inStream">The stream to compress.</param>
-		/// <param name="outStream">The stream to write compressed data to.</param>
-		/// <param name="blockSize">The block size to use.</param>
-		/// <remarks>Both streams are closed on completion</remarks>
-		public static void Compress(Stream inStream, Stream outStream, int blockSize) 
-		{			
-			if ( inStream == null ) {
-				throw new ArgumentNullException("inStream");
-			}
-			
-			if ( outStream == null ) {
-				throw new ArgumentNullException("outStream");
+		/// <param name="inStream">The readable stream to compress.</param>
+		/// <param name="outStream">The output stream to receive the compressed data.</param>
+		/// <param name="isStreamOwner">Both streams are closed on completion if true.</param>
+		/// <param name="level">Block size acts as compression level (1 to 9) with 1 giving 
+		/// the lowest compression and 9 the highest.</param>
+		public static void Compress(Stream inStream, Stream outStream, bool isStreamOwner, int level) 
+		{
+			if (inStream == null || outStream == null) {
+				throw new Exception("Null Stream");
 			}
-			
-			using ( inStream ) {
-				using (BZip2OutputStream bzos = new BZip2OutputStream(outStream, blockSize)) {
-					int ch = inStream.ReadByte();
-					while (ch != -1) {
-						bzos.WriteByte((byte)ch);
-						ch = inStream.ReadByte();
-					}
+
+			try {
+				using (BZip2OutputStream bzipOutput = new BZip2OutputStream(outStream, level)) {
+					bzipOutput.IsStreamOwner = isStreamOwner;
+					Core.StreamUtils.Copy(inStream, bzipOutput, new byte[4096]);
+				}
+			} finally {
+				if (isStreamOwner) {
+					// outStream is closed by the BZip2OutputStream if stream owner
+					inStream.Close();
 				}
 			}
 		}
 
-		/// <summary>
-		/// Initialise a default instance of this class.
-		/// </summary>
-		BZip2()
-		{
-		}
 	}
 }
-
-/* derived from a file which contained this license :
- * Copyright (c) 1999-2001 Keiron Liddle, Aftex Software
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
-*/
+#endif

src/Encryption/ZipAESStream.cs

@@ -35,7 +35,7 @@
 // exception statement from your version.
 // 
 
-#if !NETCF_1_0
+#if !NET_1_1 && !NETCF_2_0
 
 using System;
 using System.IO;

src/Encryption/ZipAESTransform.cs

@@ -35,7 +35,8 @@
 // exception statement from your version.
 //
 
-#if !NETCF_1_0
+#if !NET_1_1 && !NETCF_2_0
+// Framework version 2.0 required for Rfc2898DeriveBytes 
 
 using System;
 using System.Security.Cryptography;
@@ -47,7 +48,7 @@ namespace ICSharpCode.SharpZipLib.Encryption {
 	/// </summary>
 	public class ZipAESTransform : ICryptoTransform {
 
-		public const int PWD_VER_LENGTH = 2;
+		private const int PWD_VER_LENGTH = 2;
 
 		// WinZip use iteration count of 1000 for PBKDF2 key generation
 		private const int KEY_ROUNDS = 1000;
@@ -88,7 +89,6 @@ public ZipAESTransform(string key, byte[] saltBytes, int blockSize, bool writeMo
 			_encryptBuffer = new byte[_blockSize];
 			_encrPos = ENCRYPT_BLOCK;
 
-			// Needs .NET Framework version 2.0
 			// Performs the equivalent of derive_key in Dr Brian Gladman's pwd2key.c
 			Rfc2898DeriveBytes pdb = new Rfc2898DeriveBytes(key, saltBytes, KEY_ROUNDS);
 			RijndaelManaged rm = new RijndaelManaged();
@@ -103,10 +103,6 @@ public ZipAESTransform(string key, byte[] saltBytes, int blockSize, bool writeMo
 			_writeMode = writeMode;
 		}
 
-		public void Dispose() {
-			_encryptor.Dispose();
-		}
-
 		/// <summary>
 		/// Implement the ICryptoTransform method.
 		/// </summary>
@@ -141,56 +137,83 @@ public int TransformBlock(byte[] inputBuffer, int inputOffset, int inputCount, b
 			return inputCount;
 		}
 
+		/// <summary>
+		/// Returns the 2 byte password verifier
+		/// </summary>
+		public byte[] PwdVerifier {
+			get {
+				return _pwdVerifier;
+			}
+		}
+
+		/// <summary>
+		/// Returns the 10 byte AUTH CODE to be checked or appended immediately following the AES data stream.
+		/// </summary>
+		public byte[] GetAuthCode() {
+			// We usually don't get advance notice of final block. Hash requres a TransformFinal.
+			if (!_finalised) {
+				byte[] dummy = new byte[0];
+				_hmacsha1.TransformFinalBlock(dummy, 0, 0);
+				_finalised = true;
+			}
+			return _hmacsha1.Hash;
+		}
+
+		#region ICryptoTransform Members
+
+		/// <summary>
+		/// Not implemented.
+		/// </summary>
 		public byte[] TransformFinalBlock(byte[] inputBuffer, int inputOffset, int inputCount) {
 
 			throw new NotImplementedException("ZipAESTransform.TransformFinalBlock");
 		}
 
+		/// <summary>
+		/// Gets the size of the input data blocks in bytes.
+		/// </summary>
 		public int InputBlockSize {
 			get {
 				return _blockSize;
 			}
 		}
 
+		/// <summary>
+		/// Gets the size of the output data blocks in bytes.
+		/// </summary>
 		public int OutputBlockSize {
 			get {
 				return _blockSize;
 			}
 		}
 
+		/// <summary>
+		/// Gets a value indicating whether multiple blocks can be transformed.
+		/// </summary>
 		public bool CanTransformMultipleBlocks {
 			get {
 				return true;
 			}
 		}
 
+		/// <summary>
+		/// Gets a value indicating whether the current transform can be reused.
+		/// </summary>
 		public bool CanReuseTransform {
 			get {
 				return true;
 			}
 		}
 
 		/// <summary>
-		/// Returns the 2 byte password verifier
+		/// Cleanup internal state.
 		/// </summary>
-		public byte[] PwdVerifier {
-			get {
-				return _pwdVerifier;
-			}
+		public void Dispose() {
+			_encryptor.Dispose();
 		}
 
-		/// <summary>
-		/// Returns the 10 byte AUTH CODE to be checked or appended immediately following the AES data stream.
-		/// </summary>
-		public byte[] GetAuthCode() {
-			// We usually don't get advance notice of final block. Hash requres a TransformFinal.
-			if (!_finalised) {
-				byte[] dummy = new byte[0];
-				_hmacsha1.TransformFinalBlock(dummy, 0, 0);
-				_finalised = true;
-			}
-			return _hmacsha1.Hash;
-		}
+		#endregion
+
 	}
 }
 #endif