Changeset 356465e

Timestamp:

Mar 17, 2010, 10:36:59 PM (14 years ago)

Author:

Nelson Elhage <nelhage@ksplice.com>

Branches:

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

Children:

a08bfc3

Parents:

49bc81e

git-author:

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

git-committer:

Nelson Elhage <nelhage@ksplice.com> (03/17/10 22:36:59)

Message:

zcrypt.c: Clean up warnings.

File:

• zcrypt.c (modified) (20 diffs)

zcrypt.c

@@ -9 +9 @@
 #include <stdio.h>
 
-
 #include <unistd.h>
 #include <sys/types.h>
 #include <zephyr/zephyr.h>
 #include <glib.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/wait.h>
 
 #ifdef HAVE_KERBEROS_IV
@@ -49 +51 @@
 int do_encrypt(char *keystring, int zephyr, char *class, char *instance,
           ZWRITEOPTIONS *zoptions, char* keyfile);
-int do_decrypt(char *keystring);
+void do_decrypt(char *keystring);
 
 #define M_NONE            0
@@ -58 +60 @@
 #define M_SETKEY          5
 
-main(int argc, char *argv[])
+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);
+}
+
+int main(int argc, char *argv[])
 {
   char *fname = NULL;
@@ -229 +242 @@
         printf("Enter new key: ");
         /* Really should read without echo!!! */
-        fgets(newkey, MAX_KEY - 1, stdin);
-      }
-      else
-        fgets(newkey, MAX_KEY - 1, stdin);
+      }
+      if(!fgets(newkey, MAX_KEY - 1, stdin)) {
+        fprintf(stderr, "Error reading key.\n");
+        return 1;
+      }
 
       fkey = fopen(fname, "w");
@@ -260 +274 @@
       {
         char keystring[MAX_KEY];
-        fgets(keystring, MAX_KEY-1, fkey);
+        if(!fgets(keystring, MAX_KEY-1, fkey)) {
+          fclose(fkey);
+          fprintf(stderr, "Error reading key file.\n");
+          return 1;
+        }
         if (mode == M_ZEPHYR_ENCRYPT || mode == M_ENCRYPT)
           do_encrypt(keystring, (mode == M_ZEPHYR_ENCRYPT), class, instance,
@@ -274 +292 @@
   if (mode == M_DECRYPT)
     printf("**END**\n");
+  return 0;
 }
 
@@ -304 +323 @@
         *ptr++ = ' ';
       /* Copy argv[i], leaving ptr pointing to the '\0' copied from temp */
-      while (*ptr = *temp++)
+      while ((*ptr = *temp++))
         ptr++;
     }
@@ -317 +336 @@
 char *GetZephyrVarKeyFile(char *whoami, char *class, char *instance)
 {
-  int retval;
-  char *keyfile;
+  char *keyfile = NULL;
   char *varname[MAX_SEARCH];
   int length[MAX_SEARCH], i;
@@ -351 +369 @@
     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)
@@ -415 +433 @@
   pid_t pid;
   FILE *result;
-  char *argv[20], argc = 0;
+  char *argv[20];
+  int argc = 0;
 
   if (pipe(fildes) < 0)
@@ -481 +500 @@
 
 /* Close the pipe to zwrite */
-CloseZephyrPipe(FILE *pipe)
+void CloseZephyrPipe(FILE *pipe)
 {
   fclose(pipe);
@@ -494 +513 @@
 #define OUTPUT_BLOCK_SIZE 16
 
-block_to_ascii(char *output, FILE *outfile)
+void block_to_ascii(unsigned char *output, FILE *outfile)
 {
   int i;
@@ -511 +530 @@
           ZWRITEOPTIONS *zoptions, char* keyfile)
 {
-  des_cblock key;
   des_key_schedule schedule;
-  char input[8], output[8];
+  unsigned char input[8], output[8];
   int size;
-  int save_result = zephyr && isatty(0);
   FILE *outfile = stdout;
   int error = FALSE;
@@ -521 +538 @@
   int freein = FALSE;
   int use_buffer = FALSE;
-  int num_blocks, last_block_size;
-
-  des_string_to_key(keystring, key);
-  des_key_sched(key, schedule);
+  int num_blocks = 0, last_block_size = 0;
+
+  owl_zcrypt_string_to_schedule(keystring, schedule);
 
   if (zephyr)
@@ -553 +569 @@
       while (inptr - inbuff < MAX_RESULT - MAX_LINE - 20)
       {
-        fgets(inptr, MAX_LINE, stdin);
+        if (!fgets(inptr, MAX_LINE, stdin))
+          return FALSE;
         if (inptr[0])
         {
@@ -619 +636 @@
 
     /* Encrypt and output the block */
-    des_ecb_encrypt(input, output, schedule, TRUE);
+    des_ecb_encrypt(&input, &output, schedule, TRUE);
     block_to_ascii(output, outfile);
 
@@ -641 +658 @@
 /* Read a half-byte from stdin, skipping invalid characters.  Returns -1
    if at EOF or file error */
-int read_ascii_nybble()
+int read_ascii_nybble(void)
 {
   char c;
@@ -656 +673 @@
 /* Read both halves of the byte and return the single byte.  Returns -1
    if at EOF or file error. */
-int read_ascii_byte()
+int read_ascii_byte(void)
 {
   int c1, c2;
@@ -672 +689 @@
 
 /* Read an 8-byte DES block from stdin */
-int read_ascii_block(char *input)
+int read_ascii_block(unsigned char *input)
 {
   int c;
@@ -690 +707 @@
 
 /* Decrypt stdin */
-int do_decrypt(char *keystring)
-{
-  des_cblock key;
+void do_decrypt(char *keystring)
+{
   des_key_schedule schedule;
-  char input[8], output[9];
-  int size;
+  unsigned char input[8], output[8];
 
   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);
 
   while (read_ascii_block(input))
   {
-    des_ecb_encrypt(input, output, schedule, FALSE);
+    des_ecb_encrypt(&input, &output, schedule, FALSE);
     printf("%s", output);
   }
 
-  if (output[0])
-  {
-    if (output[strlen(output)-1] != '\n')
+  if (!output[0] || output[strlen((const char*)output) - 1] != '\n')
       printf("\n");
-  }
-  else
-    printf("\n");
-}
+}