Changeset 3daca13

Timestamp:

Sep 15, 2009, 4:22:39 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

191d5e7

Parents:

1c89df8

git-author:

Anders Kaseorg <andersk@mit.edu> (09/14/09 23:52:36)

git-committer:

Nelson Elhage <nelhage@mit.edu> (09/15/09 16:22:39)

Message:

zcrypt.c: Clean up warnings.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
[nelhage@mit.edu: Abstract keys into owl_zcrypt_string_to_schedule]
Signed-off-by: Nelson Elhage <nelhage@mit.edu>

Files:

• Makefile.am (modified) (1 diff)
• zcrypt.c (modified) (10 diffs)

Makefile.am

@@ -23 +23 @@
 
 libzcrypt_a_SOURCES = zcrypt.c
-libzcrypt_a_CFLAGS  = -w
 
 CPPFLAGS = -I$(top_srcdir)/ \

zcrypt.c

@@ -62 +62 @@
 #define M_RANDOMIZE       4
 #define M_SETKEY          5
+
+static void owl_zcrypt_string_to_schedule(char *keystring, des_key_schedule schedule) {
+#ifdef HAVE_KERBEROS_IV
+  des_cblock key;
+#else
+  des_cblock _key, *key = &_key;
+#endif
+
+  des_string_to_key(keystring, key);
+  des_key_sched(key, schedule);
+}
 
 /* The 'owl_zcrypt_decrypt' function was written by kretch for Owl.
@@ -74 +85 @@
   char *fname, keystring[MAX_KEY];
   FILE *fkey;
-  des_cblock key;
   des_key_schedule schedule;
-  char input[8], output[9];
+  unsigned char input[8], output[8];
   int i, c1, c2;
   
@@ -83 +93 @@
   fkey=fopen(fname, "r");
   if (!fkey) return(-1);
-  fgets(keystring, MAX_KEY-1, fkey);
+  if (!fgets(keystring, MAX_KEY-1, fkey)) {
+    fclose(fkey);
+    return -1;
+  }
   fclose(fkey);
 
@@ -89 +102 @@
 
   output[0] = '\0';    /* In case no message at all                 */
-  output[8] = '\0';    /* NULL at end will limit string length to 8 */
-
-  des_string_to_key(keystring, key);
-  des_key_sched(key, schedule);
+
+  owl_zcrypt_string_to_schedule(keystring, schedule);
 
   inptr=in;
@@ -103 +114 @@
       inptr+=2;
     }
-    des_ecb_encrypt(input, output, schedule, FALSE);
-    strcat(out, output);
-  }
-
-  if (output[0]) {
-    if (output[strlen(output)-1] != '\n') {
-      strcat(out, "\n");
-    }
-  } else {
+    des_ecb_encrypt(&input, &output, schedule, FALSE);
+    strncat(out, (const char *)output, 8);
+  }
+
+  if (out[0] && out[strlen(out) - 1] != '\n')
     strcat(out, "\n");
-  }
   return(0);
 }
@@ -120 +126 @@
   char *fname, keystring[MAX_KEY];
   FILE *fkey;
-  des_cblock key;
   des_key_schedule schedule;
-  char input[8], output[8];
+  unsigned char input[8], output[8];
   int size, length, i;
   const char *inbuff = NULL, *inptr;
@@ -132 +137 @@
   fkey=fopen(fname, "r");
   if (!fkey) return(-1);
-  fgets(keystring, MAX_KEY-1, fkey);
+  if (!fgets(keystring, MAX_KEY-1, fkey)) {
+    fclose(fkey);
+    return -1;
+  }
   fclose(fkey);
 
-  des_string_to_key(keystring, key);
-  des_key_sched(key, schedule);
+  owl_zcrypt_string_to_schedule(keystring, schedule);
 
   inbuff=in;
@@ -168 +175 @@
 
     /* Encrypt and output the block */
-    des_ecb_encrypt(input, output, schedule, TRUE);
+    des_ecb_encrypt(&input, &output, schedule, TRUE);
 
     for (i = 0; i < 8; i++) {
@@ -217 +224 @@
     /* Scan file for a match */
     while (!feof(fsearch)) {
-      fgets(buffer, MAX_BUFF - 3, fsearch);
+      if (!fgets(buffer, MAX_BUFF - 3, fsearch)) break;
       for (i = 0; i < numsearch; i++) {
         if (strncasecmp(varname[i], buffer, length[i]) == 0) {
@@ -263 +270 @@
 }
 
-static pid_t zephyrpipe_pid = 0;
-
-#endif
+#endif