[svn] GnuPG - r3846 - in branches/GNUPG-1-9-BRANCH: . agent po tools
svn author wk
cvs at cvs.gnupg.org
Mon Aug 1 18:54:55 CEST 2005
Author: wk
Date: 2005-08-01 18:54:54 +0200 (Mon, 01 Aug 2005)
New Revision: 3846
Modified:
branches/GNUPG-1-9-BRANCH/ChangeLog
branches/GNUPG-1-9-BRANCH/NEWS
branches/GNUPG-1-9-BRANCH/agent/t-protect.c
branches/GNUPG-1-9-BRANCH/configure.ac
branches/GNUPG-1-9-BRANCH/po/de.po
branches/GNUPG-1-9-BRANCH/tools/ChangeLog
branches/GNUPG-1-9-BRANCH/tools/gpgsm-gencert.sh
Log:
About to release 1.9.18
Modified: branches/GNUPG-1-9-BRANCH/ChangeLog
===================================================================
--- branches/GNUPG-1-9-BRANCH/ChangeLog 2005-08-01 13:17:42 UTC (rev 3845)
+++ branches/GNUPG-1-9-BRANCH/ChangeLog 2005-08-01 16:54:54 UTC (rev 3846)
@@ -1,3 +1,9 @@
+2005-08-01 Werner Koch <wk at g10code.com>
+
+ Released 1.9.18.
+
+ * configure.ac: Require libksba 0.9.12 to match new features in gpgsm.
+
2005-06-20 Werner Koch <wk at g10code.com>
Released 1.9.17.
Modified: branches/GNUPG-1-9-BRANCH/NEWS
===================================================================
--- branches/GNUPG-1-9-BRANCH/NEWS 2005-08-01 13:17:42 UTC (rev 3845)
+++ branches/GNUPG-1-9-BRANCH/NEWS 2005-08-01 16:54:54 UTC (rev 3846)
@@ -1,11 +1,13 @@
-Noteworthy changes in version 1.9.18
+Noteworthy changes in version 1.9.18 (2005-08-01)
-------------------------------------------------
* [gpgsm] Now allows for more than one email address as well as URIs
and dnsNames in certificate request generation. A keygrip may be
given to create a request from an existing key.
+ * A couple of minor bug fixes.
+
Noteworthy changes in version 1.9.17 (2005-06-20)
-------------------------------------------------
Modified: branches/GNUPG-1-9-BRANCH/agent/t-protect.c
===================================================================
--- branches/GNUPG-1-9-BRANCH/agent/t-protect.c 2005-08-01 13:17:42 UTC (rev 3845)
+++ branches/GNUPG-1-9-BRANCH/agent/t-protect.c 2005-08-01 16:54:54 UTC (rev 3846)
@@ -72,6 +72,7 @@
static void
test_make_shadow_info (void)
{
+#if 0
static struct
{
const char *snstr;
@@ -96,6 +97,7 @@
/* fixme: Need to compare the result but also need to check
proper S-expression syntax. */
}
+#endif
}
Modified: branches/GNUPG-1-9-BRANCH/configure.ac
===================================================================
--- branches/GNUPG-1-9-BRANCH/configure.ac 2005-08-01 13:17:42 UTC (rev 3845)
+++ branches/GNUPG-1-9-BRANCH/configure.ac 2005-08-01 16:54:54 UTC (rev 3846)
@@ -24,7 +24,7 @@
# Version number: Remember to change it immediately *after* a release.
# Add a "-cvs" prefix for non-released code.
-AC_INIT(gnupg, 1.9.18-cvs, gnupg-devel at gnupg.org)
+AC_INIT(gnupg, 1.9.18, gnupg-devel at gnupg.org)
# Set development_version to yes if the minor number is odd or you
# feel that the default check for a development version is not
# sufficient.
@@ -36,7 +36,7 @@
NEED_LIBASSUAN_VERSION=0.6.10
-NEED_KSBA_VERSION=0.9.11
+NEED_KSBA_VERSION=0.9.12
PACKAGE=$PACKAGE_NAME
Modified: branches/GNUPG-1-9-BRANCH/po/de.po
===================================================================
--- branches/GNUPG-1-9-BRANCH/po/de.po 2005-08-01 13:17:42 UTC (rev 3845)
+++ branches/GNUPG-1-9-BRANCH/po/de.po 2005-08-01 16:54:54 UTC (rev 3846)
@@ -11,7 +11,7 @@
"Project-Id-Version: gnupg2 1.9.18\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
"POT-Creation-Date: 2005-06-16 09:12+0200\n"
-"PO-Revision-Date: 2005-08-01 14:44+0200\n"
+"PO-Revision-Date: 2005-08-01 15:09+0200\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: de\n"
"MIME-Version: 1.0\n"
@@ -521,7 +521,7 @@
#: kbx/kbxutil.c:107
msgid "Please report bugs to "
-msgstr "Bite richten sie Berichte über Bugs (Softwarefehler) an "
+msgstr "Bitte richten sie Berichte über Bugs (Softwarefehler) an "
#: kbx/kbxutil.c:107
msgid ".\n"
@@ -921,8 +921,7 @@
#: sm/certchain.c:607
msgid "please make sure that the \"dirmngr\" is properly installed\n"
-msgstr ""
-"Bite vergewissern Sie sich das der \"dirmngr\" richtig installierrt ist\n"
+msgstr "Bitte vergewissern Sie sich das der \"dirmngr\" richtig installierrt ist\n"
#: sm/certchain.c:612
#, c-format
Modified: branches/GNUPG-1-9-BRANCH/tools/ChangeLog
===================================================================
--- branches/GNUPG-1-9-BRANCH/tools/ChangeLog 2005-08-01 13:17:42 UTC (rev 3845)
+++ branches/GNUPG-1-9-BRANCH/tools/ChangeLog 2005-08-01 16:54:54 UTC (rev 3846)
@@ -1,3 +1,8 @@
+2005-08-01 Werner Koch <wk at g10code.com>
+
+ * gpgsm-gencert.sh: Allow entering a keygrip to generate a CSR from
+ an existing key.
+
2005-07-21 Werner Koch <wk at g10code.com>
* gpgsm-gencert.sh: Reworked to allow for multiple email addresses
Modified: branches/GNUPG-1-9-BRANCH/tools/gpgsm-gencert.sh
===================================================================
--- branches/GNUPG-1-9-BRANCH/tools/gpgsm-gencert.sh 2005-08-01 13:17:42 UTC (rev 3845)
+++ branches/GNUPG-1-9-BRANCH/tools/gpgsm-gencert.sh 2005-08-01 16:54:54 UTC (rev 3846)
@@ -84,11 +84,20 @@
echo "You selected: $ANSWER" >&2
}
-query_user_menu "Key type" "RSA"
-KEY_TYPE=$ANSWER
+query_user_menu "Key type" "RSA" "existing key"
+if [ "$ANSWER" = "existing key" ]; then
+ # User requested to use an existing key; need to set some dummy defaults
+ KEY_TYPE=RSA
+ KEY_LENGTH=1024
+ query_user "Keygrip "
+ KEY_GRIP=$ANSWER
+else
+ KEY_TYPE=$ANSWER
+ query_user_menu "Key length" "1024" "2048"
+ KEY_LENGTH=$ANSWER
+ KEY_GRIP=
+fi
-query_user_menu "Key length" "1024" "2048"
-KEY_LENGTH=$ANSWER
query_user_menu "Key usage" "sign, encrypt" "sign" "encrypt"
KEY_USAGE=$ANSWER
@@ -137,6 +146,7 @@
Key-Usage: $KEY_USAGE
Name-DN: $NAME
EOF
+[ -n "$KEY_GRIP" ] && echo "Key-Grip: $KEY_GRIP"
[ -n "$EMAIL_ADDRESSES" ] && echo "$EMAIL_ADDRESSES"
[ -n "$DNS_ADDRESSES" ] && echo "$DNS_ADDRESSES"
[ -n "$URI_ADDRESSES" ] && echo "$URI_ADDRESSES"
@@ -152,7 +162,7 @@
echo -e "$ASSUAN_COMMANDS" | \
- ./gpgsm --no-log-file --debug-level none --debug-none \
+ gpgsm --no-log-file --debug-level none --debug-none \
--server 4< "$file_parameter" 5>"$outfile" >/dev/null
cat "$outfile"
More information about the Gnupg-commits
mailing list