* mainproc.c (check_sig_and_print): Removed the "0x" again.

Reverts change from 2003-10-03.

* THANKS: Added Phong Nguyen, who found the Elgamal signing key
problem.

* configure.ac (ALL_LINGUAS): Added a Russian translation; thanks
to Maxim Britov.  Added Belarusion; thanks to Ales Nyakhaychyk.

AUTHORS

@@ -7,8 +7,12 @@ Security related bug reports: <security@gnupg.org>
 Authors
 =======
 
+Ales Nyakhaychyk <nyakhaychyk@i1fn.linux.by> Translations [be]
+
 Birger Langkjer <birger.langkjer@image.dk> Translations [da]
 
+Britov Ivanovich <maxbritov@tut.by> Translations [ru]
+
 Daniel Resare  <daniel@resare.com> Translations [sv]
 
 David Shaw <dshaw@jabberwocky.com> Assignment
@@ -36,6 +40,7 @@ Janusz Aleksander Urbanowicz <alex@bofh.torun.pl> Translations [po]
 Jedi Lin <Jedi@idej.org> Translations [zh-tw]
 
 Jouni Hiltunen <jouni.hiltunen@kolumbus.fi> Translations [fi]
+Tommi Vainikainen <Tommi.Vainikainen@iki.fi> Translations [fi]
 
 Laurentiu Buzdugan <buzdugan@voyager.net> Translations [ro]
 

ChangeLog

@@ -1,3 +1,13 @@
+2003-12-03  Werner Koch  <wk@gnupg.org>
+
+	Released 1.2.4rc1.
+
+	* THANKS: Added Phong Nguyen, who found the Elgamal signing key
+	problem.
+
+	* configure.ac (ALL_LINGUAS): Added a Russian translation; thanks
+	to Maxim Britov.  Added Belarusion; thanks to Ales Nyakhaychyk.
+
 2003-12-02  David Shaw  <dshaw@jabberwocky.com>
 
 	* NEWS: Note that Elgamal sign+encrypt keys are not part of the

NEWS

@@ -16,6 +16,8 @@ Noteworthy changes in version 1.2.4 (unreleased)
       only new message that can be generated by an Elgamal
       sign+encrypt key is a key revocation.
 
+    * A Russian translation is included again as well as a new
+      Belarusian translation.
 
 Noteworthy changes in version 1.2.3 (2003-08-21)
 ------------------------------------------------

THANKS

@@ -158,6 +158,7 @@ Peter Fales                psfales@lucent.com
 Peter Gutmann		   pgut001@cs.auckland.ac.nz
 Peter Marschall 	   Peter.Marschall@gedos.de
 Peter Valchev              pvalchev@openbsd.org
+Phong Nguyen               Phong.Nguyen@ens.fr
 Piotr Krukowiecki          piotr@pingu.ii.uj.edu.pl
 QingLong		   qinglong@bolizm.ihep.su
 Ralph Gillen		   gillen@theochem.uni-duesseldorf.de

configure.ac

@@ -25,13 +25,13 @@ AC_PREREQ(2.52)
 
 # Remember to change the version number immediately *after* a release
 # and remove the "-cvs" or "rc" suffix immediately *before* a release.
-AC_INIT(gnupg, 1.2.4-cvs, bug-gnupg@gnu.org)
+AC_INIT(gnupg, 1.2.4rc1, bug-gnupg@gnu.org)
 # Set development_version to yes if the minor number is odd or you
 # feel that the default check for a development version is not
 # sufficient.
-development_version=no
+development_version=yes
 
-ALL_LINGUAS="ca cs da de eo el es et fi fr gl hu id it ja nl pl pt_BR pt ro sk sv tr zh_TW"
+ALL_LINGUAS="be ca cs da de eo el es et fi fr gl hu id it ja nl pl pt_BR pt ro ru sk sv tr zh_TW"
 
 AC_CONFIG_AUX_DIR(scripts)
 AC_CONFIG_SRCDIR(g10/g10.c)

doc/gpg.texi

@@ -200,7 +200,8 @@ Create an alternate user id.
 
 @item addphoto
 Create a photographic user id. This will prompt for a JPEG file that
-will be embedded into the user ID.
+will be embedded into the user ID. A very large JPEG will make for a
+very large key.
 
 @item deluid
 Delete a user id.
@@ -375,10 +376,6 @@ of this keyserver. Don't send your complete keyring
 to a keyserver - select only those keys which are new
 or changed by you.
 
-@item ---export-all @code{names}
-Same as ---export, but also exports keys which
-are not compatible with OpenPGP.
-
 @item ---export-secret-keys @code{names}
 @itemx ---export-secret-subkeys @code{names}
 Same as ---export, but exports the secret keys instead.
@@ -554,7 +551,7 @@ twice, the input data is listed in detail.
 @item -q, ---quiet
 Try to be as quiet as possible.
 
-@item -z @code{n}, ---compress @code{n}
+@item -z @code{n}, ---compress-level @code{n}
 Set compression level to @code{n}. A value of 0 for @code{n}
 disables compression. Default is to use the default
 compression level of zlib (normally 6).
@@ -643,18 +640,18 @@ ID is bound to the key.
 @end table
 
 @item ---always-trust
-Identical to `---trust-model always'
+Identical to `---trust-model always'. This option is deprecated.
 
 @item ---keyserver @code{name}
 Use @code{name} as your keyserver. This is the server that ---recv-keys,
 ---send-keys, and --search-keys will communicate with to receive keys
 from, send keys to, and search for keys on. The format of the
 @code{name} is a URI: `scheme:[//]keyservername[:port]' The scheme is
-the type of keyserver: "hkp" for the Horowitz (or compatible)
+the type of keyserver: "hkp" for the HTTP (or compatible) keyservers,
-keyservers, "ldap" for the NAI LDAP keyserver, or "mailto" for the
+"ldap" for the NAI LDAP keyserver, or "mailto" for the Graff email
-Horowitz email keyserver. Note that your particular installation of
+keyserver. Note that your particular installation of GnuPG may have
-GnuPG may have other keyserver types available as well. Keyserver
+other keyserver types available as well. Keyserver schemes are
-schemes are case-insensitive.
+case-insensitive.
 
 Most keyservers synchronize with each other, so there is generally no
 need to send keys to more than one server. Using the command "host -l
@@ -713,6 +710,12 @@ This option enables the automatic retrieving of keys from a keyserver
 when verifying signatures made by keys that are not on the local
 keyring.
 
+Note that this option makes a "web bug" like behavior possible.
+Keyserver operators can see which keys you request, so by sending you
+a message signed by a brand new key (which you naturally will not have
+on your local keyring), the operator can tell both your IP address and
+the time when you verified the signature.
+
 @end table
 
 @item ---import-options @code{parameters}
@@ -1158,6 +1161,10 @@ behavior. Use this option to reset all previous options like
 ---compress-algo to OpenPGP compliant values. All PGP workarounds are
 disabled.
 
+@item ---rfc2440
+Reset all packet, cipher and digest options to strict RFC-2440
+behavior. Note that this is currently the same thing as ---openpgp.
+
 @item ---rfc1991
 Try to be more RFC-1991 (PGP 2.x) compliant.
 
@@ -1203,7 +1210,7 @@ the SHA-256 digest algorithm.
 @item ---force-v3-sigs
 @itemx ---no-force-v3-sigs
 OpenPGP states that an implementation should generate v4 signatures
-but PGP versions 5 and higher only recognize v4 signatures on key
+but PGP versions 5 through 7 only recognize v4 signatures on key
 material. This option forces v3 signatures for signatures on data.
 Note that this option overrides ---ask-sig-expire, as v3 signatures
 cannot have expiration dates. ---no-force-v3-sigs disables this
@@ -1440,6 +1447,9 @@ from the command line, it may be necessary to quote the argument to
 this option to prevent the shell from treating it as multiple
 arguments.
 
+@item ---no-groups
+Clear the ---group list.
+
 @item ---preserve-permissions
 Don't change the permissions of a secret keyring back to user
 read/write only. Use this option only if you really know what you are doing.

g10/ChangeLog

@@ -1,3 +1,8 @@
+2003-12-03  Werner Koch  <wk@gnupg.org>
+
+	* mainproc.c (check_sig_and_print): Removed the "0x" again.
+	Reverts change from 2003-10-03.
+
 2003-12-02  David Shaw  <dshaw@jabberwocky.com>
 
 	* g10.c (strusage, main): Show development version warning in

g10/mainproc.c

@@ -1342,7 +1342,7 @@ check_sig_and_print( CTX c, KBNODE node )
 
     tstr = asctimestamp(sig->timestamp);
     astr = pubkey_algo_to_string( sig->pubkey_algo );
-    log_info(_("Signature made %.*s using %s key ID 0x%08lX\n"),
+    log_info(_("Signature made %.*s using %s key ID %08lX\n"),
              (int)strlen(tstr), tstr, astr? astr: "?", (ulong)sig->keyid[1] );
     
     rc = do_check_sig(c, node, NULL, &is_expkey, &is_revkey );