Merge pull request #42 from slowriot/master

SHA1 library: fixing incorrect buffer size allocation, and unsafe integer size type

1 files changed, 22 insertions, 23 deletions

diff --git a/libs/sha1/sha1.h b/libs/sha1/sha1.h
index 15edee12e..f6a03e735 100644
--- a/libs/sha1/sha1.h
+++ b/libs/sha1/sha1.h
@@ -1,27 +1,29 @@
 /*
     sha1.h - header of
- 
+
     ============
     SHA-1 in C++
     ============
- 
+
     100% Public Domain.
- 
+
     Original C Code
         -- Steve Reid <steve@edmweb.com>
     Small changes to fit into bglibs
         -- Bruce Guenter <bruce@untroubled.org>
     Translation to simpler C++ Code
         -- Volker Grabsch <vog@notjusthosting.com>
+    Fixing bugs and improving style
+        -- Eugene Hopkinson <slowriot at voxelstorm dot com>
 */
- 
+
 #ifndef SHA1_HPP
 #define SHA1_HPP
- 
- 
+
+
 #include <iostream>
 #include <string>
- 
+
 class SHA1
 {
 public:
@@ -30,28 +32,25 @@ public:
     void update(std::istream &is);
     std::string final();
     static std::string from_file(const std::string &filename);
- 
+
 private:
-    typedef unsigned long int uint32;   /* just needs to be at least 32bit */
-    typedef unsigned long long uint64;  /* just needs to be at least 64bit */
- 
     static const unsigned int DIGEST_INTS = 5;  /* number of 32bit integers per SHA1 digest */
     static const unsigned int BLOCK_INTS = 16;  /* number of 32bit integers per SHA1 block */
     static const unsigned int BLOCK_BYTES = BLOCK_INTS * 4;
- 
-    uint32 digest[DIGEST_INTS];
+
+    uint32_t digest[DIGEST_INTS];
     std::string buffer;
-    uint64 transforms;
- 
+    uint64_t transforms;
+
     void reset();
-    void transform(uint32 block[BLOCK_BYTES]);
- 
-    static void buffer_to_block(const std::string &buffer, uint32 block[BLOCK_BYTES]);
-    static void read(std::istream &is, std::string &s, int max);
+    void transform(uint32_t block[BLOCK_BYTES]);
+
+    static void read(std::istream &is, std::string &s, size_t max);
+    static void buffer_to_block(const std::string &buffer, uint32_t block[BLOCK_INTS]);
 };
- 
+
 std::string sha1(const std::string &string);
- 
- 
- 
+
+
+
 #endif /* SHA1_HPP */