Changes in zcrypt.c [36486be:a6ac9fe]

File:

• zcrypt.c (modified) (13 diffs)

zcrypt.c

@@ -23 +23 @@
 #include <unistd.h>
 #include <sys/types.h>
-#include <des.h>
+
+#ifdef HAVE_KERBEROS_IV
+#include <kerberosIV/des.h>
+#else
+#include <openssl/des.h>
+#endif
 
 #define MAX_KEY 128
@@ -51 +56 @@
 char *GetZephyrVarKeyFile(const char *whoami, const char *class, const char *instance);
 
-#ifndef HAVE_DES_ECB_ENCRYPT_PROTO
-int des_ecb_encrypt(char [], char [], des_key_schedule, int);
-#endif
-
 #define M_NONE            0
 #define M_ZEPHYR_ENCRYPT  1
@@ -61 +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.
@@ -73 +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;
   
@@ -82 +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);
 
@@ -88 +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;
@@ -102 +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);
 }
@@ -119 +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;
-  int use_buffer = FALSE;
   int num_blocks=0, last_block_size=0;
 
@@ -131 +136 @@
   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;
@@ -141 +148 @@
   num_blocks=(length+7)/8;
   last_block_size=((length+7)%8)+1;
-  use_buffer=TRUE;
 
   strcpy(out, "");
@@ -167 +173 @@
 
     /* 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++) {
@@ -216 +222 @@
     /* 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) {
@@ -262 +268 @@
 }
 
-static pid_t zephyrpipe_pid = 0;
-
-#endif
+#endif