See ChangeLog: Tue Aug 1 20:06:23 CEST 2000 Werner Koch

AUTHORS

@@ -30,6 +30,9 @@ Matthew Skala <mskala@ansuz.sooke.bc.ca>  Disclaimer
 Niklas Hernaeus <nh@df.lth.se> Disclaimer
     (weak key patches)
 
+Nils Ellmenreich  <nils@infosun.fmi.uni-passau.de> Assignment
+    (configure.in, cipher/rndlinux.c)
+
 Pedro Morais <morais@poli.org> Translations [pt_BR]
 
 Rémi Guyomarch	<rguyom@mail.dotcom.fr> Assignment

NEWS

@@ -11,7 +11,7 @@ Noteworthy changes in the current CVS branch STABLE-BRANCH-1-0
       to help the British folks to somewhat minimize the danger
       of this Orwellian RIP bill.
 
-    * New option --merge-only
+    * New options --merge-only and --try-all-secrets
 
 
 Noteworthy changes in version 1.0.2 (2000-07-12)

THANKS

@@ -84,6 +84,7 @@ Martin Kahlert		   martin.kahlert@provi.de
 Martin Hamilton
 Martin Schulte		   schulte@thp.uni-koeln.de
 Matthew Skala		   mskala@ansuz.sooke.bc.ca
+Matthias Urlichs	   smurf@noris.de
 Max Valianskiy		   maxcom@maxcom.ml.org
 Michael Fischer v. Mollard mfvm@gmx.de
 Michael Roth		   mroth@nessie.de

VERSION

@@ -1 +1 @@
-1.0.2a
+1.0.2b

doc/gpg.sgml

@@ -1372,6 +1372,15 @@ handing out the secret key.
 Don't insert new keys into the keyrings while doing an import.
 </para></listitem></varlistentry>
 
+<varlistentry>
+<term>--try-all-secrets</term>
+<listitem><para>
+Don't look at the key ID as stored in the message but try all secret keys in
+turn to find the right decryption key.	This option forces the behaviour as
+used by anonymous recipients (created by using --throw-keyid) and might come
+handy in case where an encrypted message contains a bogus key ID.
+</para></listitem></varlistentry>
+
 
 </variablelist>
 </refsect1>

g10/ChangeLog

@@ -1,3 +1,8 @@
+Tue Aug  1 20:06:23 CEST 2000  Werner Koch  <wk@openit.de>
+
+  * g10.c: New opttion --try-all-secrets on suggestion from Matthias Urlichs.
+  * pubkey-enc.c (get_session_key): Quite easy to implement here.
+
 Thu Jul 27 17:33:04 CEST 2000  Werner Koch  <wk@openit.de>
 
   * g10.c: New option --merge-only.  Suggested by Brendan O'Dea.

g10/g10.c

@@ -193,6 +193,7 @@ enum cmd_and_opt_values { aNull = 0,
     oNoRandomSeedFile,
     oNoAutoKeyRetrieve,
     oMergeOnly,
+    oTryAllSecrets,
     oEmu3DESS2KBug,  /* will be removed in 1.1 */
     oEmuMDEncodeBug,
 aTest };
@@ -378,6 +379,7 @@ static ARGPARSE_OPTS opts[] = {
     { oNoRandomSeedFile,  "no-random-seed-file", 0, "@" },
     { oNoAutoKeyRetrieve, "no-auto-key-retrieve", 0, "@" },
     { oMergeOnly,	  "merge-only", 0, "@" },
+    { oTryAllSecrets,  "try-all-secrets", 0, "@" },
     { oEmu3DESS2KBug,  "emulate-3des-s2k-bug", 0, "@"},
     { oEmuMDEncodeBug,	"emulate-md-encode-bug", 0, "@"},
 {0} };
@@ -931,6 +933,7 @@ main( int argc, char **argv )
 		opt.override_session_key = pargs.r.ret_str;
 		break;
 	  case oMergeOnly: opt.merge_only = 1; break;
+	  case oTryAllSecrets: opt.try_all_secrets = 1; break;
 
 	  default : pargs.err = configfp? 1:2; break;
 	}

g10/options.h

@@ -94,6 +94,7 @@ struct {
     const char *override_session_key;
     int show_session_key;
     int merge_only;
+    int try_all_secrets;
 } opt;
 
 

g10/pubkey-enc.c

@@ -54,7 +54,7 @@ get_session_key( PKT_pubkey_enc *k, DEK *dek )
     if( rc )
 	goto leave;
 
-    if( k->keyid[0] || k->keyid[1] ) {
+    if( (k->keyid[0] || k->keyid[1]) && !opt.try_all_secrets ) {
 	sk = m_alloc_clear( sizeof *sk );
 	sk->pubkey_algo = k->pubkey_algo; /* we want a pubkey with this algo*/
 	if( !(rc = get_seckey( sk, k->keyid )) )