gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

gnutls memory management fixup

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@40148 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2016-10-14 07:57:57 +00:00
parent 6509aeb2de
commit 6b68c9a1ca
3 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,7 +1,14 @@
2016-10-14 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/GNUstepBase/GSTLS.h:
* Source/GSTLS.m:
Fix for double free issues when assigning certificat/key to
credentials fails.
2016-10-12 Niels Grewe <niels.grewe@halbordnung.de>
* Source/NSRegularExpression.m: Fix crashes in libicu due to ignored error
codes. Also fix a few memory leaks.
* Source/NSRegularExpression.m: Fix crashes in libicu due to
* ignored error codes. Also fix a few memory leaks.
* Tests/base/NSRegularExpression/basic.m: Test cases for this.
2016-10-11 Niels Grewe <niels.grewe@halbordnung.de>

1
Source/GSTLS.h
View file

@ -150,6 +150,7 @@ extern NSString * const GSTLSVerify;
GSTLSCertificateList *list;
GSTLSDHParams *dhParams;
BOOL trust;
BOOL freeCred;
gnutls_certificate_credentials_t certcred;
}
+ (GSTLSCredentials*) credentialsFromCAFile: (NSString*)ca

22
Source/GSTLS.m
View file

@ -934,6 +934,13 @@ static NSMutableDictionary *privateKeyCache1 = nil;
k->password = [p copy];
gnutls_x509_privkey_init(&k->key);
#ifdef HAVE_GNUTLS_X509_PRIVKEY_IMPORT2
/* This function can read openssl proprietory key format,
* and uses the password if supplied.
*/
ret = gnutls_x509_privkey_import2(k->key, &datum,
GNUTLS_X509_FMT_PEM, [k->password UTF8String], 0);
#else
if (nil == k->password)
{
ret = gnutls_x509_privkey_import(k->key, &datum,
@ -941,15 +948,11 @@ static NSMutableDictionary *privateKeyCache1 = nil;
}
else
{
# ifdef HAVE_GNUTLS_X509_PRIVKEY_IMPORT2
ret = gnutls_x509_privkey_import2(k->key, &datum,
GNUTLS_X509_FMT_PEM,
[k->password UTF8String], 0);
# else
ret = gnutls_x509_privkey_import_pkcs8(k->key, &datum,
GNUTLS_X509_FMT_PEM, [k->password UTF8String], 0);
# endif
}
#endif
if (ret < 0)
{
NSLog(@"Unable to parse private key file '%@': %s",
@ -1095,6 +1098,7 @@ static NSMutableDictionary *credentialsCache = nil;
c->when = [NSDate timeIntervalSinceReferenceDate];
gnutls_certificate_allocate_credentials(&c->certcred);
c->freeCred = YES; // Need to free on dealloc
/* Set the default trusted authority certificates.
*/
@ -1245,6 +1249,7 @@ static NSMutableDictionary *credentialsCache = nil;
[c->list certificateList], [c->list count], [c->key key]);
if (ret < 0)
{
c->freeCred = NO; // Already freed
NSLog(@"Unable to set certificate for session: %s",
gnutls_strerror(ret));
[c release];
@ -1277,7 +1282,10 @@ static NSMutableDictionary *credentialsCache = nil;
{
if (nil != name)
{
gnutls_certificate_free_credentials(certcred);
if (YES == freeCred)
{
gnutls_certificate_free_credentials(certcred);
}
DESTROY(key);
DESTROY(list);
DESTROY(dhParams);