[git] GnuPG - branch, master, updated. gnupg-2.1.18-138-g55b6c25
by Werner Koch
cvs at cvs.gnupg.org
Fri Feb 24 13:53:21 CET 2017
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 55b6c2595a97346895ed42bcc8b72151792f5bd8 (commit)
via 7af5d61c6e210210c777be9e6e87720dd4a055d9 (commit)
from 49b4a676148523b51beca3ae929e9d78ed7ba110 (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 55b6c2595a97346895ed42bcc8b72151792f5bd8
Author: Werner Koch <wk at gnupg.org>
Date: Fri Feb 24 13:48:28 2017 +0100
Clarify text of LGPLv2+/GPLv2+ licensed files.
--
diff --git a/common/argparse.c b/common/argparse.c
index fbe8a37..2540894 100644
--- a/common/argparse.c
+++ b/common/argparse.c
@@ -4,8 +4,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/argparse.h b/common/argparse.h
index 81e881d..d75b49f 100644
--- a/common/argparse.h
+++ b/common/argparse.h
@@ -3,8 +3,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/dotlock.c b/common/dotlock.c
index 5fe652e..cbbd0f3 100644
--- a/common/dotlock.c
+++ b/common/dotlock.c
@@ -4,8 +4,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/dotlock.h b/common/dotlock.h
index 78a7e73..03131bb 100644
--- a/common/dotlock.h
+++ b/common/dotlock.h
@@ -3,8 +3,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/dynload.h b/common/dynload.h
index 61930d2..54a47b2 100644
--- a/common/dynload.h
+++ b/common/dynload.h
@@ -3,8 +3,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/logging.c b/common/logging.c
index 97f0813..18c40b3 100644
--- a/common/logging.c
+++ b/common/logging.c
@@ -4,8 +4,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/logging.h b/common/logging.h
index 515d850..e1bf56b 100644
--- a/common/logging.h
+++ b/common/logging.h
@@ -4,8 +4,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/mischelp.c b/common/mischelp.c
index fd8f675..75ba607 100644
--- a/common/mischelp.c
+++ b/common/mischelp.c
@@ -3,8 +3,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/mischelp.h b/common/mischelp.h
index 1ad146e..18ec96e 100644
--- a/common/mischelp.h
+++ b/common/mischelp.h
@@ -4,8 +4,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/stringhelp.c b/common/stringhelp.c
index dea2212..341dd52 100644
--- a/common/stringhelp.c
+++ b/common/stringhelp.c
@@ -6,8 +6,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/stringhelp.h b/common/stringhelp.h
index d0156d5..3852d0f 100644
--- a/common/stringhelp.h
+++ b/common/stringhelp.h
@@ -5,8 +5,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/strlist.c b/common/strlist.c
index 02881cd..6feb3a4 100644
--- a/common/strlist.c
+++ b/common/strlist.c
@@ -4,8 +4,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/strlist.h b/common/strlist.h
index d74bc4d..641ea06 100644
--- a/common/strlist.h
+++ b/common/strlist.h
@@ -3,8 +3,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/t-stringhelp.c b/common/t-stringhelp.c
index d86d896..a105ad1 100644
--- a/common/t-stringhelp.c
+++ b/common/t-stringhelp.c
@@ -4,8 +4,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/t-strlist.c b/common/t-strlist.c
index bd835ca..fdbeb9b 100644
--- a/common/t-strlist.c
+++ b/common/t-strlist.c
@@ -3,8 +3,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/t-support.c b/common/t-support.c
index 8ed0a62..fc4bd4b 100644
--- a/common/t-support.c
+++ b/common/t-support.c
@@ -3,8 +3,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/t-support.h b/common/t-support.h
index 5449a56..7aa46c0 100644
--- a/common/t-support.h
+++ b/common/t-support.h
@@ -3,8 +3,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/t-timestuff.c b/common/t-timestuff.c
index 1e524f5..6a75925 100644
--- a/common/t-timestuff.c
+++ b/common/t-timestuff.c
@@ -3,8 +3,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/t-w32-reg.c b/common/t-w32-reg.c
index 48ea0d4..01816db 100644
--- a/common/t-w32-reg.c
+++ b/common/t-w32-reg.c
@@ -3,8 +3,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/types.h b/common/types.h
index 7d85a35..8e551df 100644
--- a/common/types.h
+++ b/common/types.h
@@ -3,8 +3,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/utf8conv.c b/common/utf8conv.c
index d26eff0..d2c2820 100644
--- a/common/utf8conv.c
+++ b/common/utf8conv.c
@@ -4,8 +4,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/utf8conv.h b/common/utf8conv.h
index 1c6c584..8b76e11 100644
--- a/common/utf8conv.h
+++ b/common/utf8conv.h
@@ -3,8 +3,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/util.h b/common/util.h
index f7a53e1..4e871d2 100644
--- a/common/util.h
+++ b/common/util.h
@@ -3,8 +3,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/w32-reg.c b/common/w32-reg.c
index 2d64215..d8d94b9 100644
--- a/common/w32-reg.c
+++ b/common/w32-reg.c
@@ -3,8 +3,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
diff --git a/common/w32help.h b/common/w32help.h
index e495e34..177efbc 100644
--- a/common/w32help.h
+++ b/common/w32help.h
@@ -3,8 +3,8 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify it
- * under the terms of either
+ * GnuPG is free software; you can redistribute and/or modify this
+ * part of GnuPG under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at
commit 7af5d61c6e210210c777be9e6e87720dd4a055d9
Author: Werner Koch <wk at gnupg.org>
Date: Fri Feb 24 10:20:41 2017 +0100
gpgv: New options --log-file and --debug
* g10/gpgv.c (oLoggerFile, oDebug): New consts.
(opts): Add options --log-file and --debug.
(main): Implement options.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/doc/gpgv.texi b/doc/gpgv.texi
index 0608a3f..5336c98 100644
--- a/doc/gpgv.texi
+++ b/doc/gpgv.texi
@@ -111,6 +111,11 @@ file DETAILS in the documentation for a listing of them.
@opindex logger-fd
Write log output to file descriptor @code{n} and not to stderr.
+ at item --log-file @code{file}
+ at opindex log-file
+Same as @option{--logger-fd}, except the logger data is written to
+file @code{file}. Use @file{socket://} to log to socket.
+
@item --ignore-time-conflict
@opindex ignore-time-conflict
GnuPG normally checks that the timestamps associated with keys and
diff --git a/g10/gpgv.c b/g10/gpgv.c
index bd16b39..ab6f530 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -61,9 +61,11 @@ enum cmd_and_opt_values {
oIgnoreTimeConflict,
oStatusFD,
oLoggerFD,
+ oLoggerFile,
oHomedir,
oWeakDigest,
oEnableSpecialFilenames,
+ oDebug,
aTest
};
@@ -81,15 +83,37 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_s_i (oStatusFD, "status-fd",
N_("|FD|write status info to this FD")),
ARGPARSE_s_i (oLoggerFD, "logger-fd", "@"),
+ ARGPARSE_s_s (oLoggerFile, "log-file", "@"),
ARGPARSE_s_s (oHomedir, "homedir", "@"),
ARGPARSE_s_s (oWeakDigest, "weak-digest",
N_("|ALGO|reject signatures made with ALGO")),
ARGPARSE_s_n (oEnableSpecialFilenames, "enable-special-filenames", "@"),
+ ARGPARSE_s_s (oDebug, "debug", "@"),
ARGPARSE_end ()
};
+/* The list of supported debug flags. */
+static struct debug_flags_s debug_flags [] =
+ {
+ { DBG_PACKET_VALUE , "packet" },
+ { DBG_MPI_VALUE , "mpi" },
+ { DBG_CRYPTO_VALUE , "crypto" },
+ { DBG_FILTER_VALUE , "filter" },
+ { DBG_IOBUF_VALUE , "iobuf" },
+ { DBG_MEMORY_VALUE , "memory" },
+ { DBG_CACHE_VALUE , "cache" },
+ { DBG_MEMSTAT_VALUE, "memstat" },
+ { DBG_TRUST_VALUE , "trust" },
+ { DBG_HASHING_VALUE, "hashing" },
+ { DBG_IPC_VALUE , "ipc" },
+ { DBG_CLOCK_VALUE , "clock" },
+ { DBG_LOOKUP_VALUE , "lookup" },
+ { DBG_EXTPROG_VALUE, "extprog" },
+ { 0, NULL }
+ };
+
int g10_errors_seen = 0;
@@ -192,12 +216,25 @@ main( int argc, char **argv )
opt.list_sigs=1;
gcry_control (GCRYCTL_SET_VERBOSITY, (int)opt.verbose);
break;
+ case oDebug:
+ if (parse_debug_flag (pargs.r.ret_str, &opt.debug, debug_flags))
+ {
+ pargs.r_opt = ARGPARSE_INVALID_ARG;
+ pargs.err = ARGPARSE_PRINT_ERROR;
+ }
+ break;
case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break;
case oOutput: opt.outfile = pargs.r.ret_str; break;
case oStatusFD: set_status_fd( pargs.r.ret_int ); break;
case oLoggerFD:
log_set_fd (translate_sys2libc_fd_int (pargs.r.ret_int, 1));
break;
+ case oLoggerFile:
+ log_set_file (pargs.r.ret_str);
+ log_set_prefix (NULL, (GPGRT_LOG_WITH_PREFIX
+ | GPGRT_LOG_WITH_TIME
+ | GPGRT_LOG_WITH_PID) );
+ break;
case oHomedir: gnupg_set_homedir (pargs.r.ret_str); break;
case oWeakDigest:
additional_weak_digest(pargs.r.ret_str);
-----------------------------------------------------------------------
Summary of changes:
common/argparse.c | 4 ++--
common/argparse.h | 4 ++--
common/dotlock.c | 4 ++--
common/dotlock.h | 4 ++--
common/dynload.h | 4 ++--
common/logging.c | 4 ++--
common/logging.h | 4 ++--
common/mischelp.c | 4 ++--
common/mischelp.h | 4 ++--
common/stringhelp.c | 4 ++--
common/stringhelp.h | 4 ++--
common/strlist.c | 4 ++--
common/strlist.h | 4 ++--
common/t-stringhelp.c | 4 ++--
common/t-strlist.c | 4 ++--
common/t-support.c | 4 ++--
common/t-support.h | 4 ++--
common/t-timestuff.c | 4 ++--
common/t-w32-reg.c | 4 ++--
common/types.h | 4 ++--
common/utf8conv.c | 4 ++--
common/utf8conv.h | 4 ++--
common/util.h | 4 ++--
common/w32-reg.c | 4 ++--
common/w32help.h | 4 ++--
doc/gpgv.texi | 5 +++++
g10/gpgv.c | 37 +++++++++++++++++++++++++++++++++++++
27 files changed, 92 insertions(+), 50 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list