- Timestamp:
- Apr 8, 2010, 10:00:41 PM (14 years ago)
- Branches:
- master, release-1.10, release-1.6, release-1.7, release-1.8, release-1.9
- Children:
- b094191
- Parents:
- 8a5b5a1 (diff), 9a7b4f2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
message.c
r66a8cd6 r9a7b4f2 10 10 #include <time.h> 11 11 #include "owl.h" 12 #include "filterproc.h" 12 13 13 14 static owl_fmtext_cache fmtext_cache[OWL_FMTEXT_CACHE_SIZE]; … … 838 839 owl_free(tmp); 839 840 840 #ifdef OWL_ENABLE_ZCRYPT841 841 /* if zcrypt is enabled try to decrypt the message */ 842 842 if (owl_global_is_zcrypt(&g) && !strcasecmp(n->z_opcode, "crypt")) { 843 char *out = owl_zcrypt_decrypt(owl_message_get_body(m), owl_message_get_class(m), owl_message_get_instance(m)); 844 if (out) { 843 const char *argv[] = { 844 "zcrypt", 845 "-D", 846 "-c", owl_message_get_class(m), 847 "-i", owl_message_get_instance(m), 848 NULL 849 }; 850 char *out; 851 int rv; 852 int status; 853 char *zcrypt; 854 855 zcrypt = owl_sprintf("%s/zcrypt", owl_get_bindir()); 856 857 rv = call_filter(zcrypt, argv, owl_message_get_body(m), &out, &status); 858 owl_free(zcrypt); 859 860 if(!rv && !status) { 861 int len = strlen(out); 862 if(len >= 8 && !strcmp(out + len - 8, "**END**\n")) { 863 out[len - 8] = 0; 864 } 845 865 owl_message_set_body(m, out); 846 866 owl_free(out); 867 } else if(out) { 868 owl_free(out); 847 869 } 848 870 } 849 #endif850 871 } 851 872 #else
Note: See TracChangeset
for help on using the changeset viewer.