darlinghq/darling-security
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-security.git synced 2024-11-23 12:09:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid typedef conflict when Security/oids.h has been included

Browse Source
This commit is contained in:
Ariel Abreu 2020-08-31 15:54:23 -04:00
parent ffc4d35c5c
commit 18a369686e
No known key found for this signature in database
GPG Key ID: ECF8C2B9E8AD3E6B
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libDER/libDER/oids.h
View File

@ -35,6 +35,12 @@
__BEGIN_DECLS
// Security's new `oids.h` checks for the main `libder.h` header being already included,
// but doesn't check for LibDER's `oids.h` (which is the one that actually defines
// the conflicting types)
// Both this file and that one define the same exact types, so if the other file has already been included,
// been included, it's okay, just don't redefine anything
#if !defined(_SECURITY_OIDS_H_)
/*
* Basic data types
*/
@ -48,6 +54,7 @@ typedef struct {
DERByte *data;
DERSize length;
} DERItem;
#endif
/* Algorithm oids. */
extern const DERItem