des-warnings-cleanup-20010514

clean up some more warnings from des

diff --git a/src/des/Makefile b/src/des/Makefile
index 9e1a1b5..5cb0fc2 100644 (file)
--- a/src/des/Makefile
+++ b/src/des/Makefile
@@ -400,6 +400,8 @@ key_test.o:
        ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/key_test.c
 testit.o:
        ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/testit.c
+crypt.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/crypt.c
 des.o:
        ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/des.c
 cbc_encrypt.o:

diff --git a/src/des/crypt.c b/src/des/crypt.c
index e967252..d16e2cc 100644 (file)
--- a/src/des/crypt.c
+++ b/src/des/crypt.c
@@ -383,45 +383,45 @@ static unsigned char PC2[] = {            /* permuted choice table 2 */
 
 static unsigned char S[8][64] = {      /* 48->32 bit substitution tables */
                                        /* S[1]                 */
-       14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
+{      14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
         0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
         4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
-       15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13,
+       15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13, },
                                        /* S[2]                 */
-       15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
+{      15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
         3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
         0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
-       13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9,
+       13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9, },
                                        /* S[3]                 */
-       10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
+{      10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
        13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
        13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
-        1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12,
+        1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12, },
                                        /* S[4]                 */
-        7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
+{       7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
        13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
        10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
-        3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14,
+        3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14, },
                                        /* S[5]                 */
-        2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
+{       2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
        14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
         4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
-       11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3,
+       11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3, },
                                        /* S[6]                 */
-       12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
+{      12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
        10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
         9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
-        4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13,
+        4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13, },
                                        /* S[7]                 */
-        4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
+{       4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
        13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
         1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
-        6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12,
+        6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12, },
                                        /* S[8]                 */
-       13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
+{      13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
         1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
         7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8,
-        2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11,
+        2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11, }
 };
 
 static unsigned char P32Tr[] = {       /* 32-bit permutation function */
@@ -909,6 +909,7 @@ void init_perm(perm, p, chars_in, chars_out)
 /*
  * "setkey" routine (for backwards compatibility)
  */
+#if 0 /* static and doesn't appear to be referenced */
 STATIC
 int setkey(key)
        register const char *key;
@@ -926,11 +927,12 @@ int setkey(key)
        }
        return (des_setkey((char *)keyblock.b));
 }
+#endif
 
 /*
  * "encrypt" routine (for backwards compatibility)
  */
-encrypt(block, flag)
+int encrypt(block, flag)
        register char *block;
        int flag;
 {

diff --git a/src/des/make_p_table.c b/src/des/make_p_table.c
index d2248ff..a86fe44 100644 (file)
--- a/src/des/make_p_table.c
+++ b/src/des/make_p_table.c
@@ -53,7 +53,7 @@ void gen(stream)
        for (j = 0; j < 64; j++) {
            fprintf(stream,"\n");
            for (k = 0; k < 4; k++) {
-               fprintf(stream,"0x%08X",P_prime[i][j*4+k]);
+               fprintf(stream,"0x%08lX",P_prime[i][j*4+k]);
                if ((j == 63) && (k == 3))
                    fprintf(stream, "}");
                if ((i == 3) && (j == 63) && (k == 3))

diff --git a/src/des/make_s_table.c b/src/des/make_s_table.c
index 3dfe74b..e53779f 100644 (file)
--- a/src/des/make_s_table.c
+++ b/src/des/make_s_table.c
@@ -46,7 +46,7 @@ void gen(stream)
             n = swap_four_bits_to_ansi(m);
             if (des_debug)
                 fprintf(stderr,
-                "i = %d, j = %d, k = %d, l = %d, m = %d, n = %d\n",
+                "i = %ld, j = %ld, k = %ld, l = %ld, m = %ld, n = %ld\n",
                         i,j,k,l,m,n);
             temp[i][j] = n;
         }

diff --git a/src/des/quad_cksum.c b/src/des/quad_cksum.c
index da28596..7eab559 100644 (file)
--- a/src/des/quad_cksum.c
+++ b/src/des/quad_cksum.c
@@ -139,7 +139,7 @@ des_quad_cksum(in,out,length,out_count,c_seed)
            z  = ((x * x) + (x2 * x2)) % 0x7fffffff;
            z2 = (x * (x2+83653421))   % 0x7fffffff; /* modulo */
            if (des_debug & 8)
-               printf("%d %d\n",z,z2);
+               printf("%ld %ld\n",z,z2);
        }
 
        if (out != NULL) {

diff --git a/src/des/read_pssword.c b/src/des/read_pssword.c
index 4fd9e81..4bd747a 100644 (file)
--- a/src/des/read_pssword.c
+++ b/src/des/read_pssword.c
@@ -17,12 +17,10 @@
 #include "conf.h"
 
 #include <stdio.h>
-
-#if defined(AFS_SUN5_ENV) || defined(AFS_NT40_ENV)
-#include <string.h>
-#else
+#if defined(AFS_SUN5_ENV)
 #include <strings.h>
 #endif
+#include <string.h>
 
 #ifdef BSDUNIX
 #ifdef AFS_SUN5_ENV

diff --git a/src/des/strng_to_key.c b/src/des/strng_to_key.c
index d821e16..550372c 100644 (file)
--- a/src/des/strng_to_key.c
+++ b/src/des/strng_to_key.c
@@ -114,7 +114,7 @@ des_string_to_key(str,key)
 
     if (des_debug)
        fprintf(stdout,
-               "\nResulting string_to_key = 0x%x 0x%x\n",
+               "\nResulting string_to_key = 0x%lx 0x%lx\n",
                *((afs_uint32 *) key),
                *((afs_uint32 *) key+1));
 }