From be98b5960ebd48929c399b0b91c95bfc0cb9749b Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Thu, 28 Aug 2014 16:01:22 +0200
Subject: [PATCH] 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.
---
 g10/gpg.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/g10/gpg.c b/g10/gpg.c
index ce1a87fbd..8d69da047 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);
 }