security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

gpg-pair-tool: Fix typos in protocol description.

Browse Source 
--

GnuPG-bug-id: 5393
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Jakub Jelen 2021-07-06 14:30:38 +02:00 committed by NIIBE Yutaka
parent 0c8bc15434
commit c0b99e6dbb
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/gpg-pair-tool.c
View File

@ -35,7 +35,7 @@
* |<--------------------| * |<--------------------|
* | | * | |
* *
* The initiator creates a keypar (PKi,SKi) and sends this COMMIT * The initiator creates a keypair (PKi,SKi) and sends this COMMIT
* message to the responder: * message to the responder:
* *
* 7 byte Magic, value: "GPG-pa1" * 7 byte Magic, value: "GPG-pa1"
@ -76,7 +76,7 @@
* - SYMx-key using the label "GPG-pa1-SYMx-key" * - SYMx-key using the label "GPG-pa1-SYMx-key"
* *
* For details on the KDF see the implementation of the function kdf. * For details on the KDF see the implementation of the function kdf.
* The master secret is stored securily in the local state. The * The master secret is stored securely in the local state. The
* DHPART2 message is then created and send to the Responder: * DHPART2 message is then created and send to the Responder:
* *
* 7 byte Magic, value: "GPG-pa1" * 7 byte Magic, value: "GPG-pa1"
@ -106,8 +106,8 @@
* 32 byte MAC(HMACr-key, Hash(DHPART2) || CONFIRM[0..15] || SYMx-key) * 32 byte MAC(HMACr-key, Hash(DHPART2) || CONFIRM[0..15] || SYMx-key)
* *
* The Initiator receives this CONFIRM message, gets the master shared * The Initiator receives this CONFIRM message, gets the master shared
* secrey from its local state and derives the keys. It checks the * secret from its local state and derives the keys. It checks the
* the MAC in the received CONFIRM message and ask the user to enter * MAC in the received CONFIRM message and ask the user to enter
* the SAS as displayed by the responder. Iff the SAS matches the * the SAS as displayed by the responder. Iff the SAS matches the
* master key is flagged as confirmed and the Initiator may now use a * master key is flagged as confirmed and the Initiator may now use a
* derived key to send encrypted data to the Responder. * derived key to send encrypted data to the Responder.
@ -438,7 +438,7 @@ main (int argc, char **argv)
log_error ("invalid formatted SAS\n"); log_error ("invalid formatted SAS\n");
} }
/* Stop if any error, inclduing ARGPARSE_PRINT_WARNING, occurred. */ /* Stop if any error, including ARGPARSE_PRINT_WARNING, occurred. */
if (log_get_errorcount (0)) if (log_get_errorcount (0))
exit (2); exit (2);
@ -767,7 +767,7 @@ write_state (nvc_t state, int create_flag)
/* Read the state into a newly allocated state object and store that /* Read the state into a newly allocated state object and store that
* at R_STATE. If no state is available GPG_ERR_NOT_FOUND is returned * at R_STATE. If no state is available GPG_ERR_NOT_FOUND is returned
* and as with all errors NULL is tored at R_STATE. SESSIONID is an * and as with all errors NULL is stored at R_STATE. SESSIONID is an
* input with the 8 session id. */ * input with the 8 session id. */
static gpg_error_t static gpg_error_t
read_state (nvc_t *r_state) read_state (nvc_t *r_state)
@ -1822,7 +1822,7 @@ expect_state (int msgtype, const char *statestr, const char *expected)
return 0; return 0;
} }
/* Respond to a pairing intiation. This is used by the peer and later /* Respond to a pairing initiation. This is used by the peer and later
* by the original responder. Depending on the state the output needs * by the original responder. Depending on the state the output needs
* to be conveyed to the peer. */ * to be conveyed to the peer. */
static gpg_error_t static gpg_error_t