Minor updates to the List class, unchecked corner cases.

The CsvWriter now writes csv.  It understands both excel formatting and c-style,
which I made up myself (it's just c-style escape sequences).
Sha1 is converted to work with the CryptoHash API and it does indeed work.

1 files changed, 36 insertions, 33 deletions

diff --git a/src/sha1.h b/src/sha1.h
index 184ba1e..6c6ee37 100644
--- a/src/sha1.h
+++ b/src/sha1.h
@@ -5,45 +5,48 @@
  * terms of the license contained in the file LICENSE.

  */

 

-/* sha1.h

-

-Copyright (c) 2005 Michael D. Leonhard

-

-http://tamale.net/

-

-This file is licensed under the terms described in the

-accompanying LICENSE file.

-*/

-

 #ifndef SHA1_H

 #define SHA1_H

 

 #include <stdint.h>

+#include "bu/cryptohash.h"

 

-/**

- * Calculates SHA-1 sums.  This is based strongly on code from Michael D.

- * Leonhard who released his code under the terms of the MIT license, thank you!

- */

-class Sha1

+namespace Bu

 {

-public:

-        Sha1();

-        ~Sha1();

-

-        void update( const char* data, int num );

-        unsigned char* getDigest();

-

-        // utility methods

-        static uint32_t lrot( uint32_t x, int bits );

-        static void toBigEndian( uint32_t in, unsigned char* out );

-

-private:

-        // fields

-        uint32_t H0, H1, H2, H3, H4;

-        unsigned char bytes[64];

-        int unprocessedBytes;

-        uint32_t size;

-        void process();

+        /**

+         * Calculates SHA-1 sums.  This is based strongly on code from Michael D.

+         * Leonhard who released his code under the terms of the MIT license,

+         * thank you!  Check out his website http://tamale.net he has a lot of

+         * cool stuff there.

+         */

+        class Sha1 : public CryptoHash

+        {

+        public:

+                Sha1();

+                ~Sha1();

+

+                virtual void reset();

+                virtual void setSalt( const Bu::FString &sSalt );

+                virtual void addData( const void *sData, int iSize );

+                virtual FString getResult();

+                virtual void writeResult( Stream &sOut );

+

+                void update( const char* data, int num );

+                unsigned char* getDigest();

+

+                // utility methods

+

+        private:

+                static uint32_t lrot( uint32_t x, int bits );

+                static void toBigEndian( uint32_t in, unsigned char* out );

+                void process();

+        

+        private:

+                uint32_t uH0, uH1, uH2, uH3, uH4;

+                unsigned char uBytes[64];

+                int iUnprocessedBytes;

+                uint32_t uTotalBytes;

+        };

 };

 

 #endif