From 929d4fa7dbd598b4eec833434912884b1938b264 Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Sat, 27 Sep 2014 17:35:03 -0400 Subject: [PATCH] Version 3.0.10. --- NEWS | 22 +++++++++ configure.ac | 2 +- po/pwmd.pot | 149 ++++++++++++++++++++++++++++++----------------------------- 3 files changed, 98 insertions(+), 75 deletions(-) diff --git a/NEWS b/NEWS index d10452fb..80fae78e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,25 @@ +PWMD v3.0.10 +----------- +Fixed SAVE --keygrip and --sign-keygrip when not a new file. + +Fixed SAVE using the previously opened files signing key when the current file +is an new one. + +Fixed TLS socket hanging during handshake failure. + +Fixed TLS wait interval during EAGAIN. + +Added GETINFO USER to return the client username/hash. + +Fixed MOVE doing an unneeded permission check. + +Fixed CACHETIMEOUT to apply the new timeout immediately and not wait for the +existing timer to expire. + +Bugfixes. See ChangeLog for details. + + + PWMD v3.0.9 ----------- Fix SAVE --inquire-keyparam for new files. diff --git a/configure.ac b/configure.ac index 3b2c6862..42e939ef 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.60) -AC_INIT(pwmd, 3.0.9, [Ben Kibbey bjk@luxsci.net]) +AC_INIT(pwmd, 3.0.10, [Ben Kibbey bjk@luxsci.net]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR(build) AC_CANONICAL_TARGET diff --git a/po/pwmd.pot b/po/pwmd.pot index b3195da8..2aefccd1 100644 --- a/po/pwmd.pot +++ b/po/pwmd.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bjk@luxsci.net\n" -"POT-Creation-Date: 2014-09-21 12:44-0400\n" +"POT-Creation-Date: 2014-09-27 17:25-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -114,112 +114,112 @@ msgstr "" msgid "rejected" msgstr "" -#: src/pwmd.c:1074 +#: src/pwmd.c:1068 #, c-format msgid "exiting, fd=%i" msgstr "" -#: src/pwmd.c:1284 +#: src/pwmd.c:1278 #, c-format msgid "Importing XML from '%s'. Output will be written to '%s' ..." msgstr "" -#: src/pwmd.c:1326 +#: src/pwmd.c:1320 msgid "Could not find root \"pwmd\" element." msgstr "" -#: src/pwmd.c:1349 +#: src/pwmd.c:1343 msgid "Success!" msgstr "" -#: src/pwmd.c:1389 +#: src/pwmd.c:1383 #, c-format msgid "Trying to add datafile '%s' to the file cache ..." msgstr "" -#: src/pwmd.c:1394 +#: src/pwmd.c:1388 #, c-format msgid "%s: Invalid characters in filename" msgstr "" -#: src/pwmd.c:1462 +#: src/pwmd.c:1456 #, c-format msgid "Successfully added '%s' to the cache." msgstr "" -#: src/pwmd.c:1514 +#: src/pwmd.c:1508 #, c-format msgid "new connection: tid=%p, fd=%i, addr=%s" msgstr "" -#: src/pwmd.c:1517 +#: src/pwmd.c:1511 #, c-format msgid "new connection: tid=%p, fd=%i" msgstr "" -#: src/pwmd.c:1956 +#: src/pwmd.c:1950 #, c-format msgid "caught signal %i (%s)" msgstr "" -#: src/pwmd.c:1964 +#: src/pwmd.c:1958 msgid "clearing file cache" msgstr "" -#: src/pwmd.c:1985 +#: src/pwmd.c:1979 #, c-format msgid "Caught signal %i (%s). Exiting." msgstr "" -#: src/pwmd.c:2008 +#: src/pwmd.c:2002 msgid "waiting for all clients to disconnect" msgstr "" -#: src/pwmd.c:2031 +#: src/pwmd.c:2025 #, c-format msgid "%i clients remain" msgstr "" -#: src/pwmd.c:2111 +#: src/pwmd.c:2105 #, c-format msgid "%s started for user %s" msgstr "" -#: src/pwmd.c:2116 +#: src/pwmd.c:2110 #, c-format msgid "Listening on %s and TCP port %i as user %i" msgstr "" -#: src/pwmd.c:2119 src/pwmd.c:2121 +#: src/pwmd.c:2113 src/pwmd.c:2115 #, c-format msgid "Listening on %s" msgstr "" -#: src/pwmd.c:2203 +#: src/pwmd.c:2197 msgid "Received second termination request. Exiting." msgstr "" -#: src/pwmd.c:2251 +#: src/pwmd.c:2245 msgid "" "Failed to add a file to the cache. Use --ignore to force startup. Exiting." msgstr "" -#: src/pwmd.c:2346 +#: src/pwmd.c:2340 #, c-format msgid "Converting version 2 data file \"%s\" ..." msgstr "" -#: src/pwmd.c:2356 +#: src/pwmd.c:2350 #, c-format msgid "Using passphrase file \"%s\" for decryption ..." msgstr "" -#: src/pwmd.c:2431 +#: src/pwmd.c:2425 #, c-format msgid "Output written to \"%s\"." msgstr "" -#: src/pwmd.c:2453 +#: src/pwmd.c:2447 #, c-format msgid "" "Usage: %s [OPTIONS] [file1] [...]\n" @@ -249,17 +249,17 @@ msgid "" " --version show version and compile time features\n" msgstr "" -#: src/pwmd.c:2486 +#: src/pwmd.c:2480 #, c-format msgid "removing stale socket %s" msgstr "" -#: src/pwmd.c:2552 +#: src/pwmd.c:2546 #, c-format msgid "an instance for socket %s is already running" msgstr "" -#: src/pwmd.c:2788 +#: src/pwmd.c:2782 #, c-format msgid "" "%s\n" @@ -272,26 +272,26 @@ msgid "" "%s" msgstr "" -#: src/pwmd.c:2900 +#: src/pwmd.c:2894 msgid "incompatible gpg-agent version: 2.1.0 or later required" msgstr "" -#: src/pwmd.c:3016 +#: src/pwmd.c:3010 #, c-format msgid "" "Either there is another pwmd running or '%s' is a \n" "stale socket. Please remove it manually." msgstr "" -#: src/pwmd.c:3105 +#: src/pwmd.c:3099 msgid "Done. Daemonizing..." msgstr "" -#: src/pwmd.c:3106 +#: src/pwmd.c:3100 msgid "Done. Waiting for connections..." msgstr "" -#: src/pwmd.c:3187 +#: src/pwmd.c:3181 msgid "pwmd exiting normally" msgstr "" @@ -299,17 +299,17 @@ msgstr "" msgid "Waiting for lock" msgstr "" -#: src/commands.c:335 +#: src/commands.c:339 #, c-format msgid "Bad passphrase (try %i of %i)" msgstr "" -#: src/commands.c:4116 +#: src/commands.c:4115 #, c-format msgid "command completed: rc=%u" msgstr "" -#: src/commands.c:4132 +#: src/commands.c:4131 msgid "" "Usage: HELP []\n" "For commands that take an element path as an argument, each element is " @@ -317,39 +317,40 @@ msgid "" "COMMANDS:" msgstr "" -#: src/commands.c:4164 +#: src/commands.c:4163 #, c-format msgid "Usage: %s" msgstr "" -#: src/commands.c:4522 +#: src/commands.c:4540 msgid "" "HELP []\n" "Show available commands or command specific help text." msgstr "" -#: src/commands.c:4527 +#: src/commands.c:4545 msgid "" "AGENT \n" "Send a @command{gpg-agent} protocol @var{command} directly to the " "@command{gpg-agent}." msgstr "" -#: src/commands.c:4533 +#: src/commands.c:4551 msgid "" -"GETINFO [--data] CACHE | CLIENTS | PID | LAST_ERROR | VERSION\n" +"GETINFO [--data] CACHE | CLIENTS | PID | USER | LAST_ERROR | VERSION\n" "Get server and other information: @var{cache} returns the number of cached " "documents via a status message. @var{clients} returns the number of " "connected clients via a status message. @var{pid} returns the process ID " "number of the server via a data response. @var{VERSION} returns the server " "version number and compile-time features with a data response with each " "being space delimited. @var{LAST_ERROR} returns a detailed description of " -"the last failed command when available. @xref{Status Messages}. \n" +"the last failed command when available. @var{USER} returns the username or " +"@abbr{TLS} hash of the connected client. @xref{Status Messages}. \n" "When the @option{--data} option is specified then the result will be sent " "via a data response rather than a status message." msgstr "" -#: src/commands.c:4547 +#: src/commands.c:4566 msgid "" "PASSWD [--reset] [--s2k-count=N] [--no-passphrase]\n" "Changes the passphrase of the secret key required to open the current file " @@ -368,7 +369,7 @@ msgid "" "Control})." msgstr "" -#: src/commands.c:4568 +#: src/commands.c:4587 msgid "" "KEYGRIP [--sign] \n" "Returns the hex encoded keygrip of the specified @var{filename} with a data " @@ -379,7 +380,7 @@ msgid "" "GPG_ERR_NOT_SUPPORTED." msgstr "" -#: src/commands.c:4580 +#: src/commands.c:4599 msgid "" "OPEN [--lock] []\n" "Opens @var{filename} using @var{passphrase}. When the filename is not found " @@ -393,7 +394,7 @@ msgid "" "has been opened." msgstr "" -#: src/commands.c:4595 +#: src/commands.c:4614 msgid "" "SAVE [--no-passphrase] [--reset] [--no-agent] [--s2k-count=N] [--" "cipher=] [--cipher-iterations=N] [--inquire-keyparam] [--" @@ -441,7 +442,7 @@ msgid "" "effect with symmetrically encrypted data files." msgstr "" -#: src/commands.c:4648 +#: src/commands.c:4667 msgid "" "ISCACHED [--lock] \n" "An @emph{OK} response is returned if the specified @var{filename} is found " @@ -454,13 +455,13 @@ msgid "" "command." msgstr "" -#: src/commands.c:4661 +#: src/commands.c:4680 msgid "" "CLEARCACHE []\n" "Clears a file cache entry for all or the specified @var{filename}." msgstr "" -#: src/commands.c:4666 +#: src/commands.c:4685 msgid "" "CACHETIMEOUT \n" "The time in @var{seconds} until @var{filename} will be removed from the " @@ -469,7 +470,7 @@ msgid "" "@pxref{SAVE}). @xref{Configuration}, and the @code{cache_timeout} parameter." msgstr "" -#: src/commands.c:4675 +#: src/commands.c:4694 msgid "" "LIST [--inquire] [--no-recurse] [--verbose] [--with-target] [--all] " "[[!]element[[!]child[..]]]\n" @@ -504,7 +505,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4713 +#: src/commands.c:4732 msgid "" "REALPATH [--inquire] [!]element[[!]child[..]]\n" "Resolves all @code{target} attributes of the specified element path and " @@ -514,7 +515,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4722 +#: src/commands.c:4741 msgid "" "STORE [!]element[[!]child[..]][content]\n" "This command uses a server @emph{INQUIRE} to retrieve data from the client.\n" @@ -532,7 +533,7 @@ msgid "" "to prevent @abbr{XML} parsing and @command{pwmd} syntax errors." msgstr "" -#: src/commands.c:4741 +#: src/commands.c:4760 msgid "" "RENAME [--inquire] [!]element[[!]child[..]] \n" "Renames the specified @var{element} to the new @var{value}. If an element of " @@ -541,7 +542,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4750 +#: src/commands.c:4769 msgid "" "COPY [--inquire] [!]source[[!]child[..]] [!]dest[[!]child[..]]\n" "Copies the entire element tree starting from the child node of the source " @@ -555,7 +556,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4766 +#: src/commands.c:4785 msgid "" "MOVE [--inquire] [!]source[[!]child[..]] [[!]dest[[!]child[..]]]\n" "Moves the source element path to the destination element path. If the " @@ -567,7 +568,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4778 +#: src/commands.c:4797 msgid "" "DELETE [--inquire] [!]element[[!]child[..]]\n" "Removes the specified element path and all of its children. This may break " @@ -577,7 +578,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4788 +#: src/commands.c:4807 msgid "" "GET [--inquire] [!]element[[!]child[..]]\n" "Retrieves the content of the specified element. The content is returned with " @@ -586,7 +587,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4797 +#: src/commands.c:4816 msgid "" "ATTR [--inquire] SET|GET|DELETE|LIST [] " "[!]element[[!]child[..]] ..\n" @@ -619,7 +620,7 @@ msgid "" "@xref{Target Attribute}, for details about this special attribute." msgstr "" -#: src/commands.c:4834 +#: src/commands.c:4853 msgid "" "XPATH [--inquire] [[value]]\n" "Evaluates an XPath @var{expression}. If no @var{value} argument is specified " @@ -639,7 +640,7 @@ msgid "" "expression syntax." msgstr "" -#: src/commands.c:4857 +#: src/commands.c:4876 msgid "" "XPATHATTR [--inquire] SET|DELETE [[]]\n" "Like the @code{XPATH} command (@pxref{XPATH}) but operates on element " @@ -657,7 +658,7 @@ msgid "" "expression syntax." msgstr "" -#: src/commands.c:4878 +#: src/commands.c:4897 msgid "" "IMPORT [--root [!]element[[!]child[..]]] \n" "This command uses a server @emph{INQUIRE} to retrieve data from the client.\n" @@ -670,14 +671,14 @@ msgid "" "for details." msgstr "" -#: src/commands.c:4892 +#: src/commands.c:4911 msgid "" "DUMP\n" "Shows the in memory @abbr{XML} document with indenting. @xref{XPATH}, for " "dumping a specific node." msgstr "" -#: src/commands.c:4898 +#: src/commands.c:4917 msgid "" "LOCK\n" "Locks the mutex associated with the opened file. This prevents other clients " @@ -686,7 +687,7 @@ msgid "" "@xref{UNLOCK}." msgstr "" -#: src/commands.c:4906 +#: src/commands.c:4925 msgid "" "UNLOCK\n" "Unlocks the file mutex which was locked with the @code{LOCK} command or a " @@ -694,7 +695,7 @@ msgid "" "@pxref{ISCACHED})." msgstr "" -#: src/commands.c:4913 +#: src/commands.c:4932 msgid "" "GETCONFIG [filename] \n" "Returns the value of a @command{pwmd} configuration @var{parameter} with a " @@ -704,7 +705,7 @@ msgid "" "with the @code{OPTION} command (@pxref{OPTION}) will be returned." msgstr "" -#: src/commands.c:4922 +#: src/commands.c:4941 msgid "" "OPTION =\n" "Sets a client option @var{name} to @var{value}. The value for an option is " @@ -754,20 +755,20 @@ msgid "" "An integer specifiying the logging level.@end table\n" msgstr "" -#: src/commands.c:4976 +#: src/commands.c:4995 msgid "" "LS\n" "Lists the available data files stored in the data directory (@file{~/.pwmd/" "data}). The result is a newline separated list of filenames." msgstr "" -#: src/commands.c:4982 +#: src/commands.c:5001 msgid "" "RESET\n" "Closes the currently opened file but keeps any previously set client options." msgstr "" -#: src/commands.c:4987 +#: src/commands.c:5006 msgid "" "NOP\n" "Does nothing. Always returns successfully." @@ -821,26 +822,26 @@ msgstr "" msgid "Warning: unknown element '%s' at %s. Ignoring." msgstr "" -#: src/tls.c:90 +#: src/tls.c:94 msgid "client certificate is invalid" msgstr "" -#: src/tls.c:93 +#: src/tls.c:97 msgid "client certificate is revoked" msgstr "" -#: src/tls.c:96 +#: src/tls.c:100 msgid "client certificate has no signer" msgstr "" -#: src/tls.c:99 +#: src/tls.c:103 msgid "client certificate signer is not from CA" msgstr "" -#: src/tls.c:102 +#: src/tls.c:106 msgid "client certificate has insecure algorithm" msgstr "" -#: src/tls.c:353 +#: src/tls.c:356 msgid "Generating key exchange parameters..." msgstr "" -- 2.11.4.GIT