denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openssl: Allocate our own buffer for i2d_* wrapper macro

Browse Source 
If we pass a pointer to NULL, the memory allocated by OpenSSL has to be
freed with OPENSSL_free().  Otherwise, this can lead to random
crashes/freezes for Windows builds as seen on AppVeyor.  To not
complicate things for callers of this macro, we allocate our own memory,
which we already do for other i2d_* calls.
This commit is contained in:
Tobias Brunner
2021-02-11 16:40:58 +01:00
parent 6a440f83ab
commit 781ad0b93b
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/openssl/openssl_util.h
+8 -3
View File
@@ -101,9 +101,14 @@ bool openssl_bn2chunk(const BIGNUM *bn, chunk_t *chunk);
* @returns allocated chunk of the object, or chunk_empty * @returns allocated chunk of the object, or chunk_empty
*/ */
#define openssl_i2chunk(type, obj) ({ \ #define openssl_i2chunk(type, obj) ({ \
unsigned char *ptr = NULL; \ chunk_t chunk = chunk_empty; \
int len = i2d_##type(obj, &ptr); \ int len = i2d_##type(obj, NULL); \
len < 0 ? chunk_empty : chunk_create(ptr, len);}) if (len >= 0) { \
chunk = chunk_alloc(len); \
u_char *p = chunk.ptr; \
i2d_##type(obj, &p); \
} \
chunk; })
/** /**
* Convert an OpenSSL ASN1_OBJECT to a chunk. * Convert an OpenSSL ASN1_OBJECT to a chunk.