diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | agent/t-protect.c | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | po/de.po | 7 | ||||
| -rw-r--r-- | tools/ChangeLog | 5 | ||||
| -rwxr-xr-x | tools/gpgsm-gencert.sh | 20 |
7 files changed, 36 insertions, 12 deletions
@@ -1,3 +1,9 @@ +2005-08-01 Werner Koch <wk@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@g10code.com> Released 1.9.17. @@ -1,10 +1,12 @@ -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) ------------------------------------------------- diff --git a/agent/t-protect.c b/agent/t-protect.c index 0cb8265ba..21cbe1160 100644 --- a/agent/t-protect.c +++ b/agent/t-protect.c @@ -72,6 +72,7 @@ test_agent_private_key_type (void) static void test_make_shadow_info (void) { +#if 0 static struct { const char *snstr; @@ -96,6 +97,7 @@ test_make_shadow_info (void) /* fixme: Need to compare the result but also need to check proper S-expression syntax. */ } +#endif } diff --git a/configure.ac b/configure.ac index fa686d0cb..9c63fcbea 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ min_automake_version="1.9.3" # 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@gnupg.org) +AC_INIT(gnupg, 1.9.18, gnupg-devel@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_LIBGCRYPT_VERSION=1.1.94 NEED_LIBASSUAN_VERSION=0.6.10 -NEED_KSBA_VERSION=0.9.11 +NEED_KSBA_VERSION=0.9.12 PACKAGE=$PACKAGE_NAME @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: gnupg2 1.9.18\n" "Report-Msgid-Bugs-To: translations@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@gnupg.org>\n" "Language-Team: de\n" "MIME-Version: 1.0\n" @@ -521,7 +521,7 @@ msgstr "Alle Debug Flags setzen" #: 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 @@ msgstr "Die vorhandene CRL ist zu alt" #: 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 diff --git a/tools/ChangeLog b/tools/ChangeLog index e1dfce49d..7dc6d512e 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,8 @@ +2005-08-01 Werner Koch <wk@g10code.com> + + * gpgsm-gencert.sh: Allow entering a keygrip to generate a CSR from + an existing key. + 2005-07-21 Werner Koch <wk@g10code.com> * gpgsm-gencert.sh: Reworked to allow for multiple email addresses diff --git a/tools/gpgsm-gencert.sh b/tools/gpgsm-gencert.sh index 44b06f3b3..3949f2361 100755 --- a/tools/gpgsm-gencert.sh +++ b/tools/gpgsm-gencert.sh @@ -84,11 +84,20 @@ query_user_menu() 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-Length: $KEY_LENGTH 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 @@ query_user_menu "Really create such a CSR?" "yes" "no" 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" |