[git] GnuPG - branch, master, updated. gnupg-2.1.0-beta783-14-g40ad42d

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  40ad42dbe3c67d8103aedb6b584f4bedc5f93307 (commit)
      from  a731c22952278c12c601b73d7581fda3a15a4b5b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 40ad42dbe3c67d8103aedb6b584f4bedc5f93307
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 28 16:01:22 2014 +0200

    gpg: Do not show "MD5" and triplicated "RSA" in --version.
    
    * g10/gpg.c (build_list_pk_test_algo): Ignore RSA aliases
    (build_list_md_test_algo): Ignore MD5.

diff --git a/g10/gpg.c b/g10/gpg.c
index ce1a87f..8d69da0 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -842,6 +842,12 @@ make_libversion (const char *libname, const char *(*getfnc)(const char*))
 static int
 build_list_pk_test_algo (int algo)
 {
+  /* Show only one "RSA" string.  If RSA_E or RSA_S is available RSA
+     is also available.  */
+  if (algo == PUBKEY_ALGO_RSA_E
+      || algo == PUBKEY_ALGO_RSA_S)
+    return GPG_ERR_DIGEST_ALGO;
+
   return openpgp_pk_test_algo (algo);
 }
 
@@ -866,6 +872,11 @@ build_list_cipher_algo_name (int algo)
 static int
 build_list_md_test_algo (int algo)
 {
+  /* By default we do not accept MD5 based signatures.  To avoid
+     confusion we do not announce support for it either.  */
+  if (algo == DIGEST_ALGO_MD5)
+    return GPG_ERR_DIGEST_ALGO;
+
   return openpgp_md_test_algo (algo);
 }
 

-----------------------------------------------------------------------

Summary of changes:
 g10/gpg.c |   11 +++++++++++
 1 file changed, 11 insertions(+)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org