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

path handling tweaks

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35760 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-10-28 18:13:38 +00:00
parent 45dc918955
commit f6feeccb49
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Source/GSTLS.m
View file

@ -417,6 +417,7 @@ static GSTLSDHParams *paramsCurrent = nil;
{
return nil;
}
f = [f stringByStandardizingPath];
[paramsLock lock];
p = [[paramsCache objectForKey: f] retain];
[paramsLock unlock];
@ -520,6 +521,7 @@ static NSMutableDictionary *certificateListCache = nil;
{
return nil;
}
f = [f stringByStandardizingPath];
[certificateListLock lock];
l = [[certificateListCache objectForKey: f] retain];
[certificateListLock unlock];
@ -673,6 +675,7 @@ static NSMutableDictionary *privateKeyCache1 = nil;
{
return nil;
}
f = [f stringByStandardizingPath];
[privateKeyLock lock];
if (nil == p)
{
@ -900,9 +903,10 @@ static NSMutableDictionary *privateKeyCache1 = nil;
*/
if ([caFile length] > 0)
{
const char *path = [caFile fileSystemRepresentation];
const char *path;
int ret;
path = [caFile fileSystemRepresentation];
ret = gnutls_certificate_set_x509_trust_file(certcred,
path, GNUTLS_X509_FMT_PEM);
if (ret < 0)
@ -925,9 +929,11 @@ static NSMutableDictionary *privateKeyCache1 = nil;
str = [opts objectForKey: GSTLSCAFile];
if ([str length] > 0)
{
const char *path = [str fileSystemRepresentation];
const char *path;
int ret;
str = [str stringByStandardizingPath];
path = [str fileSystemRepresentation];
ret = gnutls_certificate_set_x509_trust_file(certcred,
path, GNUTLS_X509_FMT_PEM);
if (ret < 0)
@ -964,9 +970,10 @@ static NSMutableDictionary *privateKeyCache1 = nil;
*/
if ([revokeFile length] > 0)
{
const char *path = [revokeFile fileSystemRepresentation];
const char *path;
int ret;
path = [revokeFile fileSystemRepresentation];
ret = gnutls_certificate_set_x509_crl_file(certcred,
path, GNUTLS_X509_FMT_PEM);
if (ret < 0)
@ -985,9 +992,11 @@ static NSMutableDictionary *privateKeyCache1 = nil;
str = [opts objectForKey: GSTLSRevokeFile];
if ([str length] > 0)
{
const char *path = [str fileSystemRepresentation];
const char *path;
int ret;
str = [str stringByStandardizingPath];
path = [str fileSystemRepresentation];
ret = gnutls_certificate_set_x509_crl_file(certcred,
path, GNUTLS_X509_FMT_PEM);
if (ret < 0)