decode_base64: Allow '=' padding character

[minetest.git] / src / util / sha1.cpp

diff --git a/src/util/sha1.cpp b/src/util/sha1.cpp
index c04b6c0c039f8e7e02d482a4cde15569c72f86ac..d61b262afef97d2fc04685c54d567d5a02d409d8 100644 (file)
--- a/src/util/sha1.cpp
+++ b/src/util/sha1.cpp
@@ -24,10 +24,10 @@ SOFTWARE.
 
 */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <cassert>
 
 #include "sha1.h"
 
@@ -96,7 +96,7 @@ void SHA1::process()
                                                                        +(bytes[t*4 + 2] << 8)
                                                                        + bytes[t*4 + 3];
        for(; t< 80; t++ ) W[t] = lrot( W[t-3]^W[t-8]^W[t-14]^W[t-16], 1 );
-       
+
        /* main loop */
        Uint32 temp;
        for( t = 0; t < 80; t++ )
@@ -154,7 +154,7 @@ void SHA1::addBytes( const char* data, int num )
                num -= toCopy;
                data += toCopy;
                unprocessedBytes += toCopy;
-               
+
                // there is a full block
                if( unprocessedBytes == 64 ) process();
        }
@@ -168,7 +168,7 @@ unsigned char* SHA1::getDigest()
        Uint32 totalBitsH = size >> 29;
        // add 0x80 to the message
        addBytes( "\x80", 1 );
-       
+
        unsigned char footer[64] = {
                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,