crypto: Update the REQUIREMENTS

[samba.git] / lib / crypto / sha256.c

diff --git a/lib/crypto/sha256.c b/lib/crypto/sha256.c
index a2def25814824f4dc65ff03bd142e4114d981606..02e2259f1bccaf0434e4bd7d8c94229cc0ffd959 100644 (file)
--- a/lib/crypto/sha256.c
+++ b/lib/crypto/sha256.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

-#include "includes.h"
+#include "replace.h"

 #include "sha256.h"
 
 #define Ch(x,y,z) (((x) & (y)) ^ ((~(x)) & (z)))
 #include "sha256.h"
 
 #define Ch(x,y,z) (((x) & (y)) ^ ((~(x)) & (z)))


@@ -80,7 +80,7 @@ static const uint32_t constant_256[64] = {
 };
 
 void
 };
 
 void

-SHA256_Init (SHA256_CTX *m)
+samba_SHA256_Init (SHA256_CTX *m)

 {
     m->sz[0] = 0;
     m->sz[1] = 0;
 {
     m->sz[0] = 0;
     m->sz[1] = 0;


@@ -187,9 +187,9 @@ struct x32{
 };
 
 void
 };
 
 void

-SHA256_Update (SHA256_CTX *m, const void *v, size_t len)
+samba_SHA256_Update (SHA256_CTX *m, const void *v, size_t len)

 {
 {

-    const unsigned char *p = v;
+    const unsigned char *p = (const unsigned char *)v;

     size_t old_sz = m->sz[0];
     size_t offset;
 
     size_t old_sz = m->sz[0];
     size_t offset;
 


@@ -222,7 +222,7 @@ SHA256_Update (SHA256_CTX *m, const void *v, size_t len)
 }
 
 void
 }
 
 void

-SHA256_Final (void *res, SHA256_CTX *m)
+samba_SHA256_Final (void *res, SHA256_CTX *m)

 {
     unsigned char zeros[72];
     unsigned offset = (m->sz[0] / 8) % 64;
 {
     unsigned char zeros[72];
     unsigned offset = (m->sz[0] / 8) % 64;


@@ -238,7 +238,7 @@ SHA256_Final (void *res, SHA256_CTX *m)
     zeros[dstart+2] = (m->sz[1] >> 8) & 0xff;
     zeros[dstart+1] = (m->sz[1] >> 16) & 0xff;
     zeros[dstart+0] = (m->sz[1] >> 24) & 0xff;
     zeros[dstart+2] = (m->sz[1] >> 8) & 0xff;
     zeros[dstart+1] = (m->sz[1] >> 16) & 0xff;
     zeros[dstart+0] = (m->sz[1] >> 24) & 0xff;

-    SHA256_Update (m, zeros, dstart + 8);
+    samba_SHA256_Update (m, zeros, dstart + 8);

     {
        int i;
        unsigned char *r = (unsigned char*)res;
     {
        int i;
        unsigned char *r = (unsigned char*)res;