[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.3-13-g5c121d4

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-2 has been updated
       via  5c121d44443b0a96ec6ea82b90717e3dbafd2cc5 (commit)
      from  5b8d12a8bde246f4c04e1981b21801965cc2638d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5c121d44443b0a96ec6ea82b90717e3dbafd2cc5
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Dec 8 09:19:50 2017 +0900

    agent: Fix description of shadow format.
    
    * agent/keyformat.txt, agent/protect.c, agent/t-protect.c: Fix.
    
    --
    
    https://lists.gnupg.org/pipermail/gnupg-devel/2015-April/029680.html
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/agent/keyformat.txt b/agent/keyformat.txt
index 68fbdbc..768353f 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)
diff --git a/agent/protect.c b/agent/protect.c
index 9bb2da6..7b5abf2 100644
--- a/agent/protect.c
+++ b/agent/protect.c
@@ -1494,7 +1494,7 @@ make_shadow_info (const char *serialno, const char *idstring)
 
 
 /* Create a shadow key from a public key.  We use the shadow protocol
-  "ti-v1" and insert the S-expressionn SHADOW_INFO.  The resulting
+  "t1-v1" and insert the S-expressionn SHADOW_INFO.  The resulting
   S-expression is returned in an allocated buffer RESULT will point
   to. The input parameters are expected to be valid canonicalized
   S-expressions */
diff --git a/agent/t-protect.c b/agent/t-protect.c
index 92d312c..d17c193 100644
--- a/agent/t-protect.c
+++ b/agent/t-protect.c
@@ -288,7 +288,7 @@ static void
 test_agent_shadow_key (void)
 {
 /* Create a shadow key from a public key.  We use the shadow protocol
-  "ti-v1" and insert the S-expressionn SHADOW_INFO.  The resulting
+  "t1-v1" and insert the S-expressionn SHADOW_INFO.  The resulting
   S-expression is returned in an allocated buffer RESULT will point
   to. The input parameters are expected to be valid canonicalized
   S-expressions */

-----------------------------------------------------------------------

Summary of changes:
 agent/keyformat.txt | 2 +-
 agent/protect.c     | 2 +-
 agent/t-protect.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org