From ddd40c3717f814d8b6afe72a7871bc148907689f Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Sat, 27 Sep 2014 17:40:07 -0400 Subject: [PATCH] Version 7.2.0. --- NEWS | 15 +++++++++ README | 3 +- configure.ac | 2 +- po/libpwmd.pot | 96 +++++++++++++++++++++++++++++----------------------------- 4 files changed, 66 insertions(+), 50 deletions(-) diff --git a/NEWS b/NEWS index 21e98a5e..8aa4ce9a 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,18 @@ +libPWMD v7.2.0 +-------------- +Require an SHA-256 TLS server fingerprint rather than SHA-1. + +Added pwmd_tls_error() to get the return code of a failed gnutls function. +This error can be described with gnutls_strerror(). + +Added PWMD_OPTION_SIGPIPE to prevent ignoring SIGPIPE which is now the +default. + +Fixed TLS wait interval when EAGAIN occured. + +A couple other TLS bug fixes. See ChangeLog for details. + + libPWMD v7.1.1 -------------- Add (mostly useless) pwmc interactive option ".set pinentry-timeout". This diff --git a/README b/README index dd31f2fb..fbb819de 100644 --- a/README +++ b/README @@ -10,7 +10,8 @@ Requirements: Is a good choice. Required. libassuan - http://www.gnupg.org/ - Protocol. Version 2.0.3 or later is required. + Protocol. Version 2.0.3 or later is required. Version 2.1.0 + or later is recommended. libgpg-error - http://www.gnupg.org/ libassuan (and pwmd) return gpg error codes. Required. diff --git a/configure.ac b/configure.ac index aace77e0..723b9031 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(libpwmd, 7.1.2-dev, [Ben Kibbey bjk@luxsci.net]) +AC_INIT(libpwmd, 7.2.0, [Ben Kibbey bjk@luxsci.net]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR(build) AC_CANONICAL_TARGET diff --git a/po/libpwmd.pot b/po/libpwmd.pot index 3fe3a149..c278b6a9 100644 --- a/po/libpwmd.pot +++ b/po/libpwmd.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-01-11 16:01-0500\n" +"POT-Creation-Date: 2014-09-27 17:40-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,32 +17,32 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/libpwmd.c:632 src/pwmc.c:443 src/pwmc.c:524 +#: src/libpwmd.c:634 src/pwmc.c:451 src/pwmc.c:532 #, c-format msgid "Input is not from a terminal! Failing.\n" msgstr "" -#: src/libpwmd.c:657 src/pwmc.c:468 +#: src/libpwmd.c:659 src/pwmc.c:476 #, c-format msgid "Password for %s: " msgstr "" -#: src/libpwmd.c:660 src/pwmc.c:471 +#: src/libpwmd.c:662 src/pwmc.c:479 #, c-format msgid "Invalid password. Password for %s: " msgstr "" -#: src/libpwmd.c:664 src/pwmc.c:474 +#: src/libpwmd.c:666 src/pwmc.c:482 #, c-format msgid "New password for %s: " msgstr "" -#: src/libpwmd.c:667 src/pwmc.c:477 +#: src/libpwmd.c:669 src/pwmc.c:485 #, c-format msgid "Confirm password: " msgstr "" -#: src/libpwmd.c:769 +#: src/libpwmd.c:771 #, c-format msgid "Passphrases do not match.\n" msgstr "" @@ -68,80 +68,80 @@ msgstr "" msgid "it is based on your username" msgstr "" -#: src/pinentry.c:150 +#: src/pinentry.c:149 msgid "it does not contain enough DIFFERENT characters" msgstr "" -#: src/pinentry.c:152 +#: src/pinentry.c:151 msgid "it is based on a dictionary word" msgstr "" -#: src/pinentry.c:154 +#: src/pinentry.c:153 msgid "it is based upon your password entry" msgstr "" -#: src/pinentry.c:156 +#: src/pinentry.c:155 msgid "it's derived from your password entry" msgstr "" -#: src/pinentry.c:158 +#: src/pinentry.c:157 msgid "it is derived from your password entry" msgstr "" -#: src/pinentry.c:160 +#: src/pinentry.c:159 msgid "it is based on a (reversed) dictionary word" msgstr "" -#: src/pinentry.c:162 +#: src/pinentry.c:161 msgid "it is derivable from your password entry" msgstr "" -#: src/pinentry.c:164 +#: src/pinentry.c:163 msgid "it's derivable from your password entry" msgstr "" -#: src/pinentry.c:166 +#: src/pinentry.c:165 msgid "it looks like a National Insurance number." msgstr "" -#: src/pinentry.c:168 +#: src/pinentry.c:167 msgid "it is too simplistic/systematic" msgstr "" -#: src/pinentry.c:197 +#: src/pinentry.c:196 msgid "Passphrase:" msgstr "" -#: src/pinentry.c:210 +#: src/pinentry.c:209 #, c-format msgid "" "A passphrase is required to unlock the secret key for the encrypted data " "file \"%s\". Please enter the passphrase below." msgstr "" -#: src/pinentry.c:216 +#: src/pinentry.c:215 #, c-format msgid "Please enter the passphrase to use to encrypt the data file \"%s\"." msgstr "" -#: src/pinentry.c:221 +#: src/pinentry.c:220 msgid "Please re-enter the passphrase for confirmation." msgstr "" -#: src/pinentry.c:255 +#: src/pinentry.c:254 msgid "Passphrases do not match, try again." msgstr "" -#: src/pinentry.c:262 +#: src/pinentry.c:261 #, c-format msgid "Bad passphrase (try %i of %i)" msgstr "" -#: src/pinentry.c:267 +#: src/pinentry.c:266 msgid "Bad passphrase, try again" msgstr "" -#: src/pwmc.c:137 +#: src/pwmc.c:145 #, c-format msgid "" "Usage: pwmc [options] [file]\n" @@ -162,7 +162,7 @@ msgid "" " --tls-verify\n" " verify the hostname against the server certificate\n" " --tls-fingerprint \n" -" a SHA-1 hash of the server fingerprint to verify against\n" +" a SHA-256 hash of the server fingerprint to verify against\n" " --no-ssh-agent\n" " disable SSH agent use (enabled when SSH_AUTH_SOCK is set)\n" " --identity, -i \n" @@ -241,7 +241,7 @@ msgid "" " --help\n" msgstr "" -#: src/pwmc.c:246 +#: src/pwmc.c:254 #, c-format msgid "" "\n" @@ -260,17 +260,17 @@ msgid "" "Interactive mode is used when input is from a terminal.\n" msgstr "" -#: src/pwmc.c:320 +#: src/pwmc.c:328 #, c-format msgid "Using keyfile '%s' as %s.\n" msgstr "" -#: src/pwmc.c:352 +#: src/pwmc.c:360 #, c-format msgid "Press CTRL-D to send the current line. Press twice to end. %s:\n" msgstr "" -#: src/pwmc.c:519 +#: src/pwmc.c:527 #, c-format msgid "" "Password Manager Daemon: %s\n" @@ -283,12 +283,12 @@ msgid "" "connections by adding %s's hostkey to the known hosts file?" msgstr "" -#: src/pwmc.c:553 +#: src/pwmc.c:561 #, c-format msgid "Trust this connection [y/N]: " msgstr "" -#: src/pwmc.c:763 +#: src/pwmc.c:771 #, c-format msgid "" "------------------------------------------------------------------------------\n" @@ -300,24 +300,24 @@ msgid "" "------------------------------------------------------------------------------\n" msgstr "" -#: src/pwmc.c:882 +#: src/pwmc.c:891 #, c-format msgid "Usage: .read [--prefix ] [args]\n" msgstr "" -#: src/pwmc.c:885 +#: src/pwmc.c:894 #, c-format msgid "" "Use '\\' to escape special characters in the --prefix (\\t = TAB, \\\" = " "\")\n" msgstr "" -#: src/pwmc.c:935 +#: src/pwmc.c:945 #, c-format msgid "Usage: .redir [args]\n" msgstr "" -#: src/pwmc.c:971 +#: src/pwmc.c:981 #, c-format msgid "" "Type HELP for protocol commands. Available pwmc commands:\n" @@ -344,22 +344,22 @@ msgid "" " this help text\n" msgstr "" -#: src/pwmc.c:1007 +#: src/pwmc.c:1017 #, c-format msgid "Usage: .open \n" msgstr "" -#: src/pwmc.c:1016 +#: src/pwmc.c:1026 #, c-format msgid "Opening data file \"%s\" ...\n" msgstr "" -#: src/pwmc.c:1050 +#: src/pwmc.c:1060 #, c-format msgid "Usage: .set help | []\n" msgstr "" -#: src/pwmc.c:1150 +#: src/pwmc.c:1163 #, c-format msgid "" "Set a libpwmd or pwmc option. The option name and optional value is space\n" @@ -378,42 +378,42 @@ msgid "" "* = the next protocol command will unset this value\n" msgstr "" -#: src/pwmc.c:1276 +#: src/pwmc.c:1289 #, c-format msgid "WARNING: interactive mode doesn't use secure memory!\n" msgstr "" -#: src/pwmc.c:1368 +#: src/pwmc.c:1383 #, c-format msgid "(c)ancel/(f)orget password/(s)ave/(Q)uit/(S)ave and quit/(h)elp?: " msgstr "" -#: src/pwmc.c:1412 +#: src/pwmc.c:1427 #, c-format msgid "No filename was specified on the command line. Aborting.\n" msgstr "" -#: src/pwmc.c:1440 +#: src/pwmc.c:1455 #, c-format msgid "Saving changes ...\n" msgstr "" -#: src/pwmc.c:1788 +#: src/pwmc.c:1803 #, c-format msgid "%s: invalid argument for option '--%s'\n" msgstr "" -#: src/pwmc.c:1844 +#: src/pwmc.c:1859 #, c-format msgid "Connecting ...\n" msgstr "" -#: src/pwmc.c:1899 +#: src/pwmc.c:1914 #, c-format msgid "Connected.\n" msgstr "" -#: src/pwmc.c:2097 +#: src/pwmc.c:2112 #, c-format msgid "Connection closed.\n" msgstr "" -- 2.11.4.GIT