gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 00:11:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

More code tidyups and NSError updates.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@23921 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2006-10-20 10:56:27 +00:00
parent 6ba4584136
commit 9e7b96ab0e
87 changed files with 746 additions and 539 deletions
Download patch file Download diff file Expand all files Collapse all files

24
SSL/GSSSLHandle.m
View file

@ -80,10 +80,9 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <errno.h>
static NSString*
sslError(int err, int e)
sslError(int err)
{
NSString *str;
@ -107,8 +106,12 @@ sslError(int err, int e)
str = @"Want X509 Lookup Error";
break;
case SSL_ERROR_SYSCALL:
str = [NSString stringWithFormat: @"Syscall error %d - %@",
e, [_GSPrivate error: e]];
{
NSError *e = [NSError _last];
str = [NSString stringWithFormat: @"Syscall error %d - %@",
[e code], [e description]];
}
break;
case SSL_ERROR_SSL:
str = @"SSL Error: really helpful";
@ -224,7 +227,6 @@ sslError(int err, int e)
}
if (ret != 1)
{
int e = errno;
NSDate *final;
NSDate *when;
NSTimeInterval last = 0.0;
@ -253,7 +255,6 @@ sslError(int err, int e)
ret = SSL_accept(ssl);
if (ret != 1)
{
e = errno;
err = SSL_get_error(ssl, ret);
}
else
@ -271,7 +272,7 @@ sslError(int err, int e)
* Some other error ... not just a timeout or disconnect
*/
NSLog(@"unable to accept SSL connection from %@:%@ - %@",
address, service, sslError(err, e));
address, service, sslError(err));
ERR_print_errors_fp(stderr);
}
@ -330,7 +331,6 @@ sslError(int err, int e)
}
if (ret != 1)
{
int e = errno;
NSDate *final;
NSDate *when;
NSTimeInterval last = 0.0;
@ -359,7 +359,6 @@ sslError(int err, int e)
ret = SSL_connect(ssl);
if (ret != 1)
{
e = errno;
err = SSL_get_error(ssl, ret);
}
else
@ -371,13 +370,14 @@ sslError(int err, int e)
RELEASE(final);
if (err != SSL_ERROR_NONE)
{
if (err != SSL_ERROR_WANT_READ && err != SSL_ERROR_WANT_WRITE)
if (err != SSL_ERROR_WANT_READ && err != SSL_ERROR_WANT_WRITE)
{
/*
* Some other error ... not just a timeout or disconnect
*/
NSLog(@"unable to make SSL connection to %@:%@ - %@",
address, service, sslError(err, e));
address, service, sslError(err));
ERR_print_errors_fp(stderr);
}
RELEASE(self);
@ -439,7 +439,7 @@ sslError(int err, int e)
if (ret != 1)
{
NSLog(@"Failed to set certificate file to %@ - %@",
certFile, sslError(ERR_get_error(), errno));
certFile, sslError(ERR_get_error()));
}
}
if ([privateKey length] > 0)
@ -449,7 +449,7 @@ sslError(int err, int e)
if (ret != 1)
{
NSLog(@"Failed to set private key file to %@ - %@",
privateKey, sslError(ERR_get_error(), errno));
privateKey, sslError(ERR_get_error()));
}
}
}