From: Ezra Peisach <epeisach@mit.edu>
Date: Sat, 5 Mar 2011 15:56:33 +0000 (+0000)
Subject: Include crypto_int.h for mit_des_fixup_key_parity prototype
X-Git-Tag: krb5-1.10-alpha1~552
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fba2b0eb5a49768eecd2572f0f4636e715bb3c95;p=krb5.git

Include crypto_int.h for mit_des_fixup_key_parity prototype

Cleanup signed/unsigned warnings.

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

diff --git a/src/lib/crypto/builtin/des/destest.c b/src/lib/crypto/builtin/des/destest.c
index 86c74773c..0af9654ce 100644
--- a/src/lib/crypto/builtin/des/destest.c
+++ b/src/lib/crypto/builtin/des/destest.c
@@ -56,6 +56,7 @@
  */
 
 #include "des_int.h"
+#include "crypto_int.h"
 #include <stdio.h>
 
 void convert (char *, unsigned char []);
@@ -98,7 +99,8 @@ main(argc, argv)
             fprintf(stderr, "des test: %s %s %s\n", block1, block2, block3);
             exit(1);
         }
-        mit_des_cbc_encrypt((const mit_des_cblock *) input, output2, 8,
+        mit_des_cbc_encrypt((const mit_des_cblock *) input,
+                            (mit_des_cblock *) output2, 8,
                             sched, zeroblock, 1);
 
         if (memcmp((char *)output2, (char *)output, 8)) {
@@ -113,7 +115,8 @@ main(argc, argv)
         /*
          * Now try decrypting....
          */
-        mit_des_cbc_encrypt((const mit_des_cblock *) output, output2, 8,
+        mit_des_cbc_encrypt((const mit_des_cblock *) output,
+                            (mit_des_cblock *) output2, 8,
                             sched, zeroblock, 0);
 
         if (memcmp((char *)output2, (char *)input, 8)) {
@@ -177,8 +180,6 @@ convert(text, cblock)
  * Fake out the DES library, for the purposes of testing.
  */
 
-#include "des_int.h"
-
 int
 mit_des_is_weak_key(key)
     mit_des_cblock key;
@@ -217,7 +218,7 @@ int
 mit_des_check_key_parity(key)
     register mit_des_cblock key;
 {
-    int i;
+    unsigned int i;
 
     for (i=0; i<sizeof(mit_des_cblock); i++) {
         if ((key[i] & 1) == parity_char(0xfe&key[i])) {
@@ -236,7 +237,7 @@ void
 mit_des_fixup_key_parity(key)
     register mit_des_cblock key;
 {
-    int i;
+    unsigned int i;
     for (i=0; i<sizeof(mit_des_cblock); i++)
     {
         key[i] &= 0xfe;