From 3508df1c16d9ea86dc0324315500e16ae6482ee5 Mon Sep 17 00:00:00 2001
From: Adam Johnson <AdamJohnso@gmail.com>
Date: Sat, 7 Jan 2012 23:54:38 -0500
Subject: [PATCH] Allow computing md5 hashes from hsStream derived classes

---
 .../PubUtilLib/plEncryption/plChecksum.cpp    | 36 ++++++++++++-------
 .../PubUtilLib/plEncryption/plChecksum.h      |  4 +++
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/Sources/Plasma/PubUtilLib/plEncryption/plChecksum.cpp b/Sources/Plasma/PubUtilLib/plEncryption/plChecksum.cpp
index aa5fb562..1da87266 100644
--- a/Sources/Plasma/PubUtilLib/plEncryption/plChecksum.cpp
+++ b/Sources/Plasma/PubUtilLib/plEncryption/plChecksum.cpp
@@ -91,31 +91,43 @@ plMD5Checksum::plMD5Checksum( const char *fileName )
     CalcFromFile( fileName );
 }
 
+plMD5Checksum::plMD5Checksum( hsStream* stream )
+{
+    CalcFromStream(stream);
+}
+
 void plMD5Checksum::Clear()
 {
     memset( fChecksum, 0, sizeof( fChecksum ) );
     fValid = false;
 }
 
-void    plMD5Checksum::CalcFromFile( const char *fileName)
+void    plMD5Checksum::CalcFromFile( const char *fileName )
 {
-    FILE *fp;
+    hsUNIXStream s;
     fValid = false;
     
-    if( fp = fopen(fileName, "rb" ) )
+    if( s.Open(fileName) )
     {
-        unsigned loadLen = 1024 * 1024;
-        Start();
+        CalcFromStream(&s);
+        s.Close();
+    }
+}
 
-        UInt8 *buf = TRACKED_NEW UInt8[loadLen];
+void plMD5Checksum::CalcFromStream( hsStream* stream )
+{
+    UInt32 sPos = stream->GetPosition();
+    unsigned loadLen = 1024 * 1024;
+    Start();
+
+    UInt8 *buf = TRACKED_NEW UInt8[loadLen];
     
-        while(int read = fread(buf, sizeof(UInt8), loadLen, fp))
-            AddTo( read, buf );
-        delete[] buf;
+    while(int read = stream->Read(loadLen, buf))
+        AddTo( read, buf );
+    delete[] buf;
 
-        Finish();
-        fclose(fp);
-    }
+    Finish();
+    stream->SetPosition(sPos);
 }
 
 void    plMD5Checksum::Start( void )
diff --git a/Sources/Plasma/PubUtilLib/plEncryption/plChecksum.h b/Sources/Plasma/PubUtilLib/plEncryption/plChecksum.h
index 2f91f6cc..04d3290e 100644
--- a/Sources/Plasma/PubUtilLib/plEncryption/plChecksum.h
+++ b/Sources/Plasma/PubUtilLib/plEncryption/plChecksum.h
@@ -58,6 +58,8 @@ public:
     SumStorage GetChecksum() { return fSum; }
 };
 
+class hsStream;
+
 class plMD5Checksum 
 {
     protected:
@@ -74,11 +76,13 @@ class plMD5Checksum
         plMD5Checksum();
         plMD5Checksum( const plMD5Checksum &rhs );
         plMD5Checksum( const char *fileName );
+        plMD5Checksum( hsStream* stream );
 
         hsBool  IsValid( void ) const { return fValid; }
         void    Clear();
 
         void    CalcFromFile( const char *fileName );
+        void    CalcFromStream( hsStream* stream );
 
         void    Start( void );
         void    AddTo( UInt32 size, const UInt8 *buffer );