security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

agent: Rename the function using the word "composite" 

* agent/pkdecrypt.c (composite_pgp_kem_decrypt): Rename.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2024-04-11 15:26:08 +09:00
parent 172d53d636
commit f2fd4f1a9e
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
agent/pkdecrypt.c
View File

@ -173,7 +173,7 @@ reverse_buffer (unsigned char *buffer, unsigned int length)
} }
} }
/* For hybrid PGP KEM (ECC+ML-KEM), decrypt CIPHERTEXT using KEM API. /* For composite PGP KEM (ECC+ML-KEM), decrypt CIPHERTEXT using KEM API.
First keygrip is for ECC, second keygrip is for PQC. CIPHERTEXT First keygrip is for ECC, second keygrip is for PQC. CIPHERTEXT
should follow the format of: should follow the format of:
@ -187,8 +187,8 @@ reverse_buffer (unsigned char *buffer, unsigned int length)
FIXME: For now, possible keys on smartcard are not supported. FIXME: For now, possible keys on smartcard are not supported.
*/ */
static gpg_error_t static gpg_error_t
agent_hybrid_pgp_kem_decrypt (ctrl_t ctrl, const char *desc_text, composite_pgp_kem_decrypt (ctrl_t ctrl, const char *desc_text,
gcry_sexp_t s_cipher, membuf_t *outbuf) gcry_sexp_t s_cipher, membuf_t *outbuf)
{ {
#if GCRYPT_VERSION_NUMBER >= 0x010b00 #if GCRYPT_VERSION_NUMBER >= 0x010b00
gcry_sexp_t s_skey0 = NULL; gcry_sexp_t s_skey0 = NULL;
@ -453,7 +453,7 @@ agent_kem_decrypt (ctrl_t ctrl, const char *desc_text, int kemid,
if (!ctrl->have_keygrip1) if (!ctrl->have_keygrip1)
{ {
log_error ("hybrid KEM requires two KEYGRIPs\n"); log_error ("Composite KEM requires two KEYGRIPs\n");
return gpg_error (GPG_ERR_NO_SECKEY); return gpg_error (GPG_ERR_NO_SECKEY);
} }
@ -471,7 +471,7 @@ agent_kem_decrypt (ctrl_t ctrl, const char *desc_text, int kemid,
log_printhex (ciphertext, ciphertextlen, "cipher: "); log_printhex (ciphertext, ciphertextlen, "cipher: ");
} }
err = agent_hybrid_pgp_kem_decrypt (ctrl, desc_text, s_cipher, outbuf); err = composite_pgp_kem_decrypt (ctrl, desc_text, s_cipher, outbuf);
gcry_sexp_release (s_cipher); gcry_sexp_release (s_cipher);
return err; return err;