security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-24 16:43:28 +02:00
Code Activity

Fix since AES KeyWrap is always with AES256 for hybrid KEM.

Browse Source 
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2024-03-07 15:56:36 +09:00
parent c9f71ba8ee
commit 68891bfc8b
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
agent/pkdecrypt.c
View File

@ -211,8 +211,8 @@ agent_hybrid_kem_decap (ctrl_t ctrl, const char *desc_text, int kemid,
const unsigned char pad[95] = { 0 }; const unsigned char pad[95] = { 0 };
unsigned char right_encode_L[3]; unsigned char right_encode_L[3];
unsigned char kekkey[16]; unsigned char kekkey[32];
size_t kekkeylen = 16; /* AES, perhaps */ size_t kekkeylen = 32; /* AES-256 is mandatory */
gcry_cipher_hd_t hd; gcry_cipher_hd_t hd;
unsigned char sessionkey_encoded[256]; unsigned char sessionkey_encoded[256];
@ -416,11 +416,12 @@ agent_hybrid_kem_decap (ctrl_t ctrl, const char *desc_text, int kemid,
iov[11].off = 0; iov[11].off = 0;
iov[11].len = 1; iov[11].len = 1;
right_encode_L[0] = (kekkeylen * 8); right_encode_L[0] = (kekkeylen * 8) >> 8;
right_encode_L[1] = 1; right_encode_L[1] = (kekkeylen * 8) & 0xff;
right_encode_L[2] = 2;
iov[12].data = right_encode_L; iov[12].data = right_encode_L;
iov[12].off = 0; iov[12].off = 0;
iov[12].len = 2; iov[12].len = 3;
gcry_md_hash_buffers_extract (GCRY_MD_CSHAKE256, 0, kekkey, kekkeylen, gcry_md_hash_buffers_extract (GCRY_MD_CSHAKE256, 0, kekkey, kekkeylen,
iov, DIM (iov)); iov, DIM (iov));
@ -430,8 +431,8 @@ agent_hybrid_kem_decap (ctrl_t ctrl, const char *desc_text, int kemid,
log_printhex (kekkey, kekkeylen, "KEK key: "); log_printhex (kekkey, kekkeylen, "KEK key: ");
} }
/*FIXME: KEK may be AES256, for example */ err = gcry_cipher_open (&hd, GCRY_CIPHER_AES256,
err = gcry_cipher_open (&hd, GCRY_CIPHER_AES, GCRY_CIPHER_MODE_AESWRAP, 0); GCRY_CIPHER_MODE_AESWRAP, 0);
if (err) if (err)
{ {
log_error ("ecdh failed to initialize AESWRAP: %s\n", log_error ("ecdh failed to initialize AESWRAP: %s\n",