1 files changed, 34 insertions, 13 deletions

diff --git a/src/md5.cpp b/src/md5.cpp
index 14b244a..8d7b7c9 100644
--- a/src/md5.cpp
+++ b/src/md5.cpp
@@ -9,6 +9,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "md5.h"
+#include "bu/stream.h"
+
 
 // This performs a wrapping bitwise shift, kinda' fun!
 
@@ -84,11 +86,39 @@ void Bu::Md5::addData( const void *sVData, int iSize )
 
 Bu::FString Bu::Md5::getResult()
 {
+        long lsum[4];
+        compCap( lsum );
+        return Bu::FString( (const char *)lsum, 4*4 );
+}
+
+void Bu::Md5::writeResult( Bu::Stream &sOut )
+{
+        long lsum[4];
+        compCap( lsum );
+        sOut.write( lsum, 4*4 );
+}
+
+Bu::FString Bu::Md5::getHexResult()
+{
         static const char hex_tab[] = {"0123456789abcdef"};
         char str[33];
 
         long lsum[4];
-        memcpy( lsum, sum, 4*4 );
+        compCap( lsum );
+        
+        int k = 0;
+        for( int i = 0; i < 16; i++ )
+        {
+                str[k++] = hex_tab[(lsum[i>>2] >> ((i%4)*8+4)) & 0xF];
+                str[k++] = hex_tab[(lsum[i>>2] >> ((i%4)*8  )) & 0xF];
+        }
+
+        return Bu::FString( str, 32 );
+}
+
+void Bu::Md5::compCap( long *sumout )
+{
+        memcpy( sumout, sum, 4*4 );
         long lbuf[16];
         memcpy( lbuf, inbuf, 4*16 );
 
@@ -96,25 +126,16 @@ Bu::FString Bu::Md5::getResult()
         uint64_t iBits = iBytes*8;
         if( iBytes > 0 && iFill>>2 >= 14 )
         {
-                compBlock( lbuf, lsum );
+                compBlock( lbuf, sumout );
                 memset( lbuf, 0, 4*16 );
                 memcpy( lbuf+14, &iBits, 8 );
-                compBlock( lbuf, lsum );
+                compBlock( lbuf, sumout );
         }
         else
         {
                 memcpy( lbuf+14, &iBits, 8 );
-                compBlock( lbuf, lsum );
+                compBlock( lbuf, sumout );
         }
-        
-        int k = 0;
-        for( int i = 0; i < 16; i++ )
-        {
-                str[k++] = hex_tab[(lsum[i>>2] >> ((i%4)*8+4)) & 0xF];
-                str[k++] = hex_tab[(lsum[i>>2] >> ((i%4)*8  )) & 0xF];
-        }
-
-        return Bu::FString( str, 32 );
 }
 
 void Bu::Md5::compBlock( long *x, long *lsum )