Changeset d564c3d for message.c

Timestamp:

Mar 17, 2010, 11:15:36 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:

2b7ef0a

Parents:

dfe94f9

git-author:

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

git-committer:

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

Message:

Replace the built-in zcrypt with shelling out to the zcrypt binary.

File:

• message.c (modified) (2 diffs)

message.c

@@ -10 +10 @@
 #include <time.h>
 #include "owl.h"
+#include "filterproc.h"
 
 static owl_fmtext_cache fmtext_cache[OWL_FMTEXT_CACHE_SIZE];
@@ -838 +839 @@
   owl_free(tmp);
 
-#ifdef OWL_ENABLE_ZCRYPT
   /* if zcrypt is enabled try to decrypt the message */
   if (owl_global_is_zcrypt(&g) && !strcasecmp(n->z_opcode, "crypt")) {
-    char *out = owl_zcrypt_decrypt(owl_message_get_body(m), owl_message_get_class(m), owl_message_get_instance(m));
-    if (out) {
+    const char *argv[] = {
+      "zcrypt",
+      "-D",
+      "-c", owl_message_get_class(m),
+      "-i", owl_message_get_instance(m),
+      NULL
+    };
+    char *out;
+    int rv;
+    int status;
+
+    rv = call_filter("zcrypt", argv, owl_message_get_body(m), &out, &status);
+
+    if(!rv && !status) {
+      int len = strlen(out);
+      if(len >= 8 && !strcmp(out + len - 8, "**END**\n")) {
+        out[len - 8] = 0;
+      }
       owl_message_set_body(m, out);
       owl_free(out);
+    } else if(out) {
+      owl_free(out);
     }
   }
-#endif  
 }
 #else