Attachment #29567 for bug #50150

View | Details | Raw Unified | Return to bug 50150
Collapse All | Expand All

Lines 47-55 Link Here

(-)./Makefile (-13 / +10 lines)
47	# If you want to enable extended quoting functions define:	47	# If you want to enable extended quoting functions define:
48	# WITH_MUTT_QUOTE_PATCH	48	# WITH_MUTT_QUOTE_PATCH
49	#	49	#
50	# If you want to disable a outlook_compat function for use with smime define:
51	# WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT
52	#
53	# If you want to use the rethreading functions define:	50	# If you want to use the rethreading functions define:
54	# WITH_MUTT_EDIT_THREADS	51	# WITH_MUTT_EDIT_THREADS
55	#	52	#
Lines 67-73 Link Here
67	# WITH_MUTT_IFDEF_PATCH	64	# WITH_MUTT_IFDEF_PATCH
68		65
69	PORTNAME= mutt-devel	66	PORTNAME= mutt-devel
70	PORTVERSION= 1.5.3	67	PORTVERSION= 1.5.4
71	#PORTREVISION?= 0	68	#PORTREVISION?= 0
72	CATEGORIES+= mail	69	CATEGORIES+= mail
73	.if defined(WITH_MUTT_NNTP)	70	.if defined(WITH_MUTT_NNTP)
Lines 100-107 Link Here
100		97
101	.include <bsd.port.pre.mk>	98	.include <bsd.port.pre.mk>
102		99
103	.if defined(WITH_MUTT_COMPRESSED_FOLDERS) \|\| defined(WITH_MUTT_NNTP) \|\| \	100	.if defined(WITH_MUTT_COMPRESSED_FOLDERS)
104	defined(WITH_MUTT_QUOTE_PATCH)	101	PATCH_SITES+= http://www.spinnaker.de/mutt/compressed/:spinnaker
		102	.endif
		103	.if defined(WITH_MUTT_NNTP) \|\| defined(WITH_MUTT_QUOTE_PATCH)
105	PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${PATCH_VERSION}/:vvv \	104	PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${PATCH_VERSION}/:vvv \
106	http://www2.mutt.org.ua/download/mutt-${PATCH_VERSION}/:vvv \	105	http://www2.mutt.org.ua/download/mutt-${PATCH_VERSION}/:vvv \
107	ftp://ftp.mutt.org.ua/pub/mutt/mutt-${PATCH_VERSION}/:vvv \	106	ftp://ftp.mutt.org.ua/pub/mutt/mutt-${PATCH_VERSION}/:vvv \
Lines 112-118 Link Here
112	defined(WITH_MUTT_IFDEF_PATCH)	111	defined(WITH_MUTT_IFDEF_PATCH)
113	PATCH_SITES+= http://cedricduval.free.fr/download/mutt/:cd	112	PATCH_SITES+= http://cedricduval.free.fr/download/mutt/:cd
114	.endif	113	.endif
115	.if defined(WITH_MUTT_MBOX_HOOK_PATCH)	114	.if defined(WITH_MUTT_MBOX_HOOK_PATCH)
116	PATCH_SITES+= http://home.woolridge.ca/mutt/patches/:dw	115	PATCH_SITES+= http://home.woolridge.ca/mutt/patches/:dw
117	.endif	116	.endif
118		117
Lines 126-131 Link Here
126	-e "s\|^(AUTOHEADER = ).+\|\1${AUTOHEADER}\|" \	125	-e "s\|^(AUTOHEADER = ).+\|\1${AUTOHEADER}\|" \
127	${BUILD_WRKSRC}/Makefile	126	${BUILD_WRKSRC}/Makefile
128		127
		128	PATCH_VERSION= 1.5.3
129	.if !defined(PATCH_VERSION)	129	.if !defined(PATCH_VERSION)
130	PATCH_VERSION= ${PORTVERSION}	130	PATCH_VERSION= ${PORTVERSION}
131	.endif	131	.endif
Lines 183-192 Link Here
183	pre-configure::	183	pre-configure::
184	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-pgp-dw	184	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-pgp-dw
185	.endif	185	.endif
186	.if defined(WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT)
187	pre-configure::
188	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-no-outlook
189	.endif
190		186
191	.if defined(WITH_MUTT_LOCALES_FIX)	187	.if defined(WITH_MUTT_LOCALES_FIX)
192	CONFIGURE_ARGS+= --enable-locales-fix	188	CONFIGURE_ARGS+= --enable-locales-fix
Lines 206-216 Link Here
206	PATCH_DIST_STRIP= -p1	202	PATCH_DIST_STRIP= -p1
207		203
208	.if defined(WITH_MUTT_COMPRESSED_FOLDERS)	204	.if defined(WITH_MUTT_COMPRESSED_FOLDERS)
209	PATCHFILES+= patch-${PATCH_VERSION}.rr.compressed.gz:vvv	205	PATCHFILES+= patch-${PORTVERSION}.rr.compressed.1.gz:spinnaker
210	CONFIGURE_ARGS+= --enable-compressed	206	CONFIGURE_ARGS+= --enable-compressed
211	SGML_NEEDED= yes	207	SGML_NEEDED= yes
212	.endif	208	.endif
213	.if defined(WITH_MUTT_NNTP)	209	.if defined(WITH_MUTT_NNTP)
		210	.error The WITH_MUTT_NNTP is not available at the moment.
214	PATCHFILES+= patch-${PATCH_VERSION}.vvv.nntp.gz:vvv	211	PATCHFILES+= patch-${PATCH_VERSION}.vvv.nntp.gz:vvv
215	CONFIGURE_ARGS+= --enable-nntp	212	CONFIGURE_ARGS+= --enable-nntp
216	SGML_NEEDED= yes	213	SGML_NEEDED= yes
Lines 226-231 Link Here
226	SGML_NEEDED= yes	223	SGML_NEEDED= yes
227	.endif	224	.endif
228	.if defined(WITH_MUTT_SIGNATURE_MENU)	225	.if defined(WITH_MUTT_SIGNATURE_MENU)
		226	.error The WITH_MUTT_SIGNATURE_MENU is not available at the moment.
229	PATCHFILES+= patch-${PATCH_VERSION}.cd.signatures_menu.2.1:cd	227	PATCHFILES+= patch-${PATCH_VERSION}.cd.signatures_menu.2.1:cd
230	SGML_NEEDED= yes	228	SGML_NEEDED= yes
231	.endif	229	.endif
Lines 244-250 Link Here
244	post-patch::	242	post-patch::
245	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \	243	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
246	${WRKSRC}/contrib/gpg.rc	244	${WRKSRC}/contrib/gpg.rc
247	@${CP} ${PATCHDIR}/smime.h ${WRKSRC}
248		245
249	pre-configure::	246	pre-configure::
250	@(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)	247	@(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)

Lines 1-9 Link Here

(-)./distinfo (-3 / +3 lines)
1	MD5 (mutt/mutt-1.5.3i.tar.gz) = 38a3dec075c7954a5fe62ce178310d22	1	MD5 (mutt/mutt-1.5.4i.tar.gz) = 3d4088f25892af6d71148eef26604f33
2	MD5 (mutt/patch-1.5.3.rr.compressed.gz) = 029b7bf58f53f4c7dcd542beac0c4757	2	MD5 (mutt/patch-1.5.4.rr.compressed.1.gz) = e2c0b3bb0be0e19a4a6cda01078e3eae
3	MD5 (mutt/patch-1.5.3.vvv.nntp.gz) = 6399a40b4a7ce3448b0329ceec38f35b	3	MD5 (mutt/patch-1.5.3.vvv.nntp.gz) = 6399a40b4a7ce3448b0329ceec38f35b
4	MD5 (mutt/patch-1.5.3.vvv.initials.gz) = 9397128c901c32b6de585ef089ead87f	4	MD5 (mutt/patch-1.5.3.vvv.initials.gz) = 9397128c901c32b6de585ef089ead87f
5	MD5 (mutt/patch-1.5.3.vvv.quote.gz) = dc24cc5765dfbbf98a9c2027d950c07a	5	MD5 (mutt/patch-1.5.3.vvv.quote.gz) = dc24cc5765dfbbf98a9c2027d950c07a
6	MD5 (mutt/patch-1.5.3.cd.edit_threads.9.3) = 753a19d8efdece04cd521c3a3079dc9f	6	MD5 (mutt/patch-1.5.3.cd.edit_threads.9.3) = 753a19d8efdece04cd521c3a3079dc9f
7	MD5 (mutt/patch-1.5.3.cd.signatures_menu.2.1) = 6db636f0004e73ee2d9f577acd4ed380	7	MD5 (mutt/patch-1.5.3.cd.signatures_menu.2.1) = 6db636f0004e73ee2d9f577acd4ed380
8	MD5 (mutt/patch-1.5.3.cd.ifdef.1) = 01b47e075364834b82da053cac4eb69f	8	MD5 (mutt/patch-1.5.3.cd.ifdef.1) = 01b47e075364834b82da053cac4eb69f
9	MD5 (mutt/p0-patch-1.5.3.dw.mbox-hook.1) = e7a0a57023cfdfd909f6040e632fff1f	9	MD5 (mutt/p0-patch-1.5.3.dw.mbox-hook.1) = 09f9b4229a2d63c81cfee7e1d811f84f




--- PATCHES	Wed Mar 19 22:33:37 2003
+++ PATCHES	Thu Mar 20 21:38:55 2003
      http://home.woolridge.ca/mutt/patches/patch-1.5.3.dw.crypt-autoselectkey.1

--- PATCHES	Tue Dec 17 10:47:20 2002
+++ PATCHES	Fri Jan 24 11:27:21 2003
@@ -0,0 +1,3 @@
+patch-1.5.4.dw.confirm-crypt-hook.1
+patch-1.5.4.dw.multiple-crypt-hook.2
+patch-1.5.4.dw.crypt-autoselectkey.1
--- doc/manual.sgml.head	Tue Mar  4 08:49:49 2003
+++ doc/manual.sgml.head	Thu Mar 20 21:38:47 2003
@@ -1422,7 +1422,9 @@
 or because, for some reasons, you need to override the key Mutt would
 normally use.  The crypt-hook command provides a method by which you can
 specify the ID of the public key to be used when encrypting messages to

+pattern; multiple matching pgp-hook's result in the use of multiple
+keyids for recipient.
 
 The meaning of "key id" is to be taken broadly in this context:  You
 can either put a numerical key ID here, an e-mail address, or even
--- doc/muttrc.man.head	Sun Dec 22 20:50:22 2002
+++ doc/muttrc.man.head	Thu Mar 20 21:38:47 2003
@@ -286,7 +286,10 @@
 specify the ID of the public key to be used when encrypting messages
 to a certain recipient.  The meaning of "key ID" is to be taken
 broadly: This can be a different e-mail address, a numerical key ID,
-or even just an arbitrary search string.
+or even just an arbitrary search string.  You may use multiple
+\fBpgp-hook\fPs with the same \fIpattern\fP; multiple matching
+\fBpgp-hook\fPs result in the use of multiple \fIkey-id\fPs for
+recipient.
 .TP
 \fBpush\fP \fIstring\fP
 This command adds the named \fIstring\fP to the keyboard buffer.
--- hook.c	Tue Jan 21 13:25:21 2003
+++ hook.c	Thu Mar 20 21:38:47 2003
@@ -117,7 +117,11 @@
 	ptr->rx.not == not &&
 	!mutt_strcmp (pattern.data, ptr->rx.pattern))
     {

       {
 	/* these hooks allow multiple commands with the same
 	 * pattern, so if we've already seen this pattern/command pair, just
@@ -443,9 +447,25 @@
   return _mutt_string_hook (chs, M_ICONVHOOK);
 }
 
 #if defined(HAVE_PGP) || defined(HAVE_SMIME)
-char *mutt_crypt_hook (ADDRESS *adr)
+LIST *mutt_crypt_hook (ADDRESS *adr)
 {

+  }
+  return (key_list);
 }
 #endif /* HAVE_PGP */
 
 #ifdef USE_SOCKET
--- init.h	Tue Mar  4 10:28:12 2003
+++ init.h	Thu Mar 20 21:38:55 2003
@@ -1192,6 +1192,16 @@
   ** when you are at the end of a message and invoke the \fInext-page\fP
   ** function.
   */
+  
+
+  { "pgp_autoselectkey",	DT_SYN,  R_NONE, UL "crypt_autoselectkey", 0 },
+# endif
+  { "crypt_autoselectkey",	DT_BOOL, R_NONE, OPTCRYPTAUTOSELECT, 0 },
+  /*
+  ** .pp

+  ** one matching key is available.  This may be useful in conjunction with
+  ** the \fIcrypt-hook\fP command.
+  */
+# ifdef HAVE_PGP
   { "pgp_autosign", 	DT_SYN,  R_NONE, UL "crypt_autosign", 0 },
 # endif  
   { "crypt_autosign",	DT_BOOL, R_NONE, OPTCRYPTAUTOSIGN, 0 },
   /*
@@ -1216,6 +1226,15 @@
   ** then OpenSSL is used instead to create S/MIME messages and
   ** settings can be overridden by use of the \fIsmime-menu\fP.
   ** (Crypto only)
+  */
+# ifdef HAVE_PGP
+  { "pgp_confirmhook",		DT_SYN, R_NONE, UL "crypt_confirmhook", 1 },
+# endif
+  { "crypt_confirmhook",	DT_BOOL, R_NONE, OPTCRYPTCONFIRMHOOK, 1 },
+  /*
+  ** .pp

+  ** be presented.  This is generally considered unsafe, especially where
+  ** typos are concerned.
   */
 #ifdef HAVE_PGP
   { "pgp_ignore_subkeys", DT_BOOL, R_NONE, OPTPGPIGNORESUB, 1},
   /*
--- mutt.h	Tue Mar  4 08:49:48 2003
+++ mutt.h	Thu Mar 20 21:38:55 2003
@@ -425,6 +425,7 @@
 
   /* PGP options */
   
 #if defined(HAVE_PGP) || defined(HAVE_SMIME)
+  OPTCRYPTAUTOSELECT,
   OPTCRYPTAUTOSIGN,
   OPTCRYPTAUTOENCRYPT,
   OPTCRYPTREPLYENCRYPT,
@@ -434,6 +435,7 @@
   OPTSMIMEISDEFAULT,
   OPTASKCERTLABEL,
   OPTSDEFAULTDECRYPTKEY,
 #endif
+  OPTCRYPTCONFIRMHOOK,
 #ifdef HAVE_PGP
   OPTPGPIGNORESUB,
   OPTPGPLONGIDS,
   OPTPGPAUTOTRAD,
--- pgp.c	Tue Feb 25 22:28:54 2003
+++ pgp.c	Thu Mar 20 21:40:39 2003
@@ -1014,6 +1014,8 @@
   char *keyID, *keylist = NULL, *t;
   size_t keylist_size = 0;
   size_t keylist_used = 0;

   ADDRESS *tmp = NULL, *addr = NULL;
   ADDRESS **last = &tmp;
   ADDRESS *p, *q;
@@ -1047,70 +1049,97 @@
     char buf[LONG_STRING];
 
     q = p;

-	if (is_numerical_keyid (keyID))
+	keyID = (char *)hook->data;
+	snprintf (buf, sizeof (buf), _("Use keyID = \"%s\" for %s?"), keyID, p->mailbox);
+	if (!option(OPTCRYPTCONFIRMHOOK) || (r = mutt_yesorno (buf, M_YES)) == M_YES)
 	{
-	  if (strncmp (keyID, "0x", 2) == 0)
-	    keyID += 2;

 
   }
   rfc822_free_address (&tmp);
--- pgpkey.c	Tue Jan 21 13:25:21 2003
+++ pgpkey.c	Thu Mar 20 21:38:32 2003
@@ -435,8 +435,13 @@
@@ -435,6 +435,11 @@
   return rv;
 }
 

+			     || (pgp_id_is_valid((uid)) \
+				 && pgp_id_is_strong((uid))))
+
 static pgp_key_t pgp_select_key (pgp_key_t keys,
-                                 ADDRESS * p, const char *s)
+				  ADDRESS * p, const char *s)
 {
   int keymax;
   pgp_uid_t **KeyTable;
@@ -450,6 +455,7 @@
   pgp_uid_t *a;
   int (*f) (const void *, const void *);

       {
 	char *s = "";
 	char buff[LONG_STRING];
--- protos.h	Thu Mar  6 22:24:46 2003
+++ protos.h	Thu Mar 20 21:38:47 2003
@@ -129,7 +129,7 @@
 char *mutt_get_body_charset (char *, size_t, BODY *);
 const char *mutt_get_name (ADDRESS *);
 char *mutt_get_parameter (const char *, PARAMETER *);
 #if defined(HAVE_PGP) || defined(HAVE_SMIME)
-char *mutt_crypt_hook (ADDRESS *);
+LIST *mutt_crypt_hook (ADDRESS *);
 #endif /* HAVE_PGP */
 char *mutt_make_date (char *, size_t);
 
 const char *mutt_make_version (void);

Lines 1-11 Link Here

(-)./files/extra-patch-smime-no-outlook (-11 lines)
1	--- smime.c.orig Thu May 2 01:20:42 2002
2	+++ smime.c Fri Jul 26 18:15:19 2002
3	@@ -144,7 +144,7 @@
4	{
5	len++;
6	if (!ascii_strcasecmp ((t+len), "p7m"))
7	-#if 0
8	+#if 1
9	return SMIMEENCRYPT;
10	#else
11	/* Not sure if this is the correct thing to do, but

Lines 1-11 Link Here

(-)./files/patch-smime-sender (-5 / +5 lines)
1	--- commands.c.orig2 Fri May 31 10:14:06 2002	1	--- commands.c.orig Thu Mar 20 20:37:21 2003
2	+++ commands.c Fri May 31 10:32:00 2002	2	+++ commands.c Thu Mar 20 20:40:29 2003
3	@@ -197,7 +197,7 @@	3	@@ -178,7 +178,7 @@
4	{	4	{
5	if (cur->security & GOODSIGN)	5	if (cur->security & GOODSIGN)
6	{	6	{
7	- if (!smime_verify_sender(cur))	7	- if (!crypt_smime_verify_sender(cur))
8	+ if (option(OPTSMIMENOSENDER) \|\| !smime_verify_sender(cur))	8	+ if (option(OPTSMIMENOSENDER) \|\| !crypt_smime_verify_sender(cur))
9	mutt_message ( _("S/MIME signature successfully verified."));	9	mutt_message ( _("S/MIME signature successfully verified."));
10	else	10	else
11	mutt_error ( _("S/MIME certificate owner does not match sender."));	11	mutt_error ( _("S/MIME certificate owner does not match sender."));




/*
 * Copyright (C) 2001,2002 Oliver Ehli <elmy@acm.org>
 *
 *     This program is free software; you can redistribute it and/or modify
 *     it under the terms of the GNU General Public License as published by
 *     the Free Software Foundation; either version 2 of the License, or
 *     (at your option) any later version.
 * 
 *     This program is distributed in the hope that it will be useful,
 *     but WITHOUT ANY WARRANTY; without even the implied warranty of
 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *     GNU General Public License for more details.
 * 
 *     You should have received a copy of the GNU General Public License
 *     along with this program; if not, write to the Free Software
 *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
 */


#ifdef HAVE_SMIME

#include "crypt.h"

WHERE char *SmimeDefaultKey;
WHERE char *SmimeCryptAlg;
WHERE short SmimeTimeout;
WHERE char *SmimeCertificates;
WHERE char *SmimeKeys;
WHERE char *SmimeCryptAlg;
WHERE char *SmimeCALocation;

/* The command formats */

WHERE char *SmimeVerifyCommand;
WHERE char *SmimeVerifyOpaqueCommand;
WHERE char *SmimeDecryptCommand;

WHERE char *SmimeSignCommand;
WHERE char *SmimeSignOpaqueCommand;
WHERE char *SmimeEncryptCommand;

WHERE char *SmimeGetSignerCertCommand;
WHERE char *SmimePk7outCommand;
WHERE char *SmimeGetCertCommand;
WHERE char *SmimeImportCertCommand;
WHERE char *SmimeGetCertEmailCommand;


#define APPLICATION_SMIME  (1 << 6)

#define SIGNOPAQUE    (1 << 4)

#define SMIMEENCRYPT  (APPLICATION_SMIME | ENCRYPT)
#define SMIMESIGN     (APPLICATION_SMIME | SIGN)
#define SMIMEGOODSIGN (APPLICATION_SMIME | GOODSIGN)
#define SMIMEBADSIGN  (APPLICATION_SMIME | BADSIGN)
#define SMIMEOPAQUE   (APPLICATION_SMIME | SIGNOPAQUE)



#define smime_valid_passphrase() crypt_valid_passphrase(APPLICATION_SMIME)

void smime_void_passphrase (void);

int mutt_is_application_smime (BODY *);


int   smime_decrypt_mime (FILE *, FILE **, BODY *, BODY **);

void  smime_application_smime_handler (BODY *, STATE *);


BODY* smime_sign_message (BODY *);

BODY* smime_build_smime_entity (BODY *, char *);

int   smime_verify_one(BODY *, STATE *, const char *);


int   smime_verify_sender(HEADER *);


char* smime_get_field_from_db (char *, char *, short, short);

void  smime_getkeys (ENVELOPE *);

char* smime_ask_for_key (char *, char *, short);


void  smime_invoke_import (char *, char *);

#endif

Lines 122-128 Link Here

(-)./scripts/generate-plist (-1 / +1 lines)
122	fi	122	fi
123		123
124	if [ "$MUTT_HTML" = "yes" ]; then	124	if [ "$MUTT_HTML" = "yes" ]; then
125	html=363	125	html=366
126	if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then	126	if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then
127	html=$(($html + 5))	127	html=$(($html + 5))
128	fi	128	fi

Return to bug 50150

Lines 1-16 Link Here

(-)./files/extra-patch-pgp-dw (-67 / +70 lines)
1	Base: http://home.woolridge.ca/mutt/patches/patch-1.5.3.dw.confirm-crypt-hook.1	1	--- PATCHES Wed Mar 19 22:33:37 2003
2	http://home.woolridge.ca/mutt/patches/patch-1.5.3.dw.multiple-crypt-hook.1	2	+++ PATCHES Thu Mar 20 21:38:55 2003
3	http://home.woolridge.ca/mutt/patches/patch-1.5.3.dw.crypt-autoselectkey.1
4
5	--- PATCHES Tue Dec 17 10:47:20 2002
6	+++ PATCHES Fri Jan 24 11:27:21 2003
7	@@ -0,0 +1,3 @@	3	@@ -0,0 +1,3 @@
8	+patch-1.5.3.dw.crypt-autoselectkey.1	4	+patch-1.5.4.dw.confirm-crypt-hook.1
9	+patch-1.5.3.dw.confirm-crypt-hook.1	5	+patch-1.5.4.dw.multiple-crypt-hook.2
10	+patch-1.5.3.dw.multiple-crypt-hook.1	6	+patch-1.5.4.dw.crypt-autoselectkey.1
11	--- doc/manual.sgml.head Tue Dec 17 10:36:42 2002	7	--- doc/manual.sgml.head Tue Mar 4 08:49:49 2003
12	+++ doc/manual.sgml.head Fri Jan 24 11:26:59 2003	8	+++ doc/manual.sgml.head Thu Mar 20 21:38:47 2003
13	@@ -1423,7 +1423,9 @@	9	@@ -1422,7 +1422,9 @@
14	or because, for some reasons, you need to override the key Mutt would	10	or because, for some reasons, you need to override the key Mutt would
15	normally use. The crypt-hook command provides a method by which you can	11	normally use. The crypt-hook command provides a method by which you can
16	specify the ID of the public key to be used when encrypting messages to	12	specify the ID of the public key to be used when encrypting messages to
Lines 19-36 Link Here
19	+pattern; multiple matching pgp-hook's result in the use of multiple	15	+pattern; multiple matching pgp-hook's result in the use of multiple
20	+keyids for recipient.	16	+keyids for recipient.
21		17
22	<sect1>Adding key sequences to the keyboard buffer<label id="push">	18	The meaning of "key id" is to be taken broadly in this context: You
23	<p>	19	can either put a numerical key ID here, an e-mail address, or even
24	--- doc/muttrc.man.head Mon Sep 9 21:28:35 2002	20	--- doc/muttrc.man.head Sun Dec 22 20:50:22 2002
25	+++ doc/muttrc.man.head Fri Jan 24 11:26:59 2003	21	+++ doc/muttrc.man.head Thu Mar 20 21:38:47 2003
26	@@ -287 +287,3 @@	22	@@ -286,7 +286,10 @@
27	-to a certain recipient.	23	specify the ID of the public key to be used when encrypting messages
28	+to a certain recipient. You may use multiple \fBpgp-hook\fPs with the	24	to a certain recipient. The meaning of "key ID" is to be taken
29	+same \fIpattern\fP; multiple matching \fBpgp-hook\fPs result in the use	25	broadly: This can be a different e-mail address, a numerical key ID,
30	+of multiple \fIkey-id\fPs for recipient.	26	-or even just an arbitrary search string.
31	--- hook.c Wed Dec 11 16:13:11 2002	27	+or even just an arbitrary search string. You may use multiple
32	+++ hook.c Fri Jan 24 11:26:59 2003	28	+\fBpgp-hook\fPs with the same \fIpattern\fP; multiple matching
33	@@ -118,7 +118,11 @@	29	+\fBpgp-hook\fPs result in the use of multiple \fIkey-id\fPs for
		30	+recipient.
		31	.TP
		32	\fBpush\fP \fIstring\fP
		33	This command adds the named \fIstring\fP to the keyboard buffer.
		34	--- hook.c Tue Jan 21 13:25:21 2003
		35	+++ hook.c Thu Mar 20 21:38:47 2003
		36	@@ -117,7 +117,11 @@
34	ptr->rx.not == not &&	37	ptr->rx.not == not &&
35	!mutt_strcmp (pattern.data, ptr->rx.pattern))	38	!mutt_strcmp (pattern.data, ptr->rx.pattern))
36	{	39	{
Lines 42-51 Link Here
42	{	45	{
43	/* these hooks allow multiple commands with the same	46	/* these hooks allow multiple commands with the same
44	* pattern, so if we've already seen this pattern/command pair, just	47	* pattern, so if we've already seen this pattern/command pair, just
45	@@ -445,9 +449,25 @@	48	@@ -443,9 +447,25 @@
		49	return _mutt_string_hook (chs, M_ICONVHOOK);
46	}	50	}
47		51
48	#if defined(HAVE_PGP) \|\| defined(HAVE_SMIME)
49	-char mutt_crypt_hook (ADDRESS adr)	52	-char mutt_crypt_hook (ADDRESS adr)
50	+LIST mutt_crypt_hook (ADDRESS adr)	53	+LIST mutt_crypt_hook (ADDRESS adr)
51	{	54	{
Lines 68-83 Link Here
68	+ }	71	+ }
69	+ return (key_list);	72	+ return (key_list);
70	}	73	}
71	#endif /* HAVE_PGP */
72		74
73	--- init.h Mon Dec 9 19:09:21 2002	75	#ifdef USE_SOCKET
74	+++ init.h Fri Jan 24 11:27:21 2003	76	--- init.h Tue Mar 4 10:28:12 2003
75	@@ -1195,6 +1195,16 @@	77	+++ init.h Thu Mar 20 21:38:55 2003
76		78	@@ -1192,6 +1192,16 @@
77	#if defined(HAVE_PGP) \|\| defined(HAVE_SMIME)	79	** when you are at the end of a message and invoke the \fInext-page\fP
78	# ifdef HAVE_PGP	80	** function.
		81	*/
		82	+
		83	+
79	+ { "pgp_autoselectkey", DT_SYN, R_NONE, UL "crypt_autoselectkey", 0 },	84	+ { "pgp_autoselectkey", DT_SYN, R_NONE, UL "crypt_autoselectkey", 0 },
80	+# endif
81	+ { "crypt_autoselectkey", DT_BOOL, R_NONE, OPTCRYPTAUTOSELECT, 0 },	85	+ { "crypt_autoselectkey", DT_BOOL, R_NONE, OPTCRYPTAUTOSELECT, 0 },
82	+ /*	86	+ /*
83	+ ** .pp	87	+ ** .pp
Lines 85-102 Link Here
85	+ ** one matching key is available. This may be useful in conjunction with	89	+ ** one matching key is available. This may be useful in conjunction with
86	+ ** the \fIcrypt-hook\fP command.	90	+ ** the \fIcrypt-hook\fP command.
87	+ */	91	+ */
88	+# ifdef HAVE_PGP
89	{ "pgp_autosign", DT_SYN, R_NONE, UL "crypt_autosign", 0 },	92	{ "pgp_autosign", DT_SYN, R_NONE, UL "crypt_autosign", 0 },
90	# endif
91	{ "crypt_autosign", DT_BOOL, R_NONE, OPTCRYPTAUTOSIGN, 0 },	93	{ "crypt_autosign", DT_BOOL, R_NONE, OPTCRYPTAUTOSIGN, 0 },
92	@@ -1220,6 +1230,17 @@	94	/*
93	** requested as well. IF ``$$smime_is_default'' is set, then	95	@@ -1216,6 +1226,15 @@
94	** OpenSSL is used instead to create S/MIME messages and settings can	96	** then OpenSSL is used instead to create S/MIME messages and
95	** be overridden by use of the \fIsmime-menu\fP.	97	** settings can be overridden by use of the \fIsmime-menu\fP.
		98	** (Crypto only)
96	+ */	99	+ */
97	+# ifdef HAVE_PGP
98	+ { "pgp_confirmhook", DT_SYN, R_NONE, UL "crypt_confirmhook", 1 },	100	+ { "pgp_confirmhook", DT_SYN, R_NONE, UL "crypt_confirmhook", 1 },
99	+# endif
100	+ { "crypt_confirmhook", DT_BOOL, R_NONE, OPTCRYPTCONFIRMHOOK, 1 },	101	+ { "crypt_confirmhook", DT_BOOL, R_NONE, OPTCRYPTCONFIRMHOOK, 1 },
101	+ /*	102	+ /*
102	+ ** .pp	103	+ ** .pp
Lines 105-133 Link Here
105	+ ** be presented. This is generally considered unsafe, especially where	106	+ ** be presented. This is generally considered unsafe, especially where
106	+ ** typos are concerned.	107	+ ** typos are concerned.
107	*/	108	*/
108	#ifdef HAVE_PGP
109	{ "pgp_ignore_subkeys", DT_BOOL, R_NONE, OPTPGPIGNORESUB, 1},	109	{ "pgp_ignore_subkeys", DT_BOOL, R_NONE, OPTPGPIGNORESUB, 1},
110	--- mutt.h Fri Dec 6 17:37:21 2002	110	/*
111	+++ mutt.h Fri Jan 24 11:27:21 2003	111	--- mutt.h Tue Mar 4 08:49:48 2003
112	@@ -431,6 +431,7 @@	112	+++ mutt.h Thu Mar 20 21:38:55 2003
		113	@@ -425,6 +425,7 @@
		114
113	/* PGP options */	115	/* PGP options */
114		116
115	#if defined(HAVE_PGP) \|\| defined(HAVE_SMIME)
116	+ OPTCRYPTAUTOSELECT,	117	+ OPTCRYPTAUTOSELECT,
117	OPTCRYPTAUTOSIGN,	118	OPTCRYPTAUTOSIGN,
118	OPTCRYPTAUTOENCRYPT,	119	OPTCRYPTAUTOENCRYPT,
119	OPTCRYPTREPLYENCRYPT,	120	OPTCRYPTREPLYENCRYPT,
120	@@ -442,6 +443,7 @@	121	@@ -434,6 +435,7 @@
		122	OPTSMIMEISDEFAULT,
121	OPTASKCERTLABEL,	123	OPTASKCERTLABEL,
122	OPTSDEFAULTDECRYPTKEY,	124	OPTSDEFAULTDECRYPTKEY,
123	#endif
124	+ OPTCRYPTCONFIRMHOOK,	125	+ OPTCRYPTCONFIRMHOOK,
125	#ifdef HAVE_PGP
126	OPTPGPIGNORESUB,	126	OPTPGPIGNORESUB,
127	OPTPGPLONGIDS,	127	OPTPGPLONGIDS,
128	--- pgp.c Mon Dec 16 16:27:26 2002	128	OPTPGPAUTOTRAD,
129	+++ pgp.c Fri Jan 24 11:27:04 2003	129	--- pgp.c Tue Feb 25 22:28:54 2003
130	@@ -1051,6 +1051,8 @@	130	+++ pgp.c Thu Mar 20 21:40:39 2003
		131	@@ -1014,6 +1014,8 @@
131	char keyID, keylist = NULL, *t;	132	char keyID, keylist = NULL, *t;
132	size_t keylist_size = 0;	133	size_t keylist_size = 0;
133	size_t keylist_used = 0;	134	size_t keylist_used = 0;
Lines 136-142 Link Here
136	ADDRESS tmp = NULL, addr = NULL;	137	ADDRESS tmp = NULL, addr = NULL;
137	ADDRESS **last = &tmp;	138	ADDRESS **last = &tmp;
138	ADDRESS p, q;	139	ADDRESS p, q;
139	@@ -1084,70 +1086,97 @@	140	@@ -1047,70 +1049,97 @@
140	char buf[LONG_STRING];	141	char buf[LONG_STRING];
141		142
142	q = p;	143	q = p;
Lines 163-169 Link Here
163	- if (is_numerical_keyid (keyID))	164	- if (is_numerical_keyid (keyID))
164	+ keyID = (char *)hook->data;	165	+ keyID = (char *)hook->data;
165	+ snprintf (buf, sizeof (buf), _("Use keyID = \"%s\" for %s?"), keyID, p->mailbox);	166	+ snprintf (buf, sizeof (buf), _("Use keyID = \"%s\" for %s?"), keyID, p->mailbox);
166	+ if (!option(OPTCRYPTCONFIRMHOOK) \|\| (r = mutt_yesorno (buf, M_YES)) == M_YES)	167	+ if (!option(OPTCRYPTCONFIRMHOOK) \|\| (r = mutt_yesorno (buf, M_YES)) == M_YES)
167	{	168	{
168	- if (strncmp (keyID, "0x", 2) == 0)	169	- if (strncmp (keyID, "0x", 2) == 0)
169	- keyID += 2;	170	- keyID += 2;
Lines 281-290 Link Here
281		282
282	}	283	}
283	rfc822_free_address (&tmp);	284	rfc822_free_address (&tmp);
284	diff -ru work.orig/mutt-1.5.3/pgpkey.c work/mutt-1.5.3/pgpkey.c	285	--- pgpkey.c Tue Jan 21 13:25:21 2003
285	--- pgpkey.c Wed Dec 11 12:20:05 2002	286	+++ pgpkey.c Thu Mar 20 21:38:32 2003
286	+++ pgpkey.c Fri Jan 24 11:27:21 2003	287	@@ -435,8 +435,13 @@
287	@@ -435,6 +435,11 @@
288	return rv;	288	return rv;
289	}	289	}
290		290
Lines 293-301 Link Here
293	+ \|\| (pgp_id_is_valid((uid)) \	293	+ \|\| (pgp_id_is_valid((uid)) \
294	+ && pgp_id_is_strong((uid))))	294	+ && pgp_id_is_strong((uid))))
295	+	295	+
296	static pgp_key_t pgp_select_key (pgp_key_t keys,	296	static pgp_key_t pgp_select_key (pgp_key_t keys,
297	ADDRESS * p, const char *s)	297	- ADDRESS * p, const char *s)
		298	+ ADDRESS * p, const char *s)
298	{	299	{
		300	int keymax;
		301	pgp_uid_t **KeyTable;
299	@@ -450,6 +455,7 @@	302	@@ -450,6 +455,7 @@
300	pgp_uid_t *a;	303	pgp_uid_t *a;
301	int (f) (const void , const void *);	304	int (f) (const void , const void *);
Lines 345-358 Link Here
345	{	348	{
346	char *s = "";	349	char *s = "";
347	char buff[LONG_STRING];	350	char buff[LONG_STRING];
348	--- protos.h Wed Dec 11 23:31:25 2002	351	--- protos.h Thu Mar 6 22:24:46 2003
349	+++ protos.h Fri Jan 24 11:26:59 2003	352	+++ protos.h Thu Mar 20 21:38:47 2003
350	@@ -130,7 +130,7 @@	353	@@ -129,7 +129,7 @@
351	char mutt_get_name (ADDRESS );	354	char mutt_get_body_charset (char , size_t, BODY *);
		355	const char mutt_get_name (ADDRESS );
352	char mutt_get_parameter (const char , PARAMETER *);	356	char mutt_get_parameter (const char , PARAMETER *);
353	#if defined(HAVE_PGP) \|\| defined(HAVE_SMIME)
354	-char mutt_crypt_hook (ADDRESS );	357	-char mutt_crypt_hook (ADDRESS );
355	+LIST mutt_crypt_hook (ADDRESS );	358	+LIST mutt_crypt_hook (ADDRESS );
356	#endif /* HAVE_PGP */
357	char mutt_make_date (char , size_t);	359	char mutt_make_date (char , size_t);
358		360
		361	const char *mutt_make_version (void);

Lines 1-92 Link Here

(-)./files/smime.h (-92 lines)
1	/*
2	* Copyright (C) 2001,2002 Oliver Ehli <elmy@acm.org>
3	*
4	* This program is free software; you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
6	* the Free Software Foundation; either version 2 of the License, or
7	* (at your option) any later version.
8	*
9	* This program is distributed in the hope that it will be useful,
10	* but WITHOUT ANY WARRANTY; without even the implied warranty of
11	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12	* GNU General Public License for more details.
13	*
14	* You should have received a copy of the GNU General Public License
15	* along with this program; if not, write to the Free Software
16	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
17	*/
18
19
20	#ifdef HAVE_SMIME
21
22	#include "crypt.h"
23
24	WHERE char *SmimeDefaultKey;
25	WHERE char *SmimeCryptAlg;
26	WHERE short SmimeTimeout;
27	WHERE char *SmimeCertificates;
28	WHERE char *SmimeKeys;
29	WHERE char *SmimeCryptAlg;
30	WHERE char *SmimeCALocation;
31
32	/* The command formats */
33
34	WHERE char *SmimeVerifyCommand;
35	WHERE char *SmimeVerifyOpaqueCommand;
36	WHERE char *SmimeDecryptCommand;
37
38	WHERE char *SmimeSignCommand;
39	WHERE char *SmimeSignOpaqueCommand;
40	WHERE char *SmimeEncryptCommand;
41
42	WHERE char *SmimeGetSignerCertCommand;
43	WHERE char *SmimePk7outCommand;
44	WHERE char *SmimeGetCertCommand;
45	WHERE char *SmimeImportCertCommand;
46	WHERE char *SmimeGetCertEmailCommand;
47
48
49	#define APPLICATION_SMIME (1 << 6)
50
51	#define SIGNOPAQUE (1 << 4)
52
53	#define SMIMEENCRYPT (APPLICATION_SMIME \| ENCRYPT)
54	#define SMIMESIGN (APPLICATION_SMIME \| SIGN)
55	#define SMIMEGOODSIGN (APPLICATION_SMIME \| GOODSIGN)
56	#define SMIMEBADSIGN (APPLICATION_SMIME \| BADSIGN)
57	#define SMIMEOPAQUE (APPLICATION_SMIME \| SIGNOPAQUE)
58
59
60
61	#define smime_valid_passphrase() crypt_valid_passphrase(APPLICATION_SMIME)
62
63	void smime_void_passphrase (void);
64
65	int mutt_is_application_smime (BODY *);
66
67
68	int smime_decrypt_mime (FILE , FILE , BODY , BODY **);
69
70	void smime_application_smime_handler (BODY , STATE );
71
72
73	BODY* smime_sign_message (BODY *);
74
75	BODY* smime_build_smime_entity (BODY , char );
76
77	int smime_verify_one(BODY , STATE , const char *);
78
79
80	int smime_verify_sender(HEADER *);
81
82
83	char* smime_get_field_from_db (char , char , short, short);
84
85	void smime_getkeys (ENVELOPE *);
86
87	char* smime_ask_for_key (char , char , short);
88
89
90	void smime_invoke_import (char , char );
91
92	#endif