Changeset dacb555

Timestamp:

Feb 9, 2010, 9:49:41 PM (14 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

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

Children:

a52eeb1

Parents:

d35d2ba

git-author:

Anders Kaseorg <andersk@mit.edu> (02/07/10 22:55:21)

git-committer:

Anders Kaseorg <andersk@mit.edu> (02/09/10 21:49:41)

Message:

zcrypt: Change zcrypt functions to allocate their output buffer.

The logic to determine the right buffer size is complicated and does
not belong in callers.

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

Files:

• functions.c (modified) (2 diffs)
• message.c (modified) (1 diff)
• zcrypt.c (modified) (4 diffs)

functions.c

@@ -406 +406 @@
   char *cryptmsg;
   owl_message *m;
-#ifdef OWL_ENABLE_ZCRYPT
-  int ret;
-#endif
 
   /* create the zwrite and send the message */
@@ -419 +416 @@
   mymsg=owl_zwrite_get_message(&z);
 #ifdef OWL_ENABLE_ZCRYPT
-  /* Allocate enough space for the crypted message. For each byte of
-   * the message, the encoded cyphertext will have two bytes. Block
-   * size is 8 bytes of input, or 16 bytes of output, so make sure we
-   * have at least one block worth of space allocated. If the message
-   * is empty, no blocks are sent, but we still allocate one
-   * block. The additional 16 bytes also provide space for the null
-   * terminator, as we will never use all of it for cyphertext.
-   */
-  cryptmsg=owl_malloc((strlen(mymsg)*2)+16);
-  ret=owl_zcrypt_encrypt(cryptmsg, mymsg, owl_zwrite_get_class(&z), owl_zwrite_get_instance(&z));
-  if (ret) {
+  cryptmsg = owl_zcrypt_encrypt(mymsg, owl_zwrite_get_class(&z), owl_zwrite_get_instance(&z));
+  if (!cryptmsg) {
     owl_function_error("Error in zcrypt, possibly no key found.  Message not sent.");
     owl_function_beep();
-    owl_free(cryptmsg);
     owl_zwrite_free(&z);
     return;

message.c

@@ -841 +841 @@
   /* if zcrypt is enabled try to decrypt the message */
   if (owl_global_is_zcrypt(&g) && !strcasecmp(n->z_opcode, "crypt")) {
-    char *out;
-    int ret;
-
-    out=owl_malloc(strlen(owl_message_get_body(m))*16+20);
-    ret=owl_zcrypt_decrypt(out, owl_message_get_body(m), owl_message_get_class(m), owl_message_get_instance(m));
-    if (ret == 0)
+    char *out = owl_zcrypt_decrypt(owl_message_get_body(m), owl_message_get_class(m), owl_message_get_instance(m));
+    if (out) {
       owl_message_set_body(m, out);
-    owl_free(out);
+      owl_free(out);
+    }
   }
 #endif  

zcrypt.c

@@ -76 +76 @@
 /* The 'owl_zcrypt_decrypt' function was written by kretch for Owl.
  * Decrypt the message in 'in' on class 'class' and instance
- * 'instance' and leave the result in 'out'.  Out must be a buffer
- * allocated by the caller.
- *
- * return 0 on success, otherwise -1
+ * 'instance'.  Return must be freed by caller.
  */
-int owl_zcrypt_decrypt(char *out, const char *in, const char *class, const char *instance) {
+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);
-  if (!fname) return(-1);
+  if (!fname) return NULL;
   fkey=fopen(fname, "r");
-  if (!fkey) return(-1);
+  if (!fkey) return NULL;
   if (!fgets(keystring, MAX_KEY-1, fkey)) {
     fclose(fkey);
-    return -1;
+    return NULL;
   }
   fclose(fkey);
 
+  out = owl_malloc(strlen(in) * 16 + 20);
   strcpy(out, "");
 
@@ -120 +120 @@
   if (out[0] && out[strlen(out) - 1] != '\n')
     strcat(out, "\n");
-  return(0);
-}
-
-int owl_zcrypt_encrypt(char *out, const char *in, const char *class, const char *instance) {
+  return out;
+}
+
+char *owl_zcrypt_encrypt(const char *in, const char *class, const char *instance)
+{
   char *fname, keystring[MAX_KEY];
   FILE *fkey;
   des_key_schedule schedule;
+  char *out;
   unsigned char input[8], output[8];
   int size, length, i;
@@ -133 +135 @@
 
   fname=GetZephyrVarKeyFile("zcrypt", class, instance);
-  if (!fname) return(-1);
+  if (!fname) return NULL;
   fkey=fopen(fname, "r");
-  if (!fkey) return(-1);
+  if (!fkey) return NULL;
   if (!fgets(keystring, MAX_KEY-1, fkey)) {
     fclose(fkey);
-    return -1;
+    return NULL;
   }
   fclose(fkey);
 
   owl_zcrypt_string_to_schedule(keystring, &schedule);
+
+  /* Allocate enough space for the crypted message. For each byte of
+   * the message, the encoded cyphertext will have two bytes. Block
+   * size is 8 bytes of input, or 16 bytes of output, so make sure we
+   * have at least one block worth of space allocated. If the message
+   * is empty, no blocks are sent, but we still allocate one
+   * block. The additional 16 bytes also provide space for the null
+   * terminator, as we will never use all of it for cyphertext.
+   */
+  out = owl_malloc((strlen(in) * 2) + 16);
 
   inbuff=in;
@@ -182 +194 @@
     if (size < 8) break;
   }
-  return(0);
+  return out;
 }