Changeset 8fff19a

Timestamp:

Mar 1, 2010, 8:33:48 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

release-1.5

Children:

c4b5de8

Parents:

54e1fe4

git-author:

Anders Kaseorg <andersk@mit.edu> (02/07/10 23:08:47)

git-committer:

Nelson Elhage <nelhage@mit.edu> (03/01/10 20:33:48)

Message:

zcrypt: Add separate functions for zcrypting with a particular key.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-by: Nelson Elhage <nelhage@mit.edu>

File:

• zcrypt.c (modified) (5 diffs)

zcrypt.c

@@ -63 +63 @@
 #define M_SETKEY          5
 
-static void owl_zcrypt_string_to_schedule(char *keystring, des_key_schedule *schedule) {
+static void owl_zcrypt_string_to_schedule(const char *keystring, des_key_schedule *schedule) {
 #ifdef HAVE_KERBEROS_IV
   des_cblock key;
@@ -80 +80 @@
 char *owl_zcrypt_decrypt(const char *in, const char *class, const char *instance)
 {
-  const char *inptr, *endptr;
   char *fname, keystring[MAX_KEY];
   FILE *fkey;
-  des_key_schedule schedule;
-  char *out;
-  unsigned char input[8], output[8];
-  int i, c1, c2;
   
   fname=GetZephyrVarKeyFile("zcrypt", class, instance);
@@ -98 +93 @@
   fclose(fkey);
 
+  return owl_zcrypt_decrypt_with_key(in, keystring);
+}
+
+char *owl_zcrypt_decrypt_with_key(const char *in, const char *keystring)
+{
+  const char *inptr, *endptr;
+  char *out;
+  des_key_schedule schedule;
+  unsigned char input[8], output[8];
+  int i, c1, c2;
+
   out = owl_malloc(strlen(in) * 16 + 20);
+
   strcpy(out, "");
 
@@ -127 +134 @@
   char *fname, keystring[MAX_KEY];
   FILE *fkey;
-  des_key_schedule schedule;
-  char *out;
-  unsigned char input[8], output[8];
-  int size, length, i;
-  const char *inbuff = NULL, *inptr;
-  int num_blocks=0, last_block_size=0;
 
   fname=GetZephyrVarKeyFile("zcrypt", class, instance);
@@ -143 +144 @@
   }
   fclose(fkey);
+
+  return owl_zcrypt_encrypt_with_key(in, keystring);
+}
+
+char *owl_zcrypt_encrypt_with_key(const char *in, const char *keystring)
+{
+  des_key_schedule schedule;
+  char *out;
+  unsigned char input[8], output[8];
+  int size, length, i;
+  const char *inbuff = NULL, *inptr;
+  int num_blocks=0, last_block_size=0;
 
   owl_zcrypt_string_to_schedule(keystring, &schedule);