mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-10 21:38:50 +01:00
* gpg.sgml: Document smartcard related options.
* g10.c, options.h: New option --no-interactive-selection. * keyedit.c (keyedit_menu): Use it.
This commit is contained in:
Werner Koch
parent
059d159657
commit
2d2e2e74b8
1
THANKS
1
THANKS
@ -103,6 +103,7 @@ Joachim Backes backes@rhrk.uni-kl.de
|
||||
Joe Rhett jrhett@isite.net
|
||||
John A. Martin jam@jamux.com
|
||||
John Clizbe JPClizbe@comcast.net
|
||||
John R. Shannon john@johnrshannon.com
|
||||
Johnny Teveßen j.tevessen@gmx.de
|
||||
Jörg Schilling schilling@fokus.gmd.de
|
||||
Jos Backus Jos.Backus@nl.origin-it.com
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
2005-06-02 Werner Koch <wk@g10code.com>
|
||||
|
||||
* conventional.test: have_cipher_algo now requires uppercase
|
||||
algorithm names. Changed. Noted by John R. Shannon.
|
||||
|
||||
2004-02-09 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* clearsig.test, sigs.test: Properly detect RSA being missing, and
|
||||
|
||||
@ -11,23 +11,19 @@ done
|
||||
|
||||
algos="3des"
|
||||
|
||||
if have_cipher_algo "idea"; then
|
||||
if have_cipher_algo "CAST5"; then
|
||||
algos="$algos idea"
|
||||
fi
|
||||
|
||||
if have_cipher_algo "cast5"; then
|
||||
if have_cipher_algo "BLOWFISH"; then
|
||||
algos="$algos idea"
|
||||
fi
|
||||
|
||||
if have_cipher_algo "blowfish"; then
|
||||
algos="$algos idea"
|
||||
fi
|
||||
|
||||
if have_cipher_algo "aes"; then
|
||||
if have_cipher_algo "AES"; then
|
||||
algos="$algos aes aes192 aes256"
|
||||
fi
|
||||
|
||||
if have_cipher_algo "twofish"; then
|
||||
if have_cipher_algo "TWOFISH"; then
|
||||
algos="$algos twofish"
|
||||
fi
|
||||
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
2005-06-20 Werner Koch <wk@g10code.com>
|
||||
|
||||
* gpg.sgml: Document smartcard related options.
|
||||
|
||||
2005-06-06 Werner Koch <wk@g10code.com>
|
||||
|
||||
* DETAILS: New subcode 5 for CARDCTRL.
|
||||
|
||||
2005-05-13 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* gpg.sgml: Document --default-sig-expire and
|
||||
|
||||
@ -349,9 +349,6 @@ more arguments in future versions.
|
||||
The supplied passphrase was good and the secret key material
|
||||
is therefore usable.
|
||||
|
||||
BAD_PASSPHRASE_PIN
|
||||
Reserved for future use.
|
||||
|
||||
DECRYPTION_FAILED
|
||||
The symmetric decryption failed - one reason could be a wrong
|
||||
passphrase for a symmetrical encrypted message.
|
||||
@ -553,6 +550,7 @@ more arguments in future versions.
|
||||
2 = Request removal of a card.
|
||||
3 = Card with serialnumber detected
|
||||
4 = No card available.
|
||||
5 = No card reader available
|
||||
|
||||
|
||||
PLAINTEXT <format> <timestamp>
|
||||
|
||||
74
doc/gpg.sgml
74
doc/gpg.sgml
@ -572,11 +572,38 @@ calculation has failed; probably due to an expired key.</para></listitem></varli
|
||||
</variablelist>
|
||||
</listitem></varlistentry>
|
||||
|
||||
|
||||
<varlistentry>
|
||||
<term>--card-edit</term>
|
||||
<listitem><para>
|
||||
Present a menu to work with a smartcard. The subcommand "help" provides
|
||||
an overview on available commands. For a detailed description, please
|
||||
see the Card HOWTO at
|
||||
http://www.gnupg.org/documentation/howtos.html#GnuPG-cardHOWTO .
|
||||
</para></listitem></varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>--card-status</term>
|
||||
<listitem><para>
|
||||
Show the content of the smart card.
|
||||
</para></listitem></varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>--change-pin</term>
|
||||
<listitem><para>
|
||||
Present a menu to allow changing the PIN of a smartcard. This
|
||||
functionality is also available as the subcommand "passwd" with the
|
||||
--card-edit command.
|
||||
</para></listitem></varlistentry>
|
||||
|
||||
|
||||
<varlistentry>
|
||||
<term>--sign-key &ParmName;</term>
|
||||
<listitem><para>
|
||||
Signs a public key with your secret key. This is a shortcut version of
|
||||
the subcommand "sign" from --edit.
|
||||
the subcommand "sign" from --edit. You may also want to consider the
|
||||
option --no-interactive-selection which will drop you into the regular
|
||||
menu when not all keys shall be signed.
|
||||
</para></listitem></varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
@ -1032,6 +1059,14 @@ Don't make any changes (this is not completely implemented).
|
||||
Prompt before overwriting any files.
|
||||
</para></listitem></varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>--no-interactive-selection</term>
|
||||
<listitem><para>
|
||||
Do not use interactive selection mode in certain menues but require
|
||||
a selection in advance. This is currently only used with the "sign"
|
||||
subcommand of --edit-key.
|
||||
</para></listitem></varlistentry>
|
||||
|
||||
|
||||
<varlistentry>
|
||||
<term>--batch</term>
|
||||
@ -1621,6 +1656,43 @@ a options file. This also overrides the environment variable
|
||||
$GNUPGHOME.
|
||||
</para></listitem></varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>--pcsc-driver &ParmFile;</term>
|
||||
<listitem><para>
|
||||
Use &ParmFile; to access the smartcard reader. The current default
|
||||
is `libpcsclite.so'. Instead of using this option you might also
|
||||
want to install a symbolic link to the default file name
|
||||
(e.g. from `libpcsclite.so.1').
|
||||
</para></listitem></varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>--ctapi-driver &ParmFile;</term>
|
||||
<listitem><para>
|
||||
Use &ParmFile; to access the smartcard reader. The current default
|
||||
is `libtowitoko.so'. Note that the use of this interface is
|
||||
deprecated; it may be removed in future releases.
|
||||
</para></listitem></varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>--disable-ccid</term>
|
||||
<listitem><para>
|
||||
Disable the integrated support for CCID compliant readers. This
|
||||
allows to fall back to one of the other drivers even if the internal
|
||||
CCID driver can handle the reader. Note, that CCID support is only
|
||||
available if libusb was available at build time.
|
||||
</para></listitem></varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>--reader-port <parameter>number_or_string</parameter></term>
|
||||
<listitem><para>
|
||||
This option may be used to specify the port of the card terminal. A
|
||||
value of 0 refers to the first serial device; add 32768 to access USB
|
||||
devices. The default is 32768 (first USB device). PC/SC or CCID
|
||||
readers might need a string here; run the program in verbose mode to get
|
||||
a list of available readers. The default is then the first reader
|
||||
found.
|
||||
</para></listitem></varlistentry>
|
||||
|
||||
|
||||
<varlistentry>
|
||||
<term>--display-charset &ParmName;</term>
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
2005-06-20 Werner Koch <wk@g10code.com>
|
||||
|
||||
* g10.c, options.h: New option --no-interactive-selection.
|
||||
* keyedit.c (keyedit_menu): Use it.
|
||||
|
||||
2005-06-18 Werner Koch <wk@g10code.com>
|
||||
|
||||
* parse-packet.c (parse_signature): Use log_info for messages
|
||||
|
||||
@ -346,14 +346,14 @@ enum cmd_and_opt_values
|
||||
oEnableProgressFilter,
|
||||
oMultifile,
|
||||
oKeyidFormat,
|
||||
oNoop,
|
||||
oNoInteractiveSelection,
|
||||
|
||||
oReaderPort,
|
||||
octapiDriver,
|
||||
opcscDriver,
|
||||
oDisableCCID,
|
||||
|
||||
aTest
|
||||
oNoop
|
||||
};
|
||||
|
||||
|
||||
@ -676,6 +676,7 @@ static ARGPARSE_OPTS opts[] = {
|
||||
{ oEnableProgressFilter, "enable-progress-filter", 0, "@" },
|
||||
{ oMultifile, "multifile", 0, "@" },
|
||||
{ oKeyidFormat, "keyid-format", 2, "@" },
|
||||
{ oNoInteractiveSelection, "no-interactive-selection", 0, "@" },
|
||||
|
||||
{ oReaderPort, "reader-port", 2, "@"},
|
||||
{ octapiDriver, "ctapi-driver", 2, "@"},
|
||||
@ -2542,6 +2543,10 @@ main( int argc, char **argv )
|
||||
else
|
||||
log_error("unknown keyid-format `%s'\n",pargs.r.ret_str);
|
||||
break;
|
||||
case oNoInteractiveSelection:
|
||||
opt.no_interactive_selection = 1;
|
||||
break;
|
||||
|
||||
case oNoop: break;
|
||||
|
||||
default : pargs.err = configfp? 1:2; break;
|
||||
|
||||
@ -1741,8 +1741,14 @@ keyedit_menu( const char *username, STRLIST locusr,
|
||||
&& !cpr_get_answer_is_yes("keyedit.sign_all.okay",
|
||||
_("Really sign all user IDs?"
|
||||
" (y/N) ")))
|
||||
{
|
||||
if (opt.no_interactive_selection)
|
||||
{
|
||||
have_commands = 0;
|
||||
break;
|
||||
}
|
||||
interactive=1;
|
||||
|
||||
}
|
||||
/* What sort of signing are we doing? */
|
||||
if(!parse_sign_type(answer,&localsig,&nonrevokesig,&trustsig))
|
||||
{
|
||||
|
||||
@ -157,6 +157,7 @@ struct
|
||||
char *temp_dir;
|
||||
int no_encrypt_to;
|
||||
int interactive;
|
||||
int no_interactive_selection;
|
||||
STRLIST sig_notation_data;
|
||||
STRLIST cert_notation_data;
|
||||
STRLIST sig_policy_url;
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
2005-06-15 Werner Koch <wk@g10code.com>
|
||||
|
||||
* de.po: Some Typo fixes.
|
||||
|
||||
2005-05-31 Werner Koch <wk@g10code.com>
|
||||
|
||||
* zh_TW.po, zh_CN.po, es.po, ro.po: Updated.
|
||||
|
||||
59
po/de.po
59
po/de.po
@ -8,7 +8,7 @@ msgstr ""
|
||||
"Project-Id-Version: gnupg-1.4.1\n"
|
||||
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
|
||||
"POT-Creation-Date: 2005-05-31 11:45+0200\n"
|
||||
"PO-Revision-Date: 2005-03-30 10:45+0200\n"
|
||||
"PO-Revision-Date: 2005-06-15 10:51+0200\n"
|
||||
"Last-Translator: Walter Koch <koch@u32.de>\n"
|
||||
"Language-Team: German <de@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -55,9 +55,9 @@ msgid "note: random_seed file is empty\n"
|
||||
msgstr "Hinweis: 'random_seed'-Datei ist leer\n"
|
||||
|
||||
#: cipher/random.c:408
|
||||
#, fuzzy
|
||||
msgid "WARNING: invalid size of random_seed file - not used\n"
|
||||
msgstr ""
|
||||
"WARNUNG: Falsche GröÂße der 'random_seed'-Datei - sie wird nicht verwendet\n"
|
||||
msgstr "WARNUNG: Falsche Größe der 'random_seed'-Datei - sie wird nicht verwendet\n"
|
||||
|
||||
#: cipher/random.c:416
|
||||
#, c-format
|
||||
@ -110,7 +110,7 @@ msgid ""
|
||||
"keep you from getting bored, because it will improve the quality\n"
|
||||
"of the entropy.\n"
|
||||
msgstr ""
|
||||
"Zufalls wird gesammelt. Bitte arebiten Sie an etwas anderem, da\n"
|
||||
"Zufalls wird gesammelt. Bitte arbeiten Sie an etwas anderem, da\n"
|
||||
"so die Qualität der Zufallszahlen erhöht werden kann.\n"
|
||||
|
||||
#: cipher/rndlinux.c:135
|
||||
@ -218,7 +218,7 @@ msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
|
||||
|
||||
#: g10/app-openpgp.c:1562
|
||||
msgid "key already exists\n"
|
||||
msgstr "Shlüssel existiert bereits\n"
|
||||
msgstr "Schlüssel existiert bereits\n"
|
||||
|
||||
#: g10/app-openpgp.c:1566
|
||||
msgid "existing key will be replaced\n"
|
||||
@ -569,7 +569,7 @@ msgstr "Geheime Teile des Schl
|
||||
|
||||
#: g10/card-util.c:1245
|
||||
msgid "secret key already stored on a card\n"
|
||||
msgstr "geheimer Schlüssel ist bereits auf einer Karte gepeichert\n"
|
||||
msgstr "geheimer Schlüssel ist bereits auf einer Karte gespeichert\n"
|
||||
|
||||
#: g10/card-util.c:1316 g10/keyedit.c:1350
|
||||
msgid "quit this menu"
|
||||
@ -851,7 +851,7 @@ msgstr ""
|
||||
|
||||
#: g10/encr-data.c:104
|
||||
msgid "problem handling encrypted packet\n"
|
||||
msgstr "Problem beim Bearbeiten des verschlüsselten Pakets\n"
|
||||
msgstr "Problem beim Bearbeiten des verschlüsselten Packets\n"
|
||||
|
||||
#: g10/exec.c:49
|
||||
msgid "no remote program execution supported\n"
|
||||
@ -1451,11 +1451,11 @@ msgstr "Das ausgew
|
||||
|
||||
#: g10/g10.c:2779
|
||||
msgid "completes-needed must be greater than 0\n"
|
||||
msgstr "completes-needed müssen gröÂßer als 0 sein\n"
|
||||
msgstr "completes-needed müssen größer als 0 sein\n"
|
||||
|
||||
#: g10/g10.c:2781
|
||||
msgid "marginals-needed must be greater than 1\n"
|
||||
msgstr "marginals-needed müssen gröÂßer als 1 sein\n"
|
||||
msgstr "marginals-needed müssen größer als 1 sein\n"
|
||||
|
||||
#: g10/g10.c:2783
|
||||
#, fuzzy
|
||||
@ -1904,12 +1904,9 @@ msgid ""
|
||||
"\n"
|
||||
"If you don't know what the right answer is, answer \"0\"."
|
||||
msgstr ""
|
||||
"Wenn Sie die User-ID eines Schlüssels beglaubigen wollen, sollten Sie "
|
||||
"zunächst\n"
|
||||
"sicherstellen, daß der Schlüssel demjenigen gehört, der in der User-ID "
|
||||
"genannt\n"
|
||||
"ist. Für Dritte ist es hilfreich zu wissen, wie gut diese Zuordnung "
|
||||
"überprüft\n"
|
||||
"Wenn Sie die User-ID eines Schlüssels beglaubigen wollen, sollten Sie zunächst\n"
|
||||
"sicherstellen, daß der Schlüssel demjenigen gehört, der in der User-ID genannt\n"
|
||||
"ist. Für Dritte ist es hilfreich zu wissen, wie gut diese Zuordnung überprüft\n"
|
||||
"wurde.\n"
|
||||
"\n"
|
||||
"\"0\" zeigt, daß Sie keine bestimmte Aussage über die Sorgfalt der \n"
|
||||
@ -1920,7 +1917,7 @@ msgstr ""
|
||||
" Dies ist hilfreich für eine \"persona\"-Überprüfung, wobei man den\n"
|
||||
" Schlüssel eines Pseudonym-Trägers beglaubigt\n"
|
||||
"\n"
|
||||
"\"2\" Sie nahmen eine flüchtige Überprüfung vor. Das heisst Sie haben z.B.\n"
|
||||
"\"2\" Sie nahmen eine flüchtige Überprüfung vor. Das heißt Sie haben z.B.\n"
|
||||
" den Schlüsselfingerabdruck kontrolliert und die User-ID des Schlüssels\n"
|
||||
" anhand des Fotos geprüft.\n"
|
||||
"\n"
|
||||
@ -1928,14 +1925,12 @@ msgstr ""
|
||||
" Das kann z.B. die Kontrolle des Schlüsselfingerabdrucks mit dem\n"
|
||||
" Schlüsselinhaber persönlich vorgenommen haben; daß Sie die User-ID des\n"
|
||||
" Schlüssel anhand einer schwer zu fälschenden Urkunde mit Foto (wie z.B.\n"
|
||||
" einem Paß) abgeglichen haben und schliesslich per E-Mail-Verkehr die\n"
|
||||
" einem Paß) abgeglichen haben und schließlich per E-Mail-Verkehr die\n"
|
||||
" E-Mail-Adresse als zum Schlüsselbesitzer gehörig erkannt haben.\n"
|
||||
"\n"
|
||||
"Beachten Sie, daß diese Beispiele für die Antworten 2 und 3 *nur* Beispiele "
|
||||
"sind.\n"
|
||||
"Schlußendlich ist es Ihre Sache, was Sie unter \"flüchtig\" oder "
|
||||
"\"ausführlich\"\n"
|
||||
"verstehen, wenn Sie Schlüssel Dritter beglaubigen.\n"
|
||||
"Beachten Sie, daß diese Beispiele für die Antworten 2 und 3 *nur* Beispiele\n"
|
||||
"sind. Schlußendlich ist es Ihre Sache, was Sie unter \"flüchtig\" oder\n"
|
||||
" \"ausführlich\" verstehen, wenn Sie Schlüssel Dritter beglaubigen.\n"
|
||||
"\n"
|
||||
"Wenn Sie nicht wissen, wie Sie antworten sollen, wählen Sie \"0\"."
|
||||
|
||||
@ -1975,11 +1970,10 @@ msgid ""
|
||||
"know which key was used because this signing key might establish\n"
|
||||
"a trust connection through another already certified key."
|
||||
msgstr ""
|
||||
"Diese Beglaubigung kann nicht geprüft werden, da Sie den passenden "
|
||||
"Schlüssel\n"
|
||||
"Diese Beglaubigung kann nicht geprüft werden, da Sie den passenden Schlüssel\n"
|
||||
"nicht besitzen. Sie sollten die Löschung der Beglaubigung verschieben, bis\n"
|
||||
"sie wissen, welcher Schlüssel verwendet wurde. Denn vielleicht würde genau\n"
|
||||
"diese Beglaubigung den \"Trust\"-Weg kompletieren."
|
||||
"diese Beglaubigung den \"Trust\"-Weg komplettieren."
|
||||
|
||||
#: g10/helptext.c:211
|
||||
msgid ""
|
||||
@ -2600,7 +2594,7 @@ msgid ""
|
||||
"trust signatures on your behalf.\n"
|
||||
msgstr ""
|
||||
"Geben Sie bitte die Tiefe dieser \"Trust\"-Unterschrift ein.\n"
|
||||
"Eine Tiefe gröÂßer 1 erlaubt dem zu unterschreibenden Schlüssel\n"
|
||||
"Eine Tiefe größer 1 erlaubt dem zu unterschreibenden Schlüssel\n"
|
||||
"Trust-Signatures für Sie zu machen.\n"
|
||||
|
||||
#: g10/keyedit.c:451
|
||||
@ -2617,7 +2611,7 @@ msgstr "User-ID \"%s\" ist widerrufen."
|
||||
#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
|
||||
#: g10/keyedit.c:890 g10/keyedit.c:1729
|
||||
msgid "Are you sure you still want to sign it? (y/N) "
|
||||
msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/N) "
|
||||
msgstr "Wollen Sie ihn immer noch beglaubigen? (j/N) "
|
||||
|
||||
#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
|
||||
#: g10/keyedit.c:1735
|
||||
@ -2698,7 +2692,7 @@ msgstr "\"%s\" wurde bereits durch Schl
|
||||
|
||||
#: g10/keyedit.c:784
|
||||
msgid "Do you want to sign it again anyway? (y/N) "
|
||||
msgstr "Wollen Sie ihn immmer noch wieder beglaubigen? (j/N) "
|
||||
msgstr "Wollen Sie ihn immer noch wieder beglaubigen? (j/N) "
|
||||
|
||||
#: g10/keyedit.c:806
|
||||
#, fuzzy, c-format
|
||||
@ -3180,9 +3174,8 @@ msgid "Do you really want to revoke the selected subkeys? (y/N) "
|
||||
msgstr "Möchten Sie die ausgewählten Schlüssel wirklich widerrufen? "
|
||||
|
||||
#: g10/keyedit.c:2015
|
||||
#, fuzzy
|
||||
msgid "Do you really want to revoke this subkey? (y/N) "
|
||||
msgstr "Möchten Sie diesen Schlüssel wirklich wiederrufen? "
|
||||
msgstr "Möchten Sie diesen Schlüssel wirklich widerrufen? "
|
||||
|
||||
#: g10/keyedit.c:2056
|
||||
msgid ""
|
||||
@ -3206,12 +3199,10 @@ msgid "Really update the preferences? (y/N) "
|
||||
msgstr "Die Voreinstellungen wirklich ändern? "
|
||||
|
||||
#: g10/keyedit.c:2175
|
||||
#, fuzzy
|
||||
msgid "Save changes? (y/N) "
|
||||
msgstr "Änderungen speichern? "
|
||||
|
||||
#: g10/keyedit.c:2178
|
||||
#, fuzzy
|
||||
msgid "Quit without saving? (y/N) "
|
||||
msgstr "Beenden ohne zu speichern? "
|
||||
|
||||
@ -3353,7 +3344,7 @@ msgstr ""
|
||||
|
||||
#: g10/keyedit.c:2963 g10/keyedit.c:3342
|
||||
msgid "Are you sure you still want to add it? (y/N) "
|
||||
msgstr "Wollen Sie ihn immmer noch hinzufügen? (j/N) "
|
||||
msgstr "Wollen Sie ihn immer noch hinzufügen? (j/N) "
|
||||
|
||||
#: g10/keyedit.c:2969
|
||||
msgid "You may not add a photo ID to a PGP2-style key.\n"
|
||||
@ -3531,7 +3522,7 @@ msgstr "Diese Unterschrift ist seit %s verfallen.\n"
|
||||
|
||||
#: g10/keyedit.c:4237
|
||||
msgid "Are you sure you still want to revoke it? (y/N) "
|
||||
msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) "
|
||||
msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
|
||||
|
||||
#: g10/keyedit.c:4241
|
||||
msgid "Create a revocation certificate for this signature? (y/N) "
|
||||
|
||||
@ -15,7 +15,7 @@ for k in $kis; do
|
||||
echo "Keyid: $k"
|
||||
answer=A
|
||||
while [ "$answer" = "A" ]; do
|
||||
gpg $ro --lock-never --sign-key $k
|
||||
gpg $ro --lock-never --no-interactive-selection --sign-key $k
|
||||
answer=""
|
||||
while [ "$answer" = "" ]; do
|
||||
read -p 'Okay, Again or Quit? (O/A/Q) '
|
||||
|
||||
Loading…
Reference in New Issue
Block a user