Don't use htonl(); it doesn't exist under Windows. Instead do the

test by casting a pointer to an integer to a char *.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8259 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/crypto/sha/ChangeLog b/src/lib/crypto/sha/ChangeLog
index 3ded41a010ea5483893e7de87037d76c49fbea7a..6573f253c28a2593343ede4ee8b26f130219f7c0 100644 (file)
--- a/src/lib/crypto/sha/ChangeLog
+++ b/src/lib/crypto/sha/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun  6 15:43:26 1996  Theodore Y. Ts'o  <tytso@mit.edu>
+
+       * shs.c (longReverse): Don't use htonl(); it doesn't exist under
+               Windows.  Instead do the test by casting a pointer to an
+               integer to a char *.
+
 Mon May 20 17:15:32 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
        * t_shs.c (main): Don't do timing tests; it takes too long!

diff --git a/src/lib/crypto/sha/shs.c b/src/lib/crypto/sha/shs.c
index 2b2f9bf97055272a7ecf54cccfa988976ccecec8..1dc134c580c2e914250f5fe679f468ec3e5a0105 100644 (file)
--- a/src/lib/crypto/sha/shs.c
+++ b/src/lib/crypto/sha/shs.c
@@ -1,5 +1,5 @@
 #include <sys/types.h>
-#include <netinet/in.h>
+#include <string.h>
 #include "shs.h"
 
 /* The SHS f()-functions.  The f1 and f3 functions can be optimized to
@@ -48,10 +48,11 @@
    for this information */
 
 #ifdef NEW_SHS
-#define expand(W,i) ( W[ i & 15 ] = ROTL( 1, ( W[ i & 15 ] ^ W[ i - 14 & 15 ] ^ \
-                                                 W[ i - 8 & 15 ] ^ W[ i - 3 & 15 ] ) ) )
+#define expand(W,i) ( W[ i & 15 ] = ROTL( 1, ( W[ i & 15 ] ^ W[ (i - 14) & 15 ] ^ \
+                                                 W[ (i - 8) & 15 ] ^ W[ (i - 3) & 15 ] )))
 #else
-#define expand(W,i) ( W[ i & 15 ] ^= W[ i - 14 & 15 ] ^ W[ i - 8 & 15 ] ^ W[ i - 3 & 15 ] )
+#define expand(W,i) ( W[ i & 15 ] ^= W[ (i - 14) & 15 ] ^ \
+                     W[ (i - 8) & 15 ] ^ W[ (i - 3) & 15 ] )
 #endif /* NEW_SHS */
 
 /* The prototype SHS sub-round.  The fundamental sub-round is:
@@ -214,10 +215,12 @@ void longReverse( LONG *buffer, int byteCount )
 {
     LONG value;
     static int init = 0;
+    char *cp;
 
     switch (init) {
     case 0:
-       if (htonl(1) != 1) {
+       cp = (char *) &init;
+       if (*cp == 1) {
            init=2;
            break;
        }