diff options
| author | Werner Koch <wk@gnupg.org> | 2017-12-11 10:42:38 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2017-12-11 10:42:38 +0100 |
| commit | b38ca59bdb0b9173aca620210afc8b52a6882e85 (patch) | |
| tree | 32db72710c66a1d6e6a5b9e09ab4ac05360cb8a5 /agent/keyformat.txt | |
| parent | Adjust for changed macro names in libgpg-error master. (diff) | |
| parent | doc: Typo fix (diff) | |
| download | gnupg2-b38ca59bdb0b9173aca620210afc8b52a6882e85.tar.xz gnupg2-b38ca59bdb0b9173aca620210afc8b52a6882e85.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
Diffstat (limited to 'agent/keyformat.txt')
| -rw-r--r-- | agent/keyformat.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/agent/keyformat.txt b/agent/keyformat.txt index 68fbdbc65..2e48b346e 100644 --- a/agent/keyformat.txt +++ b/agent/keyformat.txt @@ -271,7 +271,7 @@ to keys stored on a token: (comment whatever) ) -The currently used protocol is "ti-v1" (token info version 1). The +The currently used protocol is "t1-v1" (token info version 1). The second list with the information has this layout: (card_serial_number id_string_of_key fixed_pin_length) @@ -379,7 +379,7 @@ Example: (protected-shared-secret ((desc "List of system passphrases") (key "uid-1002" ("Knuth" "Donald Ervin Knuth")) - (key "uid-1001" ("Dijkstra" "Edsgar Wybe Dijkstra")) + (key "uid-1001" ("Dijkstra" "Edsger Wybe Dijkstra")) (key) (protected mode (parms) encrypted_octet_string) (protected-at "20100915T111722") @@ -402,7 +402,7 @@ hashed: ((desc "List of system passphrases") (key "uid-1002" ("Knuth" "Donald Ervin Knuth")) - (key "uid-1001" ("Dijkstra" "Edsgar Wybe Dijkstra")) + (key "uid-1001" ("Dijkstra" "Edsger Wybe Dijkstra")) (key) (value 4:1002 "signal flags at the lock") (value 4:1001 "taocp") |