Adjust to recent ObjFW changes

Midar · Midar · commit c428df9b60be · 2017-05-08T02:31:13.000+02:00
diff --git a/src/SSLConnectionFailedException.h b/src/SSLConnectionFailedException.h
@@ -33,22 +33,22 @@
 @property (readonly) unsigned long SSLError;
 @property (readonly) long verifyResult;
 
-+ (instancetype)exceptionWithHost: (OFString*)host
++ (instancetype)exceptionWithHost: (OFString *)host
 			     port: (uint16_t)port
-			   socket: (SSLSocket*)socket
+			   socket: (SSLSocket *)socket
 			 SSLError: (unsigned long)SSLError;
-+ (instancetype)exceptionWithHost: (OFString*)host
++ (instancetype)exceptionWithHost: (OFString *)host
 			     port: (uint16_t)port
-			   socket: (SSLSocket*)socket
+			   socket: (SSLSocket *)socket
 			 SSLError: (unsigned long)SSLError
 		     verifyResult: (long)verifyResult;
-- initWithHost: (OFString*)host
+- initWithHost: (OFString *)host
 	  port: (uint16_t)port
-	socket: (SSLSocket*)socket
+	socket: (SSLSocket *)socket
       SSLError: (unsigned long)SSLError;
-- initWithHost: (OFString*)host
+- initWithHost: (OFString *)host
 	  port: (uint16_t)port
-	socket: (SSLSocket*)socket
+	socket: (SSLSocket *)socket
       SSLError: (unsigned long)SSLError
   verifyResult: (long)verifyResult;
 @end
diff --git a/src/SSLConnectionFailedException.m b/src/SSLConnectionFailedException.m
@@ -42,9 +42,9 @@
 @implementation SSLConnectionFailedException
 @synthesize SSLError = _SSLError, verifyResult = _verifyResult;
 
-+ (instancetype)exceptionWithHost: (OFString*)host
++ (instancetype)exceptionWithHost: (OFString *)host
 			     port: (uint16_t)port
-			   socket: (SSLSocket*)socket
+			   socket: (SSLSocket *)socket
 			 SSLError: (unsigned long)SSLError
 {
 	return [[[self alloc] initWithHost: host
@@ -54,9 +54,9 @@ + (instancetype)exceptionWithHost: (OFString*)host
 }
 
 
-+ (instancetype)exceptionWithHost: (OFString*)host
++ (instancetype)exceptionWithHost: (OFString *)host
 			     port: (uint16_t)port
-			   socket: (SSLSocket*)socket
+			   socket: (SSLSocket *)socket
 			 SSLError: (unsigned long)SSLError
 		     verifyResult: (long)verifyResult
 {
@@ -67,9 +67,9 @@ + (instancetype)exceptionWithHost: (OFString*)host
 			      verifyResult: verifyResult] autorelease];
 }
 
-- initWithHost: (OFString*)host
+- initWithHost: (OFString *)host
 	  port: (uint16_t)port
-	socket: (SSLSocket*)socket
+	socket: (SSLSocket *)socket
       SSLError: (unsigned long)SSLError
 {
 	self = [super initWithHost: host
@@ -81,9 +81,9 @@ + (instancetype)exceptionWithHost: (OFString*)host
 	return self;
 }
 
-- initWithHost: (OFString*)host
+- initWithHost: (OFString *)host
 	  port: (uint16_t)port
-	socket: (SSLSocket*)socket
+	socket: (SSLSocket *)socket
       SSLError: (unsigned long)SSLError
   verifyResult: (long)verifyResult
 {
@@ -97,7 +97,7 @@ + (instancetype)exceptionWithHost: (OFString*)host
 	return self;
 }
 
-- (OFString*)description
+- (OFString *)description
 {
 	if (_SSLError != SSL_ERROR_NONE) {
 		char error[512];
diff --git a/src/SSLInvalidCertificateException.h b/src/SSLInvalidCertificateException.h
@@ -29,8 +29,8 @@
 	OFString *_reason;
 }
 
-@property (readonly, copy) OFString *reason;
+@property (readonly, nonatomic) OFString *reason;
 
-+ exceptionWithReason: (OFString*)reason;
-- initWithReason: (OFString*)reason;
++ exceptionWithReason: (OFString *)reason;
+- initWithReason: (OFString *)reason;
 @end
diff --git a/src/SSLInvalidCertificateException.m b/src/SSLInvalidCertificateException.m
@@ -30,7 +30,7 @@
 @implementation SSLInvalidCertificateException
 @synthesize reason = _reason;
 
-+ exceptionWithReason: (OFString*)reason
++ exceptionWithReason: (OFString *)reason
 {
 	return [[[self alloc] initWithReason: reason] autorelease];
 }
@@ -47,7 +47,7 @@ @implementation SSLInvalidCertificateException
 	abort();
 }
 
-- initWithReason: (OFString*)reason
+- initWithReason: (OFString *)reason
 {
 	self = [super init];
 
@@ -68,7 +68,7 @@ - (void)dealloc
 	[super dealloc];
 }
 
-- (OFString*)description
+- (OFString *)description
 {
 	return [OFString stringWithFormat:
 	    @"Invalid certificate! Reason: %@", _reason];
diff --git a/src/SSLSocket.h b/src/SSLSocket.h
@@ -40,9 +40,9 @@
 @property (getter=isRequestClientCertificatesEnabled)
     bool requestClientCertificatesEnabled;
 
-- initWithSocket: (OFTCPSocket*)socket;
+- initWithSocket: (OFTCPSocket *)socket;
 - (void)SSL_super_close;
-- (OFDataArray*)channelBindingDataWithType: (OFString*)type;
-- (X509Certificate*)peerCertificate;
+- (OFDataArray *)channelBindingDataWithType: (OFString *)type;
+- (X509Certificate *)peerCertificate;
 - (void)verifyPeerCertificate;
 @end
diff --git a/src/SSLSocket.m b/src/SSLSocket.m
@@ -144,7 +144,7 @@ + (void)initialize
 	return self;
 }
 
-- initWithSocket: (OFTCPSocket*)socket
+- initWithSocket: (OFTCPSocket *)socket
 {
 	self = [self init];
 
@@ -172,7 +172,7 @@ - (void)dealloc
 		SSL_free(SSL_);
 }
 
-- (void)SSL_startTLSWithExpectedHost: (OFString*)host
+- (void)SSL_startTLSWithExpectedHost: (OFString *)host
 				port: (uint16_t)port
 {
 	of_string_encoding_t encoding;
@@ -254,13 +254,13 @@ - (void)SSL_startTLSWithExpectedHost: (OFString*)host
 	}
 }
 
-- (void)startTLSWithExpectedHost: (OFString*)host
+- (void)startTLSWithExpectedHost: (OFString *)host
 {
 	[self SSL_startTLSWithExpectedHost: host
 				      port: 0];
 }
 
-- (void)connectToHost: (OFString*)host
+- (void)connectToHost: (OFString *)host
 		 port: (uint16_t)port
 {
 	[super connectToHost: host
@@ -272,7 +272,7 @@ - (void)connectToHost: (OFString*)host
 
 - (instancetype)accept
 {
-	SSLSocket *client = (SSLSocket*)[super accept];
+	SSLSocket *client = (SSLSocket *)[super accept];
 	of_string_encoding_t encoding;
 
 	if ((client->_SSL = SSL_new(ctx)) == NULL ||
@@ -317,7 +317,7 @@ - (void)SSL_super_close
 	[super close];
 }
 
-- (size_t)lowlevelReadIntoBuffer: (void*)buffer
+- (size_t)lowlevelReadIntoBuffer: (void *)buffer
 			  length: (size_t)length
 {
 	ssize_t ret;
@@ -347,7 +347,7 @@ - (size_t)lowlevelReadIntoBuffer: (void*)buffer
 	return ret;
 }
 
-- (void)lowlevelWriteBuffer: (const void*)buffer
+- (void)lowlevelWriteBuffer: (const void *)buffer
 		     length: (size_t)length
 {
 	if (length > INT_MAX)
@@ -374,46 +374,46 @@ - (bool)hasDataInReadBuffer
 	return [super hasDataInReadBuffer];
 }
 
-- (void)setCertificateFile: (OFString*)certificateFile
-		forSNIHost: (OFString*)SNIHost
+- (void)setCertificateFile: (OFString *)certificateFile
+		forSNIHost: (OFString *)SNIHost
 {
 	/* TODO */
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (OFString*)certificateFileForSNIHost: (OFString*)SNIHost
+- (OFString *)certificateFileForSNIHost: (OFString *)SNIHost
 {
 	/* TODO */
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void)setPrivateKeyFile: (OFString*)privateKeyFile
-	       forSNIHost: (OFString*)SNIHost
+- (void)setPrivateKeyFile: (OFString *)privateKeyFile
+	       forSNIHost: (OFString *)SNIHost
 {
 	/* TODO */
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (OFString*)privateKeyFileForSNIHost: (OFString*)SNIHost
+- (OFString *)privateKeyFileForSNIHost: (OFString *)SNIHost
 {
 	/* TODO */
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void)setPrivateKeyPassphrase: (const char*)privateKeyPassphrase
-		     forSNIHost: (OFString*)SNIHost
+- (void)setPrivateKeyPassphrase: (const char *)privateKeyPassphrase
+		     forSNIHost: (OFString *)SNIHost
 {
 	/* TODO */
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (const char*)privateKeyPassphraseForSNIHost: (OFString*)SNIHost
+- (const char *)privateKeyPassphraseForSNIHost: (OFString *)SNIHost
 {
 	/* TODO */
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (OFDataArray*)channelBindingDataWithType: (OFString*)type
+- (OFDataArray *)channelBindingDataWithType: (OFString *)type
 {
 	size_t length;
 	char buffer[64];
@@ -440,7 +440,7 @@ - (OFDataArray*)channelBindingDataWithType: (OFString*)type
 	return data;
 }
 
-- (X509Certificate*)peerCertificate
+- (X509Certificate *)peerCertificate
 {
 	X509 *certificate = SSL_get_peer_certificate(_SSL);
 
diff --git a/src/X509Certificate.h b/src/X509Certificate.h
@@ -46,7 +46,7 @@
 	OFString *_string;
 }
 
-- initWithUTF8String: (const char*)string;
+- initWithUTF8String: (const char *)string;
 @end
 
 @interface X509Certificate: OFObject
@@ -57,18 +57,18 @@
 	OFDictionary *_subjectAlternativeName;
 }
 
-- initWithFile: (OFString*)file;
-- initWithX509Struct: (X509*)cert;
-- (OFDictionary*)issuer;
-- (OFDictionary*)subject;
-- (OFDictionary*)subjectAlternativeName;
-- (bool)hasCommonNameMatchingDomain: (OFString*)domain;
-- (bool)hasDNSNameMatchingDomain: (OFString*)domain;
-- (bool)hasSRVNameMatchingDomain: (OFString*)domain
-			 service: (OFString*)service;
-- (bool)X509_isAssertedDomain: (OFString*)asserted
-		  equalDomain: (OFString*)domain;
-- (OFDictionary*)X509_dictionaryFromX509Name: (X509_NAME*)name;
-- (X509OID*)X509_stringFromASN1Object: (ASN1_OBJECT*)obj;
-- (OFString*)X509_stringFromASN1String: (ASN1_STRING*)str;
+- initWithFile: (OFString *)file;
+- initWithX509Struct: (X509 *)cert;
+- (OFDictionary *)issuer;
+- (OFDictionary *)subject;
+- (OFDictionary *)subjectAlternativeName;
+- (bool)hasCommonNameMatchingDomain: (OFString *)domain;
+- (bool)hasDNSNameMatchingDomain: (OFString *)domain;
+- (bool)hasSRVNameMatchingDomain: (OFString *)domain
+			 service: (OFString *)service;
+- (bool)X509_isAssertedDomain: (OFString *)asserted
+		  equalDomain: (OFString *)domain;
+- (OFDictionary *)X509_dictionaryFromX509Name: (X509_NAME *)name;
+- (X509OID *)X509_stringFromASN1Object: (ASN1_OBJECT *)obj;
+- (OFString *)X509_stringFromASN1String: (ASN1_STRING *)str;
 @end
diff --git a/src/X509Certificate.m b/src/X509Certificate.m

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,9 @@`
`42`	`42`	`@implementation SSLConnectionFailedException`
`43`	`43`	`@synthesize SSLError = _SSLError, verifyResult = _verifyResult;`
`44`	`44`
`45`		`-+ (instancetype)exceptionWithHost: (OFString*)host`
	`45`	`++ (instancetype)exceptionWithHost: (OFString *)host`
`46`	`46`	`port: (uint16_t)port`
`47`		`- socket: (SSLSocket*)socket`
	`47`	`+ socket: (SSLSocket *)socket`
`48`	`48`	`SSLError: (unsigned long)SSLError`
`49`	`49`	`{`
`50`	`50`	`return [[[self alloc] initWithHost: host`
`@@ -54,9 +54,9 @@ + (instancetype)exceptionWithHost: (OFString*)host`
`54`	`54`	`}`
`55`	`55`
`56`	`56`
`57`		`-+ (instancetype)exceptionWithHost: (OFString*)host`
	`57`	`++ (instancetype)exceptionWithHost: (OFString *)host`
`58`	`58`	`port: (uint16_t)port`
`59`		`- socket: (SSLSocket*)socket`
	`59`	`+ socket: (SSLSocket *)socket`
`60`	`60`	`SSLError: (unsigned long)SSLError`
`61`	`61`	`verifyResult: (long)verifyResult`
`62`	`62`	`{`
`@@ -67,9 +67,9 @@ + (instancetype)exceptionWithHost: (OFString*)host`
`67`	`67`	`verifyResult: verifyResult] autorelease];`
`68`	`68`	`}`
`69`	`69`
`70`		`-- initWithHost: (OFString*)host`
	`70`	`+- initWithHost: (OFString *)host`
`71`	`71`	`port: (uint16_t)port`
`72`		`- socket: (SSLSocket*)socket`
	`72`	`+ socket: (SSLSocket *)socket`
`73`	`73`	`SSLError: (unsigned long)SSLError`
`74`	`74`	`{`
`75`	`75`	`self = [super initWithHost: host`
`@@ -81,9 +81,9 @@ + (instancetype)exceptionWithHost: (OFString*)host`
`81`	`81`	`return self;`
`82`	`82`	`}`
`83`	`83`
`84`		`-- initWithHost: (OFString*)host`
	`84`	`+- initWithHost: (OFString *)host`
`85`	`85`	`port: (uint16_t)port`
`86`		`- socket: (SSLSocket*)socket`
	`86`	`+ socket: (SSLSocket *)socket`
`87`	`87`	`SSLError: (unsigned long)SSLError`
`88`	`88`	`verifyResult: (long)verifyResult`
`89`	`89`	`{`
`@@ -97,7 +97,7 @@ + (instancetype)exceptionWithHost: (OFString*)host`
`97`	`97`	`return self;`
`98`	`98`	`}`
`99`	`99`
`100`		`-- (OFString*)description`
	`100`	`+- (OFString *)description`
`101`	`101`	`{`
`102`	`102`	`if (_SSLError != SSL_ERROR_NONE) {`
`103`	`103`	`char error[512];`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`@implementation SSLInvalidCertificateException`
`31`	`31`	`@synthesize reason = _reason;`
`32`	`32`
`33`		`-+ exceptionWithReason: (OFString*)reason`
	`33`	`++ exceptionWithReason: (OFString *)reason`
`34`	`34`	`{`
`35`	`35`	`return [[[self alloc] initWithReason: reason] autorelease];`
`36`	`36`	`}`
`@@ -47,7 +47,7 @@ @implementation SSLInvalidCertificateException`
`47`	`47`	`abort();`
`48`	`48`	`}`
`49`	`49`
`50`		`-- initWithReason: (OFString*)reason`
	`50`	`+- initWithReason: (OFString *)reason`
`51`	`51`	`{`
`52`	`52`	`self = [super init];`
`53`	`53`
`@@ -68,7 +68,7 @@ - (void)dealloc`
`68`	`68`	`[super dealloc];`
`69`	`69`	`}`
`70`	`70`
`71`		`-- (OFString*)description`
	`71`	`+- (OFString *)description`
`72`	`72`	`{`
`73`	`73`	`return [OFString stringWithFormat:`
`74`	`74`	`@"Invalid certificate! Reason: %@", _reason];`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ + (void)initialize`
`144`	`144`	`return self;`
`145`	`145`	`}`
`146`	`146`
`147`		`-- initWithSocket: (OFTCPSocket*)socket`
	`147`	`+- initWithSocket: (OFTCPSocket *)socket`
`148`	`148`	`{`
`149`	`149`	`self = [self init];`
`150`	`150`
`@@ -172,7 +172,7 @@ - (void)dealloc`
`172`	`172`	`SSL_free(SSL_);`
`173`	`173`	`}`
`174`	`174`
`175`		`-- (void)SSL_startTLSWithExpectedHost: (OFString*)host`
	`175`	`+- (void)SSL_startTLSWithExpectedHost: (OFString *)host`
`176`	`176`	`port: (uint16_t)port`
`177`	`177`	`{`
`178`	`178`	`of_string_encoding_t encoding;`
`@@ -254,13 +254,13 @@ - (void)SSL_startTLSWithExpectedHost: (OFString*)host`
`254`	`254`	`}`
`255`	`255`	`}`
`256`	`256`
`257`		`-- (void)startTLSWithExpectedHost: (OFString*)host`
	`257`	`+- (void)startTLSWithExpectedHost: (OFString *)host`
`258`	`258`	`{`
`259`	`259`	`[self SSL_startTLSWithExpectedHost: host`
`260`	`260`	`port: 0];`
`261`	`261`	`}`
`262`	`262`
`263`		`-- (void)connectToHost: (OFString*)host`
	`263`	`+- (void)connectToHost: (OFString *)host`
`264`	`264`	`port: (uint16_t)port`
`265`	`265`	`{`
`266`	`266`	`[super connectToHost: host`
`@@ -272,7 +272,7 @@ - (void)connectToHost: (OFString*)host`
`272`	`272`
`273`	`273`	`- (instancetype)accept`
`274`	`274`	`{`
`275`		`- SSLSocket client = (SSLSocket)[super accept];`
	`275`	`+ SSLSocket client = (SSLSocket )[super accept];`
`276`	`276`	`of_string_encoding_t encoding;`
`277`	`277`
`278`	`278`	`if ((client->_SSL = SSL_new(ctx)) == NULL \|\|`
`@@ -317,7 +317,7 @@ - (void)SSL_super_close`
`317`	`317`	`[super close];`
`318`	`318`	`}`
`319`	`319`
`320`		`-- (size_t)lowlevelReadIntoBuffer: (void*)buffer`
	`320`	`+- (size_t)lowlevelReadIntoBuffer: (void *)buffer`
`321`	`321`	`length: (size_t)length`
`322`	`322`	`{`
`323`	`323`	`ssize_t ret;`
`@@ -347,7 +347,7 @@ - (size_t)lowlevelReadIntoBuffer: (void*)buffer`
`347`	`347`	`return ret;`
`348`	`348`	`}`
`349`	`349`
`350`		`-- (void)lowlevelWriteBuffer: (const void*)buffer`
	`350`	`+- (void)lowlevelWriteBuffer: (const void *)buffer`
`351`	`351`	`length: (size_t)length`
`352`	`352`	`{`
`353`	`353`	`if (length > INT_MAX)`
`@@ -374,46 +374,46 @@ - (bool)hasDataInReadBuffer`
`374`	`374`	`return [super hasDataInReadBuffer];`
`375`	`375`	`}`
`376`	`376`
`377`		`-- (void)setCertificateFile: (OFString*)certificateFile`
`378`		`- forSNIHost: (OFString*)SNIHost`
	`377`	`+- (void)setCertificateFile: (OFString *)certificateFile`
	`378`	`+ forSNIHost: (OFString *)SNIHost`
`379`	`379`	`{`
`380`	`380`	`/* TODO */`
`381`	`381`	`OF_UNRECOGNIZED_SELECTOR`
`382`	`382`	`}`
`383`	`383`
`384`		`-- (OFString)certificateFileForSNIHost: (OFString)SNIHost`
	`384`	`+- (OFString )certificateFileForSNIHost: (OFString )SNIHost`
`385`	`385`	`{`
`386`	`386`	`/* TODO */`
`387`	`387`	`OF_UNRECOGNIZED_SELECTOR`
`388`	`388`	`}`
`389`	`389`
`390`		`-- (void)setPrivateKeyFile: (OFString*)privateKeyFile`
`391`		`- forSNIHost: (OFString*)SNIHost`
	`390`	`+- (void)setPrivateKeyFile: (OFString *)privateKeyFile`
	`391`	`+ forSNIHost: (OFString *)SNIHost`
`392`	`392`	`{`
`393`	`393`	`/* TODO */`
`394`	`394`	`OF_UNRECOGNIZED_SELECTOR`
`395`	`395`	`}`
`396`	`396`
`397`		`-- (OFString)privateKeyFileForSNIHost: (OFString)SNIHost`
	`397`	`+- (OFString )privateKeyFileForSNIHost: (OFString )SNIHost`
`398`	`398`	`{`
`399`	`399`	`/* TODO */`
`400`	`400`	`OF_UNRECOGNIZED_SELECTOR`
`401`	`401`	`}`
`402`	`402`
`403`		`-- (void)setPrivateKeyPassphrase: (const char*)privateKeyPassphrase`
`404`		`- forSNIHost: (OFString*)SNIHost`
	`403`	`+- (void)setPrivateKeyPassphrase: (const char *)privateKeyPassphrase`
	`404`	`+ forSNIHost: (OFString *)SNIHost`
`405`	`405`	`{`
`406`	`406`	`/* TODO */`
`407`	`407`	`OF_UNRECOGNIZED_SELECTOR`
`408`	`408`	`}`
`409`	`409`
`410`		`-- (const char)privateKeyPassphraseForSNIHost: (OFString)SNIHost`
	`410`	`+- (const char )privateKeyPassphraseForSNIHost: (OFString )SNIHost`
`411`	`411`	`{`
`412`	`412`	`/* TODO */`
`413`	`413`	`OF_UNRECOGNIZED_SELECTOR`
`414`	`414`	`}`
`415`	`415`
`416`		`-- (OFDataArray)channelBindingDataWithType: (OFString)type`
	`416`	`+- (OFDataArray )channelBindingDataWithType: (OFString )type`
`417`	`417`	`{`
`418`	`418`	`size_t length;`
`419`	`419`	`char buffer[64];`
`@@ -440,7 +440,7 @@ - (OFDataArray)channelBindingDataWithType: (OFString)type`
`440`	`440`	`return data;`
`441`	`441`	`}`
`442`	`442`
`443`		`-- (X509Certificate*)peerCertificate`
	`443`	`+- (X509Certificate *)peerCertificate`
`444`	`444`	`{`
`445`	`445`	`X509 *certificate = SSL_get_peer_certificate(_SSL);`
`446`	`446`