security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-05 12:31:50 +01:00
Code Activity

* g10.c (strusage, main): Show development version warning in --version

Browse Source 
output.

* trustdb.c (mark_usable_uid_certs): Disallow signatures to and from an
Elgamal signing key in the trustdb.
This commit is contained in:
David Shaw 2003-12-02 05:22:42 +00:00
parent a2d7e4b27c
commit 39e551985d
3 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
g10/ChangeLog
View File

@ -1,3 +1,11 @@
2003-12-02 David Shaw <dshaw@jabberwocky.com>
* g10.c (strusage, main): Show development version warning in
--version output.
* trustdb.c (mark_usable_uid_certs): Disallow signatures to and
from an Elgamal signing key in the trustdb.
2003-11-29 David Shaw <dshaw@jabberwocky.com> 2003-11-29 David Shaw <dshaw@jabberwocky.com>
* keygen.c (ask_algo): Remove ability to generate Elgamal * keygen.c (ask_algo): Remove ability to generate Elgamal

27
g10/g10.c
View File

@ -645,6 +645,19 @@ strusage( int level )
case 19: p = case 19: p =
_("Please report bugs to <gnupg-bugs@gnu.org>.\n"); _("Please report bugs to <gnupg-bugs@gnu.org>.\n");
break; break;
#ifdef IS_DEVELOPMENT_VERSION
case 20:
p="NOTE: THIS IS A DEVELOPMENT VERSION!";
break;
case 21:
p="It is only intended for test purposes and should NOT be";
break;
case 22:
p="used in a production environment or with production keys!";
break;
#endif
case 1: case 1:
case 40: p = case 40: p =
_("Usage: gpg [options] [files] (-h for help)"); _("Usage: gpg [options] [files] (-h for help)");
@ -1754,10 +1767,16 @@ main( int argc, char **argv )
fprintf(stderr, "%s\n", strusage(15) ); fprintf(stderr, "%s\n", strusage(15) );
} }
#ifdef IS_DEVELOPMENT_VERSION #ifdef IS_DEVELOPMENT_VERSION
if( !opt.batch ) { if( !opt.batch )
log_info("NOTE: THIS IS A DEVELOPMENT VERSION!\n"); {
log_info("It is only intended for test purposes and should NOT be\n"); const char *s;
log_info("used in a production environment or with production keys!\n");
if((s=strusage(20)))
log_info("%s\n",s);
if((s=strusage(21)))
log_info("%s\n",s);
if((s=strusage(22)))
log_info("%s\n",s);
} }
#endif #endif

20
g10/trustdb.c
View File

@ -1,6 +1,6 @@
/* trustdb.c /* trustdb.c
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 * Copyright (C) 1998, 1999, 2000, 2001, 2002,
* Free Software Foundation, Inc. * 2003 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -1194,6 +1194,22 @@ mark_usable_uid_certs (KBNODE keyblock, KBNODE uidnode,
continue; /* we only look at these signature classes */ continue; /* we only look at these signature classes */
if (!is_in_klist (klist, sig)) if (!is_in_klist (klist, sig))
continue; /* no need to check it then */ continue; /* no need to check it then */
if(sig->pubkey_algo==PUBKEY_ALGO_ELGAMAL)
{
if(opt.verbose)
log_info(_("signature from Elgamal signing key %08lX "
"to %08lX skipped\n"),
(ulong)sig->keyid[1],(ulong)main_kid[1]);
continue;
}
if(keyblock->pkt->pkt.public_key->pubkey_algo==PUBKEY_ALGO_ELGAMAL)
{
if(opt.verbose)
log_info(_("signature from %08lX to Elgamal signing key "
"%08lX skipped\n"),
(ulong)sig->keyid[1],(ulong)main_kid[1]);
continue;
}
if (check_key_signature (keyblock, node, NULL)) if (check_key_signature (keyblock, node, NULL))
continue; /* ignore invalid signatures */ continue; /* ignore invalid signatures */
node->flag |= 1<<9; node->flag |= 1<<9;