@@ -47,11 +47,11 @@
 #import <ObjFW/OFString.h>
 
 #import <ObjFW/macros.h>
 
 @implementation X509Certificate
-- initWithFile: (OFString*)path
+- initWithFile: (OFString *)path
 {
 	self = [self init];
 
 	@try {
 		OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
@@ -71,11 +71,11 @@
 	}
 
 	return self;
 }
 
-- initWithX509Struct: (X509*)certificate
+- initWithX509Struct: (X509 *)certificate
 {
 	self = [self init];
 
 	@try {
 		_certificate = X509_dup(certificate);
@@ -100,11 +100,11 @@
 		X509_free(_certificate);
 
 	[super dealloc];
 }
 
-- (OFString*)description
+- (OFString *)description
 {
 	OFMutableString *ret = [OFMutableString string];
 
 	[ret appendFormat: @"Issuer: %@\n\n", [self issuer]];
 	[ret appendFormat: @"Subject: %@\n\n", [self subject]];
@@ -112,11 +112,11 @@
 
 	[ret makeImmutable];
 	return ret;
 }
 
-- (OFDictionary*)issuer
+- (OFDictionary *)issuer
 {
 	X509_NAME *name;
 
 	if (_issuer != nil)
 		return [[_issuer copy] autorelease];
@@ -125,11 +125,11 @@
 	_issuer = [[self X509_dictionaryFromX509Name: name] retain];
 
 	return _issuer;
 }
 
-- (OFDictionary*)subject
+- (OFDictionary *)subject
 {
 	X509_NAME *name;
 
 	if (_subject != nil)
 		return [[_subject copy] autorelease];
@@ -138,11 +138,11 @@
 	_subject = [[self X509_dictionaryFromX509Name: name] retain];
 
 	return _subject;
 }
 
-- (OFDictionary*)subjectAlternativeName
+- (OFDictionary *)subjectAlternativeName
 {
 	OFAutoreleasePool *pool;
 	OFMutableDictionary *ret;
 	int i;
 
@@ -261,11 +261,11 @@
 	_subjectAlternativeName = [ret retain];
 
 	return ret;
 }
 
-- (bool)hasCommonNameMatchingDomain: (OFString*)domain
+- (bool)hasCommonNameMatchingDomain: (OFString *)domain
 {
 	OFString *name;
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFList *CNs = [[self subject] objectForKey: OID_commonName];
 	OFEnumerator *enumerator = [CNs objectEnumerator];
@@ -280,11 +280,11 @@
 
 	[pool release];
 	return false;
 }
 
-- (bool)hasDNSNameMatchingDomain: (OFString*)domain
+- (bool)hasDNSNameMatchingDomain: (OFString *)domain
 {
 	OFString *name;
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFDictionary *SANs = [self subjectAlternativeName];
 	OFList *assertedNames = [SANs objectForKey: @"dNSName"];
@@ -300,12 +300,12 @@
 
 	[pool release];
 	return false;
 }
 
-- (bool)hasSRVNameMatchingDomain: (OFString*)domain
-			 service: (OFString*)service
+- (bool)hasSRVNameMatchingDomain: (OFString *)domain
+			 service: (OFString *)service
 {
 	size_t serviceLength;
 	OFString *name;
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFDictionary *SANs = [self subjectAlternativeName];
@@ -334,12 +334,12 @@
 
 	[pool release];
 	return false;
 }
 
-- (bool)X509_isAssertedDomain: (OFString*)asserted
-		  equalDomain: (OFString*)domain
+- (bool)X509_isAssertedDomain: (OFString *)asserted
+		  equalDomain: (OFString *)domain
 {
 	/*
 	 * In accordance with RFC 6125 this only allows a wildcard as the
 	 * left-most label and matches only the left-most label with it.
 	 * E.g. *.example.com matches foo.example.com,
@@ -368,11 +368,11 @@
 		return true;
 
 	return false;
 }
 
-- (OFDictionary*)X509_dictionaryFromX509Name: (X509_NAME*)name
+- (OFDictionary *)X509_dictionaryFromX509Name: (X509_NAME *)name
 {
 	OFMutableDictionary *dict = [OFMutableDictionary dictionary];
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	int i, count = X509_NAME_entry_count(name);
 
@@ -399,11 +399,11 @@
 	[dict makeImmutable];
 	return dict;
 }
 
 
-- (X509OID*)X509_stringFromASN1Object: (ASN1_OBJECT*)object
+- (X509OID *)X509_stringFromASN1Object: (ASN1_OBJECT *)object
 {
 	X509OID *ret;
 	int length, bufferLength = 256;
 	char *buffer = [self allocMemoryWithSize: bufferLength];
 
@@ -422,16 +422,16 @@
 	}
 
 	return ret;
 }
 
-- (OFString*)X509_stringFromASN1String: (ASN1_STRING*)str
+- (OFString *)X509_stringFromASN1String: (ASN1_STRING *)str
 {
 	OFString *ret;
 	char *buffer;
 
-	if (ASN1_STRING_to_UTF8((unsigned char**)&buffer, str) < 0)
+	if (ASN1_STRING_to_UTF8((unsigned char **)&buffer, str) < 0)
 		@throw [OFInvalidEncodingException exception];
 
 	@try {
 		ret = [OFString stringWithUTF8String: buffer];
 	} @finally {
@@ -441,11 +441,11 @@
 	return ret;
 }
 @end
 
 @implementation X509OID
-- initWithUTF8String: (const char*)string
+- initWithUTF8String: (const char *)string
 {
 	self = [self init];
 
 	@try {
 		_string = [[OFString alloc] initWithUTF8String: string];
@@ -461,11 +461,11 @@
 {
 	[_string release];
 	[super dealloc];
 }
 
-- (OFString*)description
+- (OFString *)description
 {
 	char tmp[1024];
 	OBJ_obj2txt(tmp, sizeof(tmp), OBJ_txt2obj([_string UTF8String], 1), 0);
 	return [OFString stringWithUTF8String: tmp];
 }