GNUPG-1-9-BRANCH gnupg (13 files)
cvs user wk
cvs at cvs.gnupg.org
Fri Oct 22 17:59:38 CEST 2004
Date: Friday, October 22, 2004 @ 18:03:04
Author: wk
Path: /cvs/gnupg/gnupg
Tag: GNUPG-1-9-BRANCH
Modified: ChangeLog Makefile.am NEWS g10/ChangeLog g10/card-util.c
g10/g10.c g10/main.h po/ChangeLog po/POTFILES.in po/de.po
scd/ChangeLog scd/app-openpgp.c tools/Makefile.am
Compile fixes.
-------------------+
ChangeLog | 4 +
Makefile.am | 3 -
NEWS | 6 +-
g10/ChangeLog | 9 +++
g10/card-util.c | 30 ++++++++--
g10/g10.c | 8 ++
g10/main.h | 2
po/ChangeLog | 4 +
po/POTFILES.in | 1
po/de.po | 149 +++++++++++++++++++++++++++-------------------------
scd/ChangeLog | 5 +
scd/app-openpgp.c | 8 +-
tools/Makefile.am | 2
13 files changed, 143 insertions(+), 88 deletions(-)
Index: gnupg/ChangeLog
diff -u gnupg/ChangeLog:1.131.2.55 gnupg/ChangeLog:1.131.2.56
--- gnupg/ChangeLog:1.131.2.55 Fri Oct 1 14:54:53 2004
+++ gnupg/ChangeLog Fri Oct 22 18:03:04 2004
@@ -1,3 +1,7 @@
+2004-10-22 Werner Koch <wk at g10code.com>
+
+ * Makefile.am (AUTOMAKE_OPTIONS): Set option to create bzip2 tarball.
+
2004-10-01 Werner Koch <wk at g10code.com>
Released 1.9.11.
Index: gnupg/Makefile.am
diff -u gnupg/Makefile.am:1.46.4.10 gnupg/Makefile.am:1.46.4.11
--- gnupg/Makefile.am:1.46.4.10 Tue Jul 20 20:41:49 2004
+++ gnupg/Makefile.am Fri Oct 22 18:03:04 2004
@@ -1,5 +1,5 @@
# Makefile.am - main makefile for NewPG/GnuPG
-# Copyright (C) 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2004 Free Software Foundation, Inc.
#
# This file is part of GnuPG.
#
@@ -20,6 +20,7 @@
## Process this file with automake to produce Makefile.in
ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = dist-bzip2
EXTRA_DIST = scripts/config.rpath autogen.sh README.CVS
DISTCLEANFILES = g10defs.h
Index: gnupg/NEWS
diff -u gnupg/NEWS:1.165.2.54 gnupg/NEWS:1.165.2.55
--- gnupg/NEWS:1.165.2.54 Wed Oct 20 10:54:45 2004
+++ gnupg/NEWS Fri Oct 22 18:03:04 2004
@@ -3,8 +3,10 @@
* [scdaemon] Partly rewrote the PC/SC code.
- * Removed the sc-investigate tool. It is now in the separate
- gscutils package.
+ * Removed the sc-investigate tool. It is now in a separate package
+ available at ftp://ftp.g10code.com/g10code/gscutils/ .
+
+ * [gpg-agent] Fixed logging problem.
Noteworthy changes in version 1.9.11 (2004-10-01)
Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.372.2.51 gnupg/g10/ChangeLog:1.372.2.52
--- gnupg/g10/ChangeLog:1.372.2.51 Thu Sep 30 23:37:09 2004
+++ gnupg/g10/ChangeLog Fri Oct 22 18:03:04 2004
@@ -1,3 +1,12 @@
+2004-10-22 Werner Koch <wk at g10code.com>
+
+ * g10.c (main): Display a bit fat warning that this gpg should not
+ be used.
+
+ * card-util.c (fetch_url): Disable for gnupg 1.9
+ (card_generate_subkey): Ditto.
+ (card_store_subkey): Ditto.
+
2004-09-30 Werner Koch <wk at g10code.com>
* gpgv.c (i18n_init): Always use LC_ALL.
Index: gnupg/g10/card-util.c
diff -u gnupg/g10/card-util.c:1.1.2.16 gnupg/g10/card-util.c:1.1.2.17
--- gnupg/g10/card-util.c:1.1.2.16 Fri Oct 22 11:41:01 2004
+++ gnupg/g10/card-util.c Fri Oct 22 18:03:04 2004
@@ -523,6 +523,7 @@
static int
fetch_url(void)
{
+#if GNUPG_MAJOR_VERSION == 1
int rc;
struct agent_card_info_s info;
@@ -560,6 +561,9 @@
log_error("no URL set on card\n");
return rc;
+#else
+ return 0;
+#endif
}
@@ -577,12 +581,14 @@
for (args++; spacep (args); args++)
;
fp = fopen (args, "rb");
+#if GNUPG_MAJOR_VERSION == 1
if (fp && is_secured_file (fileno (fp)))
{
fclose (fp);
fp = NULL;
errno = EPERM;
}
+#endif
if (!fp)
{
tty_printf (_("can't open `%s': %s\n"), args, strerror (errno));
@@ -839,6 +845,7 @@
}
}
+#if GNUPG_MAJOR_VERSION == 1
/* Helper for the key generation/edit functions. */
static void
show_card_key_info (struct agent_card_info_s *info)
@@ -851,8 +858,9 @@
print_sha1_fpr (NULL, info->fpr3valid? info->fpr3:NULL);
tty_printf ("\n");
}
+#endif
-
+#if GNUPG_MAJOR_VERSION == 1
/* Helper for the key generation/edit functions. */
static int
replace_existing_key_p (struct agent_card_info_s *info, int keyno)
@@ -872,7 +880,7 @@
}
return 0;
}
-
+#endif
static void
@@ -895,10 +903,10 @@
m_free(answer);
}
#else
- /* Does 1.9 have answer_is_yes_no_default() ? */
- want_backup = !(cpr_get_answer_is_yes
+ want_backup = cpr_get_answer_is_yes
( "cardedit.genkeys.backup_enc",
- _("Inhibit off-card backup of encryption key? (y/N) ")));
+ _("Make off-card backup of encryption key? (Y/n) "));
+ /*FIXME: we need answer_is_yes_no_default()*/
#endif
if ( (info.fpr1valid && !fpr_is_zero (info.fpr1))
@@ -928,8 +936,12 @@
if (check_pin_for_key_operation (&info, &forced_chv1))
goto leave;
+#if GNUPG_MAJOR_VERSION == 1
generate_keypair (NULL, info.serialno,
want_backup? opt.homedir:NULL);
+#else
+ generate_keypair (NULL, info.serialno);
+#endif
leave:
agent_release_card_info (&info);
@@ -942,6 +954,7 @@
int
card_generate_subkey (KBNODE pub_keyblock, KBNODE sec_keyblock)
{
+#if GNUPG_MAJOR_VERSION == 1
struct agent_card_info_s info;
int okay = 0;
int forced_chv1 = 0;
@@ -988,6 +1001,9 @@
agent_release_card_info (&info);
restore_forced_chv1 (&forced_chv1);
return okay;
+#else
+ return 0;
+#endif
}
@@ -997,6 +1013,7 @@
int
card_store_subkey (KBNODE node, int use)
{
+#if GNUPG_MAJOR_VERSION == 1
struct agent_card_info_s info;
int okay = 0;
int rc;
@@ -1117,6 +1134,9 @@
free_secret_key (copied_sk);
agent_release_card_info (&info);
return okay;
+#else
+ return 0;
+#endif
}
Index: gnupg/g10/g10.c
diff -u gnupg/g10/g10.c:1.202.2.17 gnupg/g10/g10.c:1.202.2.18
--- gnupg/g10/g10.c:1.202.2.17 Fri Apr 30 18:36:35 2004
+++ gnupg/g10/g10.c Fri Oct 22 18:03:03 2004
@@ -2038,6 +2038,10 @@
}
#endif
+ log_info ("WARNING: This version of gpg is not very matured and\n");
+ log_info ("WARNING: only intended for testing. Please keep using\n");
+ log_info ("WARNING: gpg 1.2.x, 1.3.x or 1.4.x for OpenPGP\n");
+
/* FIXME: We should use the lggging to a file only in server mode;
however we have not yet implemetyed that thus we try to get
away with --batch as indication for logging to file required. */
@@ -2926,9 +2930,9 @@
case aChangePIN:
if (!argc)
- change_pin (0);
+ change_pin (0,1);
else if (argc == 1)
- change_pin ( atoi (*argv));
+ change_pin ( atoi (*argv), 1);
else
wrong_args ("--change-pin [no]");
break;
Index: gnupg/g10/main.h
diff -u gnupg/g10/main.h:1.96.2.9 gnupg/g10/main.h:1.96.2.10
--- gnupg/g10/main.h:1.96.2.9 Tue Oct 21 19:12:20 2003
+++ gnupg/g10/main.h Fri Oct 22 18:03:03 2004
@@ -259,7 +259,7 @@
void run_in_pipemode (void);
/*-- card-util.c --*/
-void change_pin (int no);
+void change_pin (int no, int allow_admin);
void card_status (FILE *fp, char *serialnobuf, size_t serialnobuflen);
void card_edit (STRLIST commands);
Index: gnupg/po/ChangeLog
diff -u gnupg/po/ChangeLog:1.50.2.8 gnupg/po/ChangeLog:1.50.2.9
--- gnupg/po/ChangeLog:1.50.2.8 Mon Oct 4 13:52:42 2004
+++ gnupg/po/ChangeLog Fri Oct 22 18:03:03 2004
@@ -1,3 +1,7 @@
+2004-10-22 Werner Koch <wk at g10code.com>
+
+ * POTFILES.in: Removed sc-investigate.c
+
2004-10-04 Werner Koch <wk at g10code.com>
* de.po: Typo fixes.
Index: gnupg/po/POTFILES.in
diff -u gnupg/po/POTFILES.in:1.22.2.4 gnupg/po/POTFILES.in:1.22.2.5
--- gnupg/po/POTFILES.in:1.22.2.4 Thu Sep 30 15:24:33 2004
+++ gnupg/po/POTFILES.in Fri Oct 22 18:03:03 2004
@@ -15,7 +15,6 @@
kbx/kbxutil.c
scd/scdaemon.c
-scd/sc-investigate.c
scd/app-openpgp.c
sm/base64.c
Index: gnupg/po/de.po
diff -u gnupg/po/de.po:1.84.2.12 gnupg/po/de.po:1.84.2.13
--- gnupg/po/de.po:1.84.2.12 Mon Oct 4 13:52:41 2004
+++ gnupg/po/de.po Fri Oct 22 18:03:03 2004
@@ -10,8 +10,8 @@
msgstr ""
"Project-Id-Version: gnupg2 1.9.10\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2004-10-01 14:54+0200\n"
-"PO-Revision-Date: 2004-10-04 13:48+0200\n"
+"POT-Creation-Date: 2004-10-22 15:02+0200\n"
+"PO-Revision-Date: 2004-10-22 15:02+0200\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: de\n"
"MIME-Version: 1.0\n"
@@ -100,12 +100,12 @@
msgstr "erlaube Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
#: agent/gpg-agent.c:195 agent/protect-tool.c:134 scd/scdaemon.c:168
-#: scd/sc-investigate.c:113 sm/gpgsm.c:485 tools/gpgconf.c:85
+#: sm/gpgsm.c:485 tools/gpgconf.c:85
msgid "Please report bugs to <"
msgstr "Fehlerberichte bitte an <"
#: agent/gpg-agent.c:195 agent/protect-tool.c:134 scd/scdaemon.c:168
-#: scd/sc-investigate.c:113 sm/gpgsm.c:485 tools/gpgconf.c:85
+#: sm/gpgsm.c:485 tools/gpgconf.c:85
msgid ">.\n"
msgstr ">.\n"
@@ -126,48 +126,48 @@
msgid "invalid debug-level `%s' given\n"
msgstr "ungültige Debugebene `%s' angegeben\n"
-#: agent/gpg-agent.c:446 agent/protect-tool.c:1050 kbx/kbxutil.c:431
-#: scd/scdaemon.c:357 scd/sc-investigate.c:181 sm/gpgsm.c:726
+#: agent/gpg-agent.c:448 agent/protect-tool.c:1050 kbx/kbxutil.c:431
+#: scd/scdaemon.c:357 sm/gpgsm.c:726
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
"Die Bibliothek \"libgcrypt\" is zu alt (benötigt wird %s, vorhanden ist %s)\n"
-#: agent/gpg-agent.c:519 scd/scdaemon.c:437 sm/gpgsm.c:824
+#: agent/gpg-agent.c:521 scd/scdaemon.c:437 sm/gpgsm.c:824
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "Notiz: Voreingestellte Konfigurationsdatei `%s' fehlt\n"
-#: agent/gpg-agent.c:524 agent/gpg-agent.c:998 scd/scdaemon.c:442
+#: agent/gpg-agent.c:526 agent/gpg-agent.c:1000 scd/scdaemon.c:442
#: sm/gpgsm.c:828
#, c-format
msgid "option file `%s': %s\n"
msgstr "Konfigurationsdatei `%s': %s\n"
-#: agent/gpg-agent.c:532 scd/scdaemon.c:450 sm/gpgsm.c:835
+#: agent/gpg-agent.c:534 scd/scdaemon.c:450 sm/gpgsm.c:835
#, c-format
msgid "reading options from `%s'\n"
msgstr "Optionen werden aus `%s' gelesen\n"
-#: agent/gpg-agent.c:1031 agent/gpg-agent.c:1065
+#: agent/gpg-agent.c:1033 agent/gpg-agent.c:1067
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "Das Verzeichniss `%s' kann nicht erstell werden: %s\n"
-#: agent/gpg-agent.c:1034 agent/gpg-agent.c:1070
+#: agent/gpg-agent.c:1036 agent/gpg-agent.c:1072
#, c-format
msgid "directory `%s' created\n"
msgstr "Verzeichniss `%s' wurde erstellt\n"
-#: agent/gpg-agent.c:1248
+#: agent/gpg-agent.c:1250
msgid "no gpg-agent running in this session\n"
msgstr "Der gpg-agent läuft nicht für diese Session\n"
-#: agent/gpg-agent.c:1255 common/simple-pwquery.c:286 sm/call-agent.c:128
+#: agent/gpg-agent.c:1257 common/simple-pwquery.c:286 sm/call-agent.c:128
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "Die Variable GPG_AGENT_INFO ist fehlerhaft\n"
-#: agent/gpg-agent.c:1267 common/simple-pwquery.c:298 sm/call-agent.c:140
+#: agent/gpg-agent.c:1269 common/simple-pwquery.c:298 sm/call-agent.c:140
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "Das gpg-agent Protocol %d wird nicht unterstützt\n"
@@ -327,7 +327,7 @@
msgid "problem with the agent\n"
msgstr "Problem mit dem Agenten\n"
-#: jnlib/logging.c:555
+#: jnlib/logging.c:621
#, c-format
msgid "you found a bug ... (%s:%d)\n"
msgstr "Sie haben einen Bug (Softwarefehler) gefunden ... (%s:%d)\n"
@@ -432,100 +432,87 @@
"Bitte die Option `--daemon' nutzen um das Programm im Hintergund "
"auszuführen\n"
-#: scd/sc-investigate.c:116
-msgid "Usage: sc-investigate [options] (-h for help)\n"
-msgstr "Gebrauch: sc-investigate [Optionen] (-h für Hilfe)\n"
-
-#: scd/sc-investigate.c:118
-msgid ""
-"Syntax: sc-investigate [options] [args]]\n"
-"Have a look at smartcards\n"
-msgstr ""
-"Gebrauch: sc-investigate [Optionen] [Argumente]\n"
-"Den Inhalt einer Smartcard inspizieren\n"
-
-#: scd/app-openpgp.c:458
+#: scd/app-openpgp.c:534
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "Der Fingerprint kann nicht gespeichert werden: %s\n"
-#: scd/app-openpgp.c:471
+#: scd/app-openpgp.c:547
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "Das Erzeugungsdatum kann nicht gespeichert werden: %s\n"
-#: scd/app-openpgp.c:656 scd/app-openpgp.c:745
+#: scd/app-openpgp.c:732 scd/app-openpgp.c:821 scd/app-openpgp.c:1313
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "Fehler vom PIN \"callback\": %s\n"
-#: scd/app-openpgp.c:662 scd/app-openpgp.c:751 scd/app-openpgp.c:1236
+#: scd/app-openpgp.c:738 scd/app-openpgp.c:827 scd/app-openpgp.c:1319
#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr "Die Passphrase (CHV%d) ist zu kurz; Mindestlänge ist %d\n"
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "Die PIN für den CHV%d ist zu kurz; Mindestlänge ist %d\n"
-#: scd/app-openpgp.c:671 scd/app-openpgp.c:685 scd/app-openpgp.c:761
-#: scd/app-openpgp.c:1245 scd/app-openpgp.c:1259
+#: scd/app-openpgp.c:747 scd/app-openpgp.c:761 scd/app-openpgp.c:837
+#: scd/app-openpgp.c:1328 scd/app-openpgp.c:1342
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "Prüfen von CHV%d fehlgeschlagen: %s\n"
-#: scd/app-openpgp.c:708
+#: scd/app-openpgp.c:784
msgid "access to admin commands is not configured\n"
msgstr "Zugriff auf Admin Kommandos ist nicht konfiguriert\n"
-#: scd/app-openpgp.c:725
+#: scd/app-openpgp.c:801
msgid "error retrieving CHV status from card\n"
msgstr "Fehler beim Holen des CHV Status von der Karte\n"
-#: scd/app-openpgp.c:731
+#: scd/app-openpgp.c:807
msgid "card is permanently locked!\n"
msgstr "Die Karte ist dauerhaft gesperrt!\n"
-#: scd/app-openpgp.c:738
+#: scd/app-openpgp.c:814
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
"Noch %d Admin PIN Versuche möglich bevor die Karte dauerhaft gesperrt wird\n"
-#: scd/app-openpgp.c:742
+#: scd/app-openpgp.c:818
msgid "Admin PIN"
msgstr "Admin PIN"
-#: scd/app-openpgp.c:1504
-msgid "can't access CHV Status Bytes - invalid OpenPGP card?\n"
-msgstr ""
-"Zugriff auf die CHV Status Bytes nicht möglich - ungültige OpenPGP Karte?\n"
+#: scd/app-openpgp.c:1301
+#, c-format
+msgid "PIN [sigs done: %lu]"
+msgstr "PIN [erzeugte signaturen: %lu]"
-#: scd/app-openpgp.c:1514
-msgid "can't access Extended Capability Flags - invalid OpenPGP card?\n"
-msgstr ""
-"Zugriff auf die Extended Capability Flags nicht möglich - ungültige OpenPGP "
-"Karte?\n"
+#: scd/app-openpgp.c:1587 scd/app-openpgp.c:1597
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "Zugriff auf %s nicht möglich - ungültige OpenPGP Karte?\n"
-#: scd/app-openpgp.c:1584
+#: scd/app-openpgp.c:1668
#, c-format
msgid "error getting serial number: %s\n"
msgstr "Fehler beim Holen der Seriennummer: %s\n"
-#: scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:1763
#, c-format
msgid "failed to store the key: %s\n"
msgstr "Fehler beim Speichern des Schlüssels: %s\n"
-#: scd/app-openpgp.c:1721
+#: scd/app-openpgp.c:1805
msgid "reading the key failed\n"
msgstr "Fehler beim Lesen des Schlüssels: %s\n"
-#: scd/app-openpgp.c:1728
+#: scd/app-openpgp.c:1812
msgid "response does not contain the public key data\n"
msgstr "Die Antwort enthält keine Public Key Daten\n"
-#: scd/app-openpgp.c:1736
+#: scd/app-openpgp.c:1820
msgid "response does not contain the RSA modulus\n"
msgstr "Die Antwort enthält keinen RSA Modulus\n"
-#: scd/app-openpgp.c:1747
+#: scd/app-openpgp.c:1831
msgid "response does not contain the RSA public exponent\n"
msgstr "Die Antwort enthält keinen öffenlichen RSA Exponent\n"
@@ -664,7 +651,7 @@
msgid "number of issuers matching: %d\n"
msgstr "Anzahl der übereinstimmenden Heruasgeber: %d\n"
-#: sm/certchain.c:403 sm/certchain.c:561 sm/certchain.c:921 sm/decrypt.c:260
+#: sm/certchain.c:403 sm/certchain.c:562 sm/certchain.c:922 sm/decrypt.c:260
#: sm/encrypt.c:341 sm/sign.c:324 sm/verify.c:106
msgid "failed to allocated keyDB handle\n"
msgstr "Ein keyDB Handle konnte nicht bereitgestellt werden\n"
@@ -691,64 +678,64 @@
msgid "checking the CRL failed: %s"
msgstr "Die CRL konnte nicht geprüft werden: %s"
-#: sm/certchain.c:581
+#: sm/certchain.c:582
msgid "no issuer found in certificate"
msgstr "Im Zertifikat ist kein Herausgeber enthalten"
-#: sm/certchain.c:594
+#: sm/certchain.c:595
#, c-format
msgid "certificate with invalid validity: %s"
msgstr "Zertifikat mit unzulässiger Gültigkeit: %s"
-#: sm/certchain.c:610
+#: sm/certchain.c:611
msgid "certificate not yet valid"
msgstr "Das Zertifikat ist noch nicht gültig"
-#: sm/certchain.c:623
+#: sm/certchain.c:624
msgid "certificate has expired"
msgstr "Das Zertifikat ist abgelaufen"
-#: sm/certchain.c:660
+#: sm/certchain.c:661
msgid "selfsigned certificate has a BAD signature"
msgstr "Das eigenbeglaubigte Zertifikat hat eine FALSCHE Signatur"
-#: sm/certchain.c:674
+#: sm/certchain.c:675
msgid "root certificate is not marked trusted"
msgstr "Das Wurzelzertifikat ist nicht als vertrauenswürdig markiert"
-#: sm/certchain.c:685
+#: sm/certchain.c:686
#, c-format
msgid "fingerprint=%s\n"
msgstr "Fingerprint=%s\n"
-#: sm/certchain.c:690
+#: sm/certchain.c:691
msgid "root certificate has now been marked as trusted\n"
msgstr "Das Wurzelzertifikat wurde nun als vertrauenswürdig markiert\n"
-#: sm/certchain.c:705
+#: sm/certchain.c:706
#, c-format
msgid "checking the trust list failed: %s\n"
msgstr "Fehler beim Prüfen der vertrauenswürdigen Zertifikate: %s\n"
-#: sm/certchain.c:731 sm/import.c:166
+#: sm/certchain.c:732 sm/import.c:166
msgid "certificate chain too long\n"
msgstr "Der Zertifikatkette ist zu lang\n"
-#: sm/certchain.c:743
+#: sm/certchain.c:744
msgid "issuer certificate not found"
msgstr "Herausgeberzertifikat nicht gefunden"
-#: sm/certchain.c:776
+#: sm/certchain.c:777
msgid "certificate has a BAD signature"
msgstr "Das Zertifikat hat eine FALSCHE Signatur"
-#: sm/certchain.c:799
+#: sm/certchain.c:800
msgid "found another possible matching CA certificate - trying again"
msgstr ""
"Eine anderes möglicherweise passendes CA-Zertifikat gefunden - versuche "
"nochmal"
-#: sm/certchain.c:822
+#: sm/certchain.c:823
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr "Die Zertifikatkette ist länger als von der CA erlaubt (%d)"
@@ -1361,7 +1348,8 @@
msgid "Options useful for debugging"
msgstr "Nützliche Optionen zum Debuggen"
-#: tools/gpgconf-comp.c:460
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:537 tools/gpgconf-comp.c:586
+#: tools/gpgconf-comp.c:639 tools/gpgconf-comp.c:715
msgid "|FILE|write server mode logs to FILE"
msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
@@ -1389,6 +1377,25 @@
msgid "Configuration for OCSP"
msgstr "Konfiguration zu OCSP"
+#, fuzzy
+#~ msgid "passphrase (CHV%d) is too short; minimum length is %d\n"
+#~ msgstr "Die Passphrase (CHV%d) ist zu kurz; Mindestlänge ist %d\n"
+
+#~ msgid "Usage: sc-investigate [options] (-h for help)\n"
+#~ msgstr "Gebrauch: sc-investigate [Optionen] (-h für Hilfe)\n"
+
+#~ msgid ""
+#~ "Syntax: sc-investigate [options] [args]]\n"
+#~ "Have a look at smartcards\n"
+#~ msgstr ""
+#~ "Gebrauch: sc-investigate [Optionen] [Argumente]\n"
+#~ "Den Inhalt einer Smartcard inspizieren\n"
+
+#~ msgid "can't access Extended Capability Flags - invalid OpenPGP card?\n"
+#~ msgstr ""
+#~ "Zugriff auf die Extended Capability Flags nicht möglich - ungültige "
+#~ "OpenPGP Karte?\n"
+
#~ msgid "Enter passphrase:"
#~ msgstr "Bitte das Mantra (Passphrase) eingeben:"
Index: gnupg/scd/ChangeLog
diff -u gnupg/scd/ChangeLog:1.25.2.57 gnupg/scd/ChangeLog:1.25.2.58
--- gnupg/scd/ChangeLog:1.25.2.57 Fri Oct 22 11:41:56 2004
+++ gnupg/scd/ChangeLog Fri Oct 22 18:03:03 2004
@@ -1,3 +1,8 @@
+2004-10-22 Werner Koch <wk at g10code.com>
+
+ * app-openpgp.c (verify_chv3): The minium length for CHV3 is
+ 8. Changed string to match the other ones.
+
2004-10-21 Werner Koch <wk at g10code.com>
* app-openpgp.c (do_sign): Replace asprintf by direct allocation.
Index: gnupg/scd/app-openpgp.c
diff -u gnupg/scd/app-openpgp.c:1.9.2.22 gnupg/scd/app-openpgp.c:1.9.2.23
--- gnupg/scd/app-openpgp.c:1.9.2.22 Fri Oct 22 11:41:56 2004
+++ gnupg/scd/app-openpgp.c Fri Oct 22 18:03:03 2004
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: app-openpgp.c,v 1.9.2.22 2004/10/22 09:41:56 wk Exp $
+ * $Id: app-openpgp.c,v 1.9.2.23 2004/10/22 16:03:03 wk Exp $
*/
#include <config.h>
@@ -822,10 +822,10 @@
return rc;
}
- if (strlen (pinvalue) < 6)
+ if (strlen (pinvalue) < 8)
{
- log_error (_("passphrase (CHV%d) is too short;"
- " minimum length is %d\n"), 3, 6);
+ log_error (_("PIN for CHV%d is too short;"
+ " minimum length is %d\n"), 3, 8);
xfree (pinvalue);
return gpg_error (GPG_ERR_BAD_PIN);
}
Index: gnupg/tools/Makefile.am
diff -u gnupg/tools/Makefile.am:1.31.2.9 gnupg/tools/Makefile.am:1.31.2.10
--- gnupg/tools/Makefile.am:1.31.2.9 Fri Oct 22 14:31:04 2004
+++ gnupg/tools/Makefile.am Fri Oct 22 18:03:02 2004
@@ -19,7 +19,7 @@
EXTRA_DIST = Manifest watchgnupg.c \
rfc822parse.c rfc822parse.h gpgparsemail.c \
- addgnupghome
+ addgnupghome gpgsm-gencert.sh
AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(top_srcdir)/common
include $(top_srcdir)/am/cmacros.am
More information about the Gnupg-commits
mailing list