* Makefile.am: Use @LIBUSB@ instead of @LIBUSB_LIBS@
authorDavid Shaw <dshaw@jabberwocky.com>
Mon, 3 Jan 2005 15:15:34 +0000 (15:15 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Mon, 3 Jan 2005 15:15:34 +0000 (15:15 +0000)
* import.c (delete_inv_parts): Comments on import-unusable-sigs.

g10/ChangeLog
g10/Makefile.am
g10/import.c

index c999e3f..11639c9 100644 (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>
 
        * options.h, import.c (parse_import_options, delete_inv_parts):
 2005-01-01  David Shaw  <dshaw@jabberwocky.com>
 
        * options.h, import.c (parse_import_options, delete_inv_parts):
index 3e7e0e1..1c0551c 100644 (file)
@@ -1,5 +1,5 @@
-# Copyright (C) 1998, 1999, 2000, 2001, 2002,
-#               2003 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
+#               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)
 
 LDADD =  $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@ @LIBREADLINE@
 #             $(common_source)
 
 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)
 
index e0d57a5..d0c1c01 100644 (file)
@@ -1565,6 +1565,12 @@ delete_inv_parts( const char *fname, KBNODE keyblock,
                    || node->pkt->pkt.signature->keyid[1]!=keyid[1])
                && !(options&IMPORT_UNUSABLE_SIGS))
          {
                    || node->pkt->pkt.signature->keyid[1]!=keyid[1])
                && !(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)
              {
                char *kid=m_strdup(keystr(keyid));
            if(opt.verbose)
              {
                char *kid=m_strdup(keystr(keyid));