Changeset dacb555 for functions.c

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>

File:

• functions.c (modified) (2 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;