[svn] GnuPG - r4328 - branches/STABLE-BRANCH-1-4/g10

[svn author dshaw]

Author: dshaw
Date: 2006-11-06 05:07:33 +0100 (Mon, 06 Nov 2006)
New Revision: 4328

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
Log:
Missing changelog entry


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2006-11-06 04:03:44 UTC (rev 4327)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2006-11-06 04:07:33 UTC (rev 4328)
@@ -2,6 +2,15 @@
 
 	* gpg.c (main): New command --gpgconf-list.
 
+2006-10-12  David Shaw  <dshaw at jabberwocky.com>
+
+	* parse-packet.c (parse_symkeyenc): Show the unpacked as well as
+	the packed s2k iteration count.
+
+	* main.h, options.h, gpg.c (encode_s2k_iterations, main),
+	passphrase.c (hash_passphrase): Add --s2k-count option to specify
+	the number of s2k hash iterations.
+
 2006-10-06  David Shaw  <dshaw at jabberwocky.com>
 
 	* keyserver.c (keyserver_spawn): Write the 16-digit keyid rather