X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsend.c;h=76280aa6bd3e81fdae6d9b079c073abf11bc44ae;hp=0660e9588a376d52f640b0be4a4a81785ec06c03;hb=c7b5e1df086bcc37ff40163ee67571f076cf6683;hpb=c04ddf6908d7d3e3d41408d03f086273dee47b6e

diff --git a/uip/send.c b/uip/send.c
index 0660e95..76280aa 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -46,6 +46,7 @@ static void armed_done(int) NORETURN;
 static void anno(struct stat *);
 static int sendaux(char **, int, char *, struct stat *);
 static int attach(char *);
+static int signandenc(char *);
 static void clean_up_temporary_files(void);
 static int get_line(void);
 static void make_mime_composition_file_entry(char *);
@@ -261,6 +262,26 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st)
 		break;
 	}
 
+	/*
+	** Sign and encrypt the message as needed.
+	** Use the mhbuild composition file for the draft if there was
+	** a successful conversion because that now contains the MIME
+	** message.  A nice side effect of this is that it leaves the
+	** original draft file untouched so that it can be retrieved
+	** and modified if desired.
+	*/
+	switch (signandenc(drft)) {
+	case OK:
+		drft = composition_file_name;
+		break;
+
+	case NOTOK:
+		return (NOTOK);
+
+	case DONE:
+		break;
+	}
+
 	done=armed_done;
 	switch (setjmp(env)) {
 	case OK:
@@ -434,6 +455,53 @@ attach(char *draft_file_name)
 	return (OK);
 }
 
+static int
+signandenc(char *draft_file_name)
+{
+	char buf[BUFSIZ];
+	int dosign = 0;
+	int doenc = 0;
+
+	if (!(draft_file = fopen(draft_file_name, "r"))) {
+		adios(NULL, "can't open draft file `%s'.", draft_file_name);
+	}
+
+	/* We'll grow the buffer as needed. */
+	field = (char *)mh_xmalloc(field_size = 256);
+
+	/* Scan the draft file for an attachment header field name. */
+	while (get_line() != EOF && *field != '\0' && *field != '-') {
+		if (strncasecmp(field, sign_hdr, strlen(sign_hdr))==0 &&
+				field[strlen(sign_hdr)] == ':') {
+			dosign = 1;
+		}
+		if (strncasecmp(field, enc_hdr, strlen(enc_hdr))==0 &&
+				field[strlen(enc_hdr)] == ':') {
+			doenc = 1;
+		}
+	}
+	if (!dosign && !doenc) {
+		return DONE;
+	}
+
+	strcpy(composition_file_name, draft_file_name);
+
+	/* We're ready to roll! */
+	sprintf(buf, "mhsign -m%s '%s'", doenc ? " -e" : "",
+			draft_file_name);
+	if (system(buf) != 0) {
+		/* some problem */
+		return (NOTOK);
+	}
+	/* Remove the automatically created backup of mhsign. */
+	snprintf(buf, sizeof buf, "%s.orig", draft_file_name);
+	if (unlink(buf) == -1) {
+		advise(NULL, "unable to remove original draft file.");
+	}
+
+	return (OK);
+}
+
 static void
 clean_up_temporary_files(void)
 {