GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Also detect AuthEnvelopedData (AEAD for CMS)

Browse Source 
* src/data-identify.c (basic_detection): Add OID.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2021-06-14 17:10:49 +02:00
parent b3b75c37e2
commit ea290108e4
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/data-identify.c
View File

@ -416,8 +416,8 @@ basic_detection (char *data, size_t datalen)
} }
else if (ti.length == 11) else if (ti.length == 11)
{ {
if (!memcmp (s, "\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x01\x02", 11)) if (!memcmp (s, "\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x01\x17", 11))
return GPGME_DATA_TYPE_CMS_OTHER; /* Auth Data. */ return GPGME_DATA_TYPE_CMS_ENCRYPTED; /* AuthEnveloped Data. */
} }
} }

2
src/data.c
View File

@ -52,7 +52,7 @@
*/ */
struct property_s struct property_s
{ {
gpgme_data_t dh; /* The data objcet or NULL if the slot is not used. */ gpgme_data_t dh; /* The data object or NULL if the slot is not used. */
uint64_t dserial; /* The serial number of the data object. */ uint64_t dserial; /* The serial number of the data object. */
struct { struct {
unsigned int blankout : 1; /* Void the held data. */ unsigned int blankout : 1; /* Void the held data. */