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

Parse Preferred AEAD cerphersuites subpacket.

Browse Source 
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2022-04-12 14:53:46 +09:00
parent c9315dada4
commit bdb5136518
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/openpgpdefs.h
View File

@ -122,6 +122,8 @@ typedef enum
SIGSUBPKT_ATTST_SIGS = 37, /* Attested Certifications. */ SIGSUBPKT_ATTST_SIGS = 37, /* Attested Certifications. */
SIGSUBPKT_KEY_BLOCK = 38, /* Entire key used. */ SIGSUBPKT_KEY_BLOCK = 38, /* Entire key used. */
SIGSUBPKT_PREF_AEAD2 = 39, /* Preferred AEAD ciphersuites. */
SIGSUBPKT_FLAG_CRITICAL = 128 SIGSUBPKT_FLAG_CRITICAL = 128
} }
sigsubpkttype_t; sigsubpkttype_t;

14
g10/parse-packet.c
View File

@ -1756,6 +1756,16 @@ dump_sig_subpkt (int hashed, int type, int critical,
} }
break; break;
case SIGSUBPKT_PREF_AEAD2:
es_fputs ("pref-aead-cipersuites:", listfp);
if ((length % 1))
p = "[invalid subpacket]";
else
{
for (i = 0; i < length/2; i++)
es_fprintf (listfp, " %d:%d", buffer[i*2], buffer[i*2+1]);
}
break;
default: default:
if (type >= 100 && type <= 110) if (type >= 100 && type <= 110)
@ -1800,6 +1810,7 @@ parse_one_sig_subpkt (const byte * buffer, size_t n, int type)
case SIGSUBPKT_FEATURES: case SIGSUBPKT_FEATURES:
case SIGSUBPKT_REGEXP: case SIGSUBPKT_REGEXP:
case SIGSUBPKT_ATTST_SIGS: case SIGSUBPKT_ATTST_SIGS:
case SIGSUBPKT_PREF_AEAD2:
return 0; return 0;
case SIGSUBPKT_SIGNATURE: case SIGSUBPKT_SIGNATURE:
case SIGSUBPKT_EXPORTABLE: case SIGSUBPKT_EXPORTABLE:
@ -1905,6 +1916,7 @@ can_handle_critical (const byte * buffer, size_t n, int type)
case SIGSUBPKT_POLICY: case SIGSUBPKT_POLICY:
case SIGSUBPKT_PREF_KS: case SIGSUBPKT_PREF_KS:
case SIGSUBPKT_REVOC_REASON: /* At least we know about it. */ case SIGSUBPKT_REVOC_REASON: /* At least we know about it. */
case SIGSUBPKT_PREF_AEAD2:
return 1; return 1;
case SIGSUBPKT_KEY_BLOCK: case SIGSUBPKT_KEY_BLOCK:
@ -2260,7 +2272,7 @@ parse_signature (IOBUF inp, int pkttype, unsigned long pktlen,
if (p) if (p)
sig->timestamp = buf32_to_u32 (p); sig->timestamp = buf32_to_u32 (p);
else if (!(sig->pubkey_algo >= 100 && sig->pubkey_algo <= 110) else if (!(sig->pubkey_algo >= 100 && sig->pubkey_algo <= 110)
&& opt.verbose && !glo_ctrl.silence_parse_warnings) && opt.verbose && !glo_ctrl.silence_parse_warnings)//
log_info ("signature packet without timestamp\n"); log_info ("signature packet without timestamp\n");
/* Set the key id. We first try the issuer fingerprint and if /* Set the key id. We first try the issuer fingerprint and if