Fix mistake in property key names for certificate support

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@19926 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2004-08-26 10:41:04 +00:00
parent a53f5dcad3
commit e448a790ed
4 changed files with 20 additions and 12 deletions

View file

@ -1,3 +1,9 @@
2004-08-26 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/Foundation/NSURLHandle.h:
* Source/GSHTTPURLHandle.m:
* Source/NSURLHandle.m: Fix property key names
2004-08-25 Adrian Robert <arobert@cogsci.ucsd.edu>
* Documentation/HtmlNav/index.html:

View file

@ -95,19 +95,19 @@ GS_EXPORT NSString * const GSHTTPPropertyProxyPortKey;
* Key for passing to [NSURLHandle]'s <code>propertyForKey..</code> methods to
* specify the location of an SSL certificate file.
*/
GS_EXPORT NSString * const GSHTTPSCertificateFileKey;
GS_EXPORT NSString * const GSHTTPPropertyCertificateFileKey;
/**
* Key for passing to [NSURLHandle]'s <code>propertyForKey..</code> methods to
* specify the location of an SSL key file.
*/
GS_EXPORT NSString * const GSHTTPSKeyFileKey;
GS_EXPORT NSString * const GSHTTPPropertyKeyFileKey;
/**
* Key for passing to [NSURLHandle]'s <code>propertyForKey..</code> methods to
* specify the password for an SSL key file.
*/
GS_EXPORT NSString * const GSHTTPSKeyPasswordKey;
GS_EXPORT NSString * const GSHTTPPropertyPasswordKey;
#endif

View file

@ -653,12 +653,14 @@ static void debugWrite(GSHTTPURLHandle *handle, NSData *data)
sock = [sslClass fileHandleAsClientInBackgroundAtAddress: host
service: port
protocol: s];
cert = [request objectForKey: GSHTTPSCertificateFileKey];
cert = [request objectForKey: GSHTTPPropertyCertificateFileKey];
if ([cert length] > 0)
{
NSString *key = [request objectForKey: GSHTTPSKeyFileKey];
NSString *pwd = [request objectForKey: GSHTTPSKeyPasswordKey];
NSString *key;
NSString *pwd;
key = [request objectForKey: GSHTTPPropertyKeyFileKey];
pwd = [request objectForKey: GSHTTPPropertyPasswordKey];
[sock sslSetCertificate: cert privateKey: key PEMpasswd: pwd];
}
}

View file

@ -73,14 +73,14 @@ NSString * const GSHTTPPropertyProxyHostKey
NSString * const GSHTTPPropertyProxyPortKey
= @"GSHTTPPropertyProxyPortKey";
NSString * const GSHTTPSCertificateFileKey
= @"GSHTTPSCertificateFileKey";
NSString * const GSHTTPPropertyCertificateFileKey
= @"GSHTTPPropertyCertificateFileKey";
NSString * const GSHTTPSKeyFileKey
= @"GSHTTPSKeyFileKey";
NSString * const GSHTTPPropertyKeyFileKey
= @"GSHTTPPropertyKeyFileKey";
NSString * const GSHTTPSKeyPasswordKey
= @"GSHTTPSKeyPasswordKey";
NSString * const GSHTTPPropertyPasswordKey
= @"GSHTTPPropertyPasswordKey";
/**