security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-28 22:49:59 +01:00
Code Activity

* Makefile.am: Use @LIBUSB@ instead of @LIBUSB_LIBS@

Browse Source 
* import.c (delete_inv_parts): Comments on import-unusable-sigs.
This commit is contained in:
David Shaw 2005-01-03 15:15:34 +00:00
parent fbee22ac0c
commit 14ce45565d
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2005-01-03 David Shaw <dshaw@jabberwocky.com>
* Makefile.am: Use @LIBUSB@ instead of @LIBUSB_LIBS@
* import.c (delete_inv_parts): Comments on import-unusable-sigs.
2005-01-01 David Shaw <dshaw@jabberwocky.com> 2005-01-01 David Shaw <dshaw@jabberwocky.com>
* options.h, import.c (parse_import_options, delete_inv_parts): * options.h, import.c (parse_import_options, delete_inv_parts):

6
g10/Makefile.am
View File

@ -1,5 +1,5 @@
# Copyright (C) 1998, 1999, 2000, 2001, 2002, # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
# 2003 Free Software Foundation, Inc. # 2004 Free Software Foundation, Inc.
# #
# This file is part of GnuPG. # This file is part of GnuPG.
# #
@ -133,7 +133,7 @@ gpgv_SOURCES = gpgv.c \
# $(common_source) # $(common_source)
LDADD = $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@ @LIBREADLINE@ LDADD = $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@ @LIBREADLINE@
gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB_LIBS@ gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB@
$(PROGRAMS): $(needed_libs) $(PROGRAMS): $(needed_libs)

6
g10/import.c
View File

@ -1565,6 +1565,12 @@ delete_inv_parts( const char *fname, KBNODE keyblock,
|| node->pkt->pkt.signature->keyid[1]!=keyid[1]) || node->pkt->pkt.signature->keyid[1]!=keyid[1])
&& !(options&IMPORT_UNUSABLE_SIGS)) && !(options&IMPORT_UNUSABLE_SIGS))
{ {
/* Note that we haven't necessarily checked this sig for
validity. We strip it anyway since if it was valid, it
would be expired. If it wasn't valid, it either would
be expired if it was valid, or was altered to the point
that it looked expired (and so doesn't matter terribly
much if it is expired or not). */
if(opt.verbose) if(opt.verbose)
{ {
char *kid=m_strdup(keystr(keyid)); char *kid=m_strdup(keystr(keyid));