Changes in message.c [9a7b4f2:66a8cd6]

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];
@@ -839 +838 @@
   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")) {
-    const char *argv[] = {
-      "zcrypt",
-      "-D",
-      "-c", owl_message_get_class(m),
-      "-i", owl_message_get_instance(m),
-      NULL
-    };
-    char *out;
-    int rv;
-    int status;
-    char *zcrypt;
-
-    zcrypt = owl_sprintf("%s/zcrypt", owl_get_bindir());
-
-    rv = call_filter(zcrypt, argv, owl_message_get_body(m), &out, &status);
-    owl_free(zcrypt);
-
-    if(!rv && !status) {
-      int len = strlen(out);
-      if(len >= 8 && !strcmp(out + len - 8, "**END**\n")) {
-        out[len - 8] = 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);
-    } else if(out) {
-      owl_free(out);
     }
   }
+#endif  
 }
 #else