summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-08-01 19:23:29 +0200
committerStefan Metzmacher <metze@samba.org>2008-08-01 21:10:39 +0200
commit112084929e346c6d29b2628b54b5d4d1736d2531 (patch)
tree4c384fb603b8128596baaa8fb760d867b61d4402
parentb2023570c42087e375d0b4a6e9b3540cf9d4047a (diff)
downloadsamba-112084929e346c6d29b2628b54b5d4d1736d2531.tar.gz
samba-112084929e346c6d29b2628b54b5d4d1736d2531.tar.bz2
samba-112084929e346c6d29b2628b54b5d4d1736d2531.zip
lib/crypto: remove dependency to internal heimdal
metze (This used to be commit 9138fc6639fae7a5567c395254277199c89b0dcb)
-rw-r--r--source4/lib/crypto/sha256.c23
1 files changed, 21 insertions, 2 deletions
diff --git a/source4/lib/crypto/sha256.c b/source4/lib/crypto/sha256.c
index 70fe7a3099..a2def25814 100644
--- a/source4/lib/crypto/sha256.c
+++ b/source4/lib/crypto/sha256.c
@@ -39,7 +39,6 @@
*/
#include "includes.h"
-#include "heimdal/lib/hcrypto/hash.h"
#include "sha256.h"
#define Ch(x,y,z) (((x) & (y)) ^ ((~(x)) & (z)))
@@ -148,6 +147,26 @@ calc (SHA256_CTX *m, uint32_t *in)
*/
#if !defined(WORDS_BIGENDIAN) || defined(_CRAY)
+/* Vector Crays doesn't have a good 32-bit type, or more precisely,
+ int32_t as defined by <bind/bitypes.h> isn't 32 bits, and we don't
+ want to depend in being able to redefine this type. To cope with
+ this we have to clamp the result in some places to [0,2^32); no
+ need to do this on other machines. Did I say this was a mess?
+ */
+
+#ifdef _CRAY
+#define CRAYFIX(X) ((X) & 0xffffffff)
+#else
+#define CRAYFIX(X) (X)
+#endif
+
+static inline uint32_t
+cshift (uint32_t x, unsigned int n)
+{
+ x = CRAYFIX(x);
+ return CRAYFIX((x << n) | (x >> (32 - n)));
+}
+
static inline uint32_t
swap_uint32_t (uint32_t t)
{
@@ -179,7 +198,7 @@ SHA256_Update (SHA256_CTX *m, const void *v, size_t len)
++m->sz[1];
offset = (old_sz / 8) % 64;
while(len > 0){
- size_t l = min(len, 64 - offset);
+ size_t l = MIN(len, 64 - offset);
memcpy(m->save + offset, p, l);
offset += l;
p += l;