security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

gpg: Accept GCM and v5 AEAD with v2 SEIPD packet.

Browse source 
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2022-03-30 22:18:20 +09:00
parent 51fe266705
commit c9315dada4
6 changed files with 151 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

9
g10/misc.c
View file

@ -630,6 +630,7 @@ openpgp_aead_test_algo (aead_algo_t algo)
case AEAD_ALGO_EAX:
case AEAD_ALGO_OCB:
case AEAD_ALGO_GCM:
return 0;
}
@ -648,6 +649,7 @@ openpgp_aead_algo_name (aead_algo_t algo)
case AEAD_ALGO_NONE: break;
case AEAD_ALGO_EAX: return "EAX";
case AEAD_ALGO_OCB: return "OCB";
case AEAD_ALGO_GCM: return "GCM";
}
return "?";
@ -674,6 +676,11 @@ openpgp_aead_algo_info (aead_algo_t algo, enum gcry_cipher_modes *r_mode,
*r_noncelen = 16;
break;
case AEAD_ALGO_GCM:
*r_mode = GCRY_CIPHER_MODE_GCM;
*r_noncelen = 12;
break;
default:
log_error ("unsupported AEAD algo %d\n", algo);
return gpg_error (GPG_ERR_INV_CIPHER_MODE);
@ -1241,6 +1248,8 @@ string_to_aead_algo (const char *string)
result = 1;
else if (!ascii_strcasecmp (string, "OCB"))
result = 2;
else if (!ascii_strcasecmp (string, "GCM"))
result = 3;
else if ((string[0]=='A' || string[0]=='a'))
{
char *endptr;