add underlying error reason code

Leo Vandriel · Leo Vandriel · commit d92a31d302ce · 2015-01-15T11:38:52.000-08:00
diff --git a/CHANGLOG.md b/CHANGLOG.md
@@ -3,6 +3,8 @@ Change Log
 
 ### master (unreleased)
 
+* Add underlying error reason code
+
 ### 0.6.1 (2015-01-14)
 
 * Add SSL handshake error codes
diff --git a/Classes/NWPushFeedback.m b/Classes/NWPushFeedback.m
@@ -73,7 +73,7 @@ - (BOOL)readTokenData:(NSData **)token date:(NSDate **)date error:(NSError *__au
         return read;
     }
     if (length != data.length) {
-        return [NWErrorUtil noWithErrorCode:kNWErrorFeedbackLength error:error];
+        return [NWErrorUtil noWithErrorCode:kNWErrorFeedbackLength reason:length error:error];
     }
     uint32_t time = 0;
     [data getBytes:&time range:NSMakeRange(0, 4)];
@@ -82,7 +82,7 @@ - (BOOL)readTokenData:(NSData **)token date:(NSDate **)date error:(NSError *__au
     [data getBytes:&l range:NSMakeRange(4, 2)];
     NSUInteger tokenLength = htons(l);
     if (tokenLength != NWTokenMaxSize) {
-        return [NWErrorUtil noWithErrorCode:kNWErrorFeedbackTokenLength error:error];
+        return [NWErrorUtil noWithErrorCode:kNWErrorFeedbackTokenLength reason:tokenLength error:error];
     }
     *token = [data subdataWithRange:NSMakeRange(6, length - 6)];
     return YES;
diff --git a/Classes/NWPusher.m b/Classes/NWPusher.m
@@ -82,7 +82,7 @@ - (BOOL)pushNotification:(NWNotification *)notification type:(NWNotificationType
         return written;
     }
     if (length != data.length) {
-        return [NWErrorUtil noWithErrorCode:kNWErrorPushWriteFail error:error];
+        return [NWErrorUtil noWithErrorCode:kNWErrorPushWriteFail reason:length error:error];
     }
     return YES;
 }
@@ -101,7 +101,7 @@ - (BOOL)readFailedIdentifier:(NSUInteger *)identifier apnError:(NSError *__autor
     uint8_t command = 0;
     [data getBytes:&command range:NSMakeRange(0, 1)];
     if (command != 8) {
-        return [NWErrorUtil noWithErrorCode:kNWErrorPushResponseCommand error:error];
+        return [NWErrorUtil noWithErrorCode:kNWErrorPushResponseCommand reason:command error:error];
     }
     uint8_t status = 0;
     [data getBytes:&status range:NSMakeRange(1, 1)];
@@ -118,7 +118,7 @@ - (BOOL)readFailedIdentifier:(NSUInteger *)identifier apnError:(NSError *__autor
         case 7: [NWErrorUtil noWithErrorCode:kNWErrorAPNInvalidPayloadSize error:apnError]; break;
         case 8: [NWErrorUtil noWithErrorCode:kNWErrorAPNInvalidTokenContent error:apnError]; break;
         case 10: [NWErrorUtil noWithErrorCode:kNWErrorAPNShutdown error:apnError]; break;
-        default: [NWErrorUtil noWithErrorCode:kNWErrorAPNUnknownErrorCode error:apnError]; break;
+        default: [NWErrorUtil noWithErrorCode:kNWErrorAPNUnknownErrorCode reason:status error:apnError]; break;
     }
     return YES;
 }
diff --git a/Classes/NWSSLConnection.m b/Classes/NWSSLConnection.m
@@ -68,7 +68,7 @@ - (BOOL)connectSocketWithError:(NSError *__autoreleasing *)error
 {
     int sock = socket(AF_INET, SOCK_STREAM, 0);
     if (sock < 0) {
-        return [NWErrorUtil noWithErrorCode:kNWErrorSocketCreate error:error];
+        return [NWErrorUtil noWithErrorCode:kNWErrorSocketCreate reason:sock error:error];
     }
     struct sockaddr_in addr;
     memset(&addr, 0, sizeof(struct sockaddr_in));
@@ -83,15 +83,15 @@ - (BOOL)connectSocketWithError:(NSError *__autoreleasing *)error
     addr.sin_family = AF_INET;
     int conn = connect(sock, (struct sockaddr *)&addr, sizeof(struct sockaddr_in));
     if (conn < 0) {
-        return [NWErrorUtil noWithErrorCode:kNWErrorSocketConnect error:error];
+        return [NWErrorUtil noWithErrorCode:kNWErrorSocketConnect reason:conn error:error];
     }
     int cntl = fcntl(sock, F_SETFL, O_NONBLOCK);
     if (cntl < 0) {
-        return [NWErrorUtil noWithErrorCode:kNWErrorSocketFileControl error:error];
+        return [NWErrorUtil noWithErrorCode:kNWErrorSocketFileControl reason:cntl error:error];
     }
     int set = 1, sopt = setsockopt(sock, SOL_SOCKET, SO_NOSIGPIPE, (void *)&set, sizeof(int));
     if (sopt < 0) {
-        return [NWErrorUtil noWithErrorCode:kNWErrorSocketOptions error:error];
+        return [NWErrorUtil noWithErrorCode:kNWErrorSocketOptions reason:sopt error:error];
     }
     _socket = sock;
     return YES;
@@ -105,19 +105,19 @@ - (BOOL)connectSSLWithError:(NSError *__autoreleasing *)error
     }
     OSStatus setio = SSLSetIOFuncs(context, NWSSLRead, NWSSLWrite);
     if (setio != errSecSuccess) {
-        return [NWErrorUtil noWithErrorCode:kNWErrorSSLIOFuncs error:error];
+        return [NWErrorUtil noWithErrorCode:kNWErrorSSLIOFuncs reason:setio error:error];
     }
     OSStatus setconn = SSLSetConnection(context, (SSLConnectionRef)(NSInteger)_socket);
     if (setconn != errSecSuccess) {
-        return [NWErrorUtil noWithErrorCode:kNWErrorSSLConnection error:error];
+        return [NWErrorUtil noWithErrorCode:kNWErrorSSLConnection reason:setconn error:error];
     }
     OSStatus setpeer = SSLSetPeerDomainName(context, _host.UTF8String, strlen(_host.UTF8String));
     if (setpeer != errSecSuccess) {
-        return [NWErrorUtil noWithErrorCode:kNWErrorSSLPeerDomainName error:error];
+        return [NWErrorUtil noWithErrorCode:kNWErrorSSLPeerDomainName reason:setpeer error:error];
     }
     OSStatus setcert = SSLSetCertificate(context, (__bridge CFArrayRef)@[_identity]);
     if (setcert != errSecSuccess) {
-        return [NWErrorUtil noWithErrorCode:kNWErrorSSLCertificate error:error];
+        return [NWErrorUtil noWithErrorCode:kNWErrorSSLCertificate reason:setcert error:error];
     }
     _context = context;
     return YES;
@@ -141,7 +141,7 @@ - (BOOL)handshakeSSLWithError:(NSError *__autoreleasing *)error
         case errSSLClientCertRequested: return [NWErrorUtil noWithErrorCode:kNWErrorSSLHandshakeClientCertRequested error:error];
         case errSSLServerAuthCompleted: return [NWErrorUtil noWithErrorCode:kNWErrorSSLHandshakeServerAuthCompleted error:error];
     }
-    return [NWErrorUtil noWithErrorCode:kNWErrorSSLHandshakeFail error:error];
+    return [NWErrorUtil noWithErrorCode:kNWErrorSSLHandshakeFail reason:status error:error];
 }
 
 - (void)disconnect
@@ -166,7 +166,7 @@ - (BOOL)read:(NSMutableData *)data length:(NSUInteger *)length error:(NSError *_
         case errSSLClosedAbort: return [NWErrorUtil noWithErrorCode:kNWErrorReadClosedAbort error:error];
         case errSSLClosedGraceful: return [NWErrorUtil noWithErrorCode:kNWErrorReadClosedGraceful error:error];
     }
-    return [NWErrorUtil noWithErrorCode:kNWErrorReadFail error:error];
+    return [NWErrorUtil noWithErrorCode:kNWErrorReadFail reason:status error:error];
 }
 
 - (BOOL)write:(NSData *)data length:(NSUInteger *)length error:(NSError *__autoreleasing *)error
@@ -182,7 +182,7 @@ - (BOOL)write:(NSData *)data length:(NSUInteger *)length error:(NSError *__autor
         case errSSLClosedAbort: return [NWErrorUtil noWithErrorCode:kNWErrorWriteClosedAbort error:error];
         case errSSLClosedGraceful: return [NWErrorUtil noWithErrorCode:kNWErrorWriteClosedGraceful error:error];
     }
-    return [NWErrorUtil noWithErrorCode:kNWErrorWriteFail error:error];
+    return [NWErrorUtil noWithErrorCode:kNWErrorWriteFail reason:status error:error];
 }
 
 @end
diff --git a/Classes/NWSecTools.m b/Classes/NWSecTools.m
@@ -38,7 +38,7 @@ + (NWIdentityRef)identityWithPKCS12Data:(NSData *)pkcs12 password:(NSString *)pa
         return [NWErrorUtil nilWithErrorCode:kNWErrorPKCS12NoItems error:error];
     }
     if (identities.count > 1) {
-        return [NWErrorUtil nilWithErrorCode:kNWErrorPKCS12MultipleItems error:error];
+        return [NWErrorUtil nilWithErrorCode:kNWErrorPKCS12MultipleItems reason:identities.count error:error];
     }
     return identities.lastObject;
 }
@@ -208,7 +208,7 @@ + (NWCertificateRef)certificateWithIdentity:(NWIdentityRef)identity error:(NSErr
     OSStatus status = identity ? SecIdentityCopyCertificate((__bridge SecIdentityRef)identity, &cert) : errSecParam;
     NWCertificateRef certificate = CFBridgingRelease(cert);
     if (status != errSecSuccess || !cert) {
-        return [NWErrorUtil nilWithErrorCode:kNWErrorIdentityCopyCertificate error:error];
+        return [NWErrorUtil nilWithErrorCode:kNWErrorIdentityCopyCertificate reason:status error:error];
     }
     return certificate;
 }
@@ -219,7 +219,7 @@ + (NWKeyRef)keyWithIdentity:(NWIdentityRef)identity error:(NSError *__autoreleas
     OSStatus status = identity ? SecIdentityCopyPrivateKey((__bridge SecIdentityRef)identity, &k) : errSecParam;
     NWKeyRef key = CFBridgingRelease(k);
     if (status != errSecSuccess || !k) {
-        return [NWErrorUtil nilWithErrorCode:kNWErrorIdentityCopyPrivateKey error:error];
+        return [NWErrorUtil nilWithErrorCode:kNWErrorIdentityCopyPrivateKey reason:status error:error];
     }
     return key;
 }
@@ -238,7 +238,7 @@ + (NSArray *)allIdentitiesWithPKCS12Data:(NSData *)data password:(NSString *)pas
             case errSecPkcs12VerifyFailure: return [NWErrorUtil nilWithErrorCode:kNWErrorPKCS12Password error:error];
 #endif
         }
-        return [NWErrorUtil nilWithErrorCode:kNWErrorPKCS12Import error:error];
+        return [NWErrorUtil nilWithErrorCode:kNWErrorPKCS12Import reason:status error:error];
     }
     return dicts;
 }
@@ -251,7 +251,7 @@ + (NSArray *)allKeychainCertificatesWithError:(NSError *__autoreleasing *)error
     OSStatus status = SecItemCopyMatching((__bridge CFDictionaryRef)options, (CFTypeRef *)&certs);
     NSArray *certificates = CFBridgingRelease(certs);
     if (status != errSecSuccess || !certs) {
-        return [NWErrorUtil nilWithErrorCode:kNWErrorKeychainCopyMatching error:error];
+        return [NWErrorUtil nilWithErrorCode:kNWErrorKeychainCopyMatching reason:status error:error];
     }
     return certificates;
 }
@@ -266,7 +266,7 @@ + (NWIdentityRef)keychainIdentityWithCertificate:(NWCertificateRef)certificate e
         switch (status) {
             case errSecItemNotFound: return [NWErrorUtil nilWithErrorCode:kNWErrorKeychainItemNotFound error:error];
         }
-        return [NWErrorUtil nilWithErrorCode:kNWErrorKeychainCreateIdentity error:error];
+        return [NWErrorUtil nilWithErrorCode:kNWErrorKeychainCreateIdentity reason:status error:error];
     }
     return identity;
 }
diff --git a/Classes/NWType.h b/Classes/NWType.h
@@ -164,8 +164,10 @@ typedef NS_ENUM(NSInteger, NWError) {
 
 /** Assigns the error with provided code and associated description, for returning `NO`. */
 + (BOOL)noWithErrorCode:(NWError)code error:(NSError **)error;
++ (BOOL)noWithErrorCode:(NWError)code reason:(NSInteger)reason error:(NSError **)error;
 
 /** Assigns the error with provided code and associated description, for returning `nil`. */
 + (id)nilWithErrorCode:(NWError)code error:(NSError **)error;
++ (id)nilWithErrorCode:(NWError)code reason:(NSInteger)reason error:(NSError **)error;
 
 @end
diff --git a/Classes/NWType.m b/Classes/NWType.m
@@ -85,23 +85,35 @@ + (NSString *)stringWithCode:(NWError)code
 
 #pragma mark - Helpers
 
-+ (NSError *)errorWithErrorCode:(NWError)code
++ (NSError *)errorWithErrorCode:(NWError)code reason:(NSInteger)reason
 {
-    NSDictionary *info = @{ NSLocalizedDescriptionKey: [self stringWithCode:code] };
+    NSString *description = [self stringWithCode:code];
+    if (reason) description = [NSString stringWithFormat:@"%@ (%li)", description, reason];
+    NSDictionary *info = @{ NSLocalizedDescriptionKey:description };
     return [NSError errorWithDomain:@"NWPusherErrorDomain" code:code userInfo:info];
 }
 
 + (BOOL)noWithErrorCode:(NWError)code error:(NSError *__autoreleasing *)error
+{
+    return [self noWithErrorCode:code reason:0 error:error];
+}
+
++ (BOOL)noWithErrorCode:(NWError)code reason:(NSInteger)reason error:(NSError *__autoreleasing *)error
 {
     NSAssert(code != kNWErrorNone, @"code != kNWErrorNone");
-    if (error) *error = [self errorWithErrorCode:code];
+    if (error) *error = [self errorWithErrorCode:code reason:reason];
     return NO;
 }
 
 + (id)nilWithErrorCode:(NWError)code error:(NSError *__autoreleasing *)error
+{
+    return [self nilWithErrorCode:code reason:0 error:error];
+}
+
++ (id)nilWithErrorCode:(NWError)code reason:(NSInteger)reason error:(NSError *__autoreleasing *)error
 {
     NSAssert(code != kNWErrorNone, @"code != kNWErrorNone");
-    if (error) *error = [self errorWithErrorCode:code];
+    if (error) *error = [self errorWithErrorCode:code reason:reason];
     return nil;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ - (BOOL)readTokenData:(NSData )token date:(NSDate )date error:(NSError *__au`
`73`	`73`	`return read;`
`74`	`74`	`}`
`75`	`75`	`if (length != data.length) {`
`76`		`- return [NWErrorUtil noWithErrorCode:kNWErrorFeedbackLength error:error];`
	`76`	`+ return [NWErrorUtil noWithErrorCode:kNWErrorFeedbackLength reason:length error:error];`
`77`	`77`	`}`
`78`	`78`	`uint32_t time = 0;`
`79`	`79`	`[data getBytes:&time range:NSMakeRange(0, 4)];`
`@@ -82,7 +82,7 @@ - (BOOL)readTokenData:(NSData )token date:(NSDate )date error:(NSError *__au`
`82`	`82`	`[data getBytes:&l range:NSMakeRange(4, 2)];`
`83`	`83`	`NSUInteger tokenLength = htons(l);`
`84`	`84`	`if (tokenLength != NWTokenMaxSize) {`
`85`		`- return [NWErrorUtil noWithErrorCode:kNWErrorFeedbackTokenLength error:error];`
	`85`	`+ return [NWErrorUtil noWithErrorCode:kNWErrorFeedbackTokenLength reason:tokenLength error:error];`
`86`	`86`	`}`
`87`	`87`	`*token = [data subdataWithRange:NSMakeRange(6, length - 6)];`
`88`	`88`	`return YES;`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ - (BOOL)pushNotification:(NWNotification *)notification type:(NWNotificationType`
`82`	`82`	`return written;`
`83`	`83`	`}`
`84`	`84`	`if (length != data.length) {`
`85`		`- return [NWErrorUtil noWithErrorCode:kNWErrorPushWriteFail error:error];`
	`85`	`+ return [NWErrorUtil noWithErrorCode:kNWErrorPushWriteFail reason:length error:error];`
`86`	`86`	`}`
`87`	`87`	`return YES;`
`88`	`88`	`}`
`@@ -101,7 +101,7 @@ - (BOOL)readFailedIdentifier:(NSUInteger )identifier apnError:(NSError __autor`
`101`	`101`	`uint8_t command = 0;`
`102`	`102`	`[data getBytes:&command range:NSMakeRange(0, 1)];`
`103`	`103`	`if (command != 8) {`
`104`		`- return [NWErrorUtil noWithErrorCode:kNWErrorPushResponseCommand error:error];`
	`104`	`+ return [NWErrorUtil noWithErrorCode:kNWErrorPushResponseCommand reason:command error:error];`
`105`	`105`	`}`
`106`	`106`	`uint8_t status = 0;`
`107`	`107`	`[data getBytes:&status range:NSMakeRange(1, 1)];`
`@@ -118,7 +118,7 @@ - (BOOL)readFailedIdentifier:(NSUInteger )identifier apnError:(NSError __autor`
`118`	`118`	`case 7: [NWErrorUtil noWithErrorCode:kNWErrorAPNInvalidPayloadSize error:apnError]; break;`
`119`	`119`	`case 8: [NWErrorUtil noWithErrorCode:kNWErrorAPNInvalidTokenContent error:apnError]; break;`
`120`	`120`	`case 10: [NWErrorUtil noWithErrorCode:kNWErrorAPNShutdown error:apnError]; break;`
`121`		`- default: [NWErrorUtil noWithErrorCode:kNWErrorAPNUnknownErrorCode error:apnError]; break;`
	`121`	`+ default: [NWErrorUtil noWithErrorCode:kNWErrorAPNUnknownErrorCode reason:status error:apnError]; break;`
`122`	`122`	`}`
`123`	`123`	`return YES;`
`124`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ - (BOOL)connectSocketWithError:(NSError __autoreleasing )error`
`68`	`68`	`{`
`69`	`69`	`int sock = socket(AF_INET, SOCK_STREAM, 0);`
`70`	`70`	`if (sock < 0) {`
`71`		`- return [NWErrorUtil noWithErrorCode:kNWErrorSocketCreate error:error];`
	`71`	`+ return [NWErrorUtil noWithErrorCode:kNWErrorSocketCreate reason:sock error:error];`
`72`	`72`	`}`
`73`	`73`	`struct sockaddr_in addr;`
`74`	`74`	`memset(&addr, 0, sizeof(struct sockaddr_in));`
`@@ -83,15 +83,15 @@ - (BOOL)connectSocketWithError:(NSError __autoreleasing )error`
`83`	`83`	`addr.sin_family = AF_INET;`
`84`	`84`	`int conn = connect(sock, (struct sockaddr *)&addr, sizeof(struct sockaddr_in));`
`85`	`85`	`if (conn < 0) {`
`86`		`- return [NWErrorUtil noWithErrorCode:kNWErrorSocketConnect error:error];`
	`86`	`+ return [NWErrorUtil noWithErrorCode:kNWErrorSocketConnect reason:conn error:error];`
`87`	`87`	`}`
`88`	`88`	`int cntl = fcntl(sock, F_SETFL, O_NONBLOCK);`
`89`	`89`	`if (cntl < 0) {`
`90`		`- return [NWErrorUtil noWithErrorCode:kNWErrorSocketFileControl error:error];`
	`90`	`+ return [NWErrorUtil noWithErrorCode:kNWErrorSocketFileControl reason:cntl error:error];`
`91`	`91`	`}`
`92`	`92`	`int set = 1, sopt = setsockopt(sock, SOL_SOCKET, SO_NOSIGPIPE, (void *)&set, sizeof(int));`
`93`	`93`	`if (sopt < 0) {`
`94`		`- return [NWErrorUtil noWithErrorCode:kNWErrorSocketOptions error:error];`
	`94`	`+ return [NWErrorUtil noWithErrorCode:kNWErrorSocketOptions reason:sopt error:error];`
`95`	`95`	`}`
`96`	`96`	`_socket = sock;`
`97`	`97`	`return YES;`
`@@ -105,19 +105,19 @@ - (BOOL)connectSSLWithError:(NSError __autoreleasing )error`
`105`	`105`	`}`
`106`	`106`	`OSStatus setio = SSLSetIOFuncs(context, NWSSLRead, NWSSLWrite);`
`107`	`107`	`if (setio != errSecSuccess) {`
`108`		`- return [NWErrorUtil noWithErrorCode:kNWErrorSSLIOFuncs error:error];`
	`108`	`+ return [NWErrorUtil noWithErrorCode:kNWErrorSSLIOFuncs reason:setio error:error];`
`109`	`109`	`}`
`110`	`110`	`OSStatus setconn = SSLSetConnection(context, (SSLConnectionRef)(NSInteger)_socket);`
`111`	`111`	`if (setconn != errSecSuccess) {`
`112`		`- return [NWErrorUtil noWithErrorCode:kNWErrorSSLConnection error:error];`
	`112`	`+ return [NWErrorUtil noWithErrorCode:kNWErrorSSLConnection reason:setconn error:error];`
`113`	`113`	`}`
`114`	`114`	`OSStatus setpeer = SSLSetPeerDomainName(context, _host.UTF8String, strlen(_host.UTF8String));`
`115`	`115`	`if (setpeer != errSecSuccess) {`
`116`		`- return [NWErrorUtil noWithErrorCode:kNWErrorSSLPeerDomainName error:error];`
	`116`	`+ return [NWErrorUtil noWithErrorCode:kNWErrorSSLPeerDomainName reason:setpeer error:error];`
`117`	`117`	`}`
`118`	`118`	`OSStatus setcert = SSLSetCertificate(context, (__bridge CFArrayRef)@[_identity]);`
`119`	`119`	`if (setcert != errSecSuccess) {`
`120`		`- return [NWErrorUtil noWithErrorCode:kNWErrorSSLCertificate error:error];`
	`120`	`+ return [NWErrorUtil noWithErrorCode:kNWErrorSSLCertificate reason:setcert error:error];`
`121`	`121`	`}`
`122`	`122`	`_context = context;`
`123`	`123`	`return YES;`
`@@ -141,7 +141,7 @@ - (BOOL)handshakeSSLWithError:(NSError __autoreleasing )error`
`141`	`141`	`case errSSLClientCertRequested: return [NWErrorUtil noWithErrorCode:kNWErrorSSLHandshakeClientCertRequested error:error];`
`142`	`142`	`case errSSLServerAuthCompleted: return [NWErrorUtil noWithErrorCode:kNWErrorSSLHandshakeServerAuthCompleted error:error];`
`143`	`143`	`}`
`144`		`- return [NWErrorUtil noWithErrorCode:kNWErrorSSLHandshakeFail error:error];`
	`144`	`+ return [NWErrorUtil noWithErrorCode:kNWErrorSSLHandshakeFail reason:status error:error];`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`- (void)disconnect`
`@@ -166,7 +166,7 @@ - (BOOL)read:(NSMutableData )data length:(NSUInteger )length error:(NSError *_`
`166`	`166`	`case errSSLClosedAbort: return [NWErrorUtil noWithErrorCode:kNWErrorReadClosedAbort error:error];`
`167`	`167`	`case errSSLClosedGraceful: return [NWErrorUtil noWithErrorCode:kNWErrorReadClosedGraceful error:error];`
`168`	`168`	`}`
`169`		`- return [NWErrorUtil noWithErrorCode:kNWErrorReadFail error:error];`
	`169`	`+ return [NWErrorUtil noWithErrorCode:kNWErrorReadFail reason:status error:error];`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`- (BOOL)write:(NSData )data length:(NSUInteger )length error:(NSError __autoreleasing )error`
`@@ -182,7 +182,7 @@ - (BOOL)write:(NSData )data length:(NSUInteger )length error:(NSError *__autor`
`182`	`182`	`case errSSLClosedAbort: return [NWErrorUtil noWithErrorCode:kNWErrorWriteClosedAbort error:error];`
`183`	`183`	`case errSSLClosedGraceful: return [NWErrorUtil noWithErrorCode:kNWErrorWriteClosedGraceful error:error];`
`184`	`184`	`}`
`185`		`- return [NWErrorUtil noWithErrorCode:kNWErrorWriteFail error:error];`
	`185`	`+ return [NWErrorUtil noWithErrorCode:kNWErrorWriteFail reason:status error:error];`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ + (NWIdentityRef)identityWithPKCS12Data:(NSData )pkcs12 password:(NSString )pa`
`38`	`38`	`return [NWErrorUtil nilWithErrorCode:kNWErrorPKCS12NoItems error:error];`
`39`	`39`	`}`
`40`	`40`	`if (identities.count > 1) {`
`41`		`- return [NWErrorUtil nilWithErrorCode:kNWErrorPKCS12MultipleItems error:error];`
	`41`	`+ return [NWErrorUtil nilWithErrorCode:kNWErrorPKCS12MultipleItems reason:identities.count error:error];`
`42`	`42`	`}`
`43`	`43`	`return identities.lastObject;`
`44`	`44`	`}`
`@@ -208,7 +208,7 @@ + (NWCertificateRef)certificateWithIdentity:(NWIdentityRef)identity error:(NSErr`
`208`	`208`	`OSStatus status = identity ? SecIdentityCopyCertificate((__bridge SecIdentityRef)identity, &cert) : errSecParam;`
`209`	`209`	`NWCertificateRef certificate = CFBridgingRelease(cert);`
`210`	`210`	`if (status != errSecSuccess \|\| !cert) {`
`211`		`- return [NWErrorUtil nilWithErrorCode:kNWErrorIdentityCopyCertificate error:error];`
	`211`	`+ return [NWErrorUtil nilWithErrorCode:kNWErrorIdentityCopyCertificate reason:status error:error];`
`212`	`212`	`}`
`213`	`213`	`return certificate;`
`214`	`214`	`}`
`@@ -219,7 +219,7 @@ + (NWKeyRef)keyWithIdentity:(NWIdentityRef)identity error:(NSError *__autoreleas`
`219`	`219`	`OSStatus status = identity ? SecIdentityCopyPrivateKey((__bridge SecIdentityRef)identity, &k) : errSecParam;`
`220`	`220`	`NWKeyRef key = CFBridgingRelease(k);`
`221`	`221`	`if (status != errSecSuccess \|\| !k) {`
`222`		`- return [NWErrorUtil nilWithErrorCode:kNWErrorIdentityCopyPrivateKey error:error];`
	`222`	`+ return [NWErrorUtil nilWithErrorCode:kNWErrorIdentityCopyPrivateKey reason:status error:error];`
`223`	`223`	`}`
`224`	`224`	`return key;`
`225`	`225`	`}`
`@@ -238,7 +238,7 @@ + (NSArray )allIdentitiesWithPKCS12Data:(NSData )data password:(NSString *)pas`
`238`	`238`	`case errSecPkcs12VerifyFailure: return [NWErrorUtil nilWithErrorCode:kNWErrorPKCS12Password error:error];`
`239`	`239`	`#endif`
`240`	`240`	`}`
`241`		`- return [NWErrorUtil nilWithErrorCode:kNWErrorPKCS12Import error:error];`
	`241`	`+ return [NWErrorUtil nilWithErrorCode:kNWErrorPKCS12Import reason:status error:error];`
`242`	`242`	`}`
`243`	`243`	`return dicts;`
`244`	`244`	`}`
`@@ -251,7 +251,7 @@ + (NSArray )allKeychainCertificatesWithError:(NSError __autoreleasing *)error`
`251`	`251`	`OSStatus status = SecItemCopyMatching((__bridge CFDictionaryRef)options, (CFTypeRef *)&certs);`
`252`	`252`	`NSArray *certificates = CFBridgingRelease(certs);`
`253`	`253`	`if (status != errSecSuccess \|\| !certs) {`
`254`		`- return [NWErrorUtil nilWithErrorCode:kNWErrorKeychainCopyMatching error:error];`
	`254`	`+ return [NWErrorUtil nilWithErrorCode:kNWErrorKeychainCopyMatching reason:status error:error];`
`255`	`255`	`}`
`256`	`256`	`return certificates;`
`257`	`257`	`}`
`@@ -266,7 +266,7 @@ + (NWIdentityRef)keychainIdentityWithCertificate:(NWCertificateRef)certificate e`
`266`	`266`	`switch (status) {`
`267`	`267`	`case errSecItemNotFound: return [NWErrorUtil nilWithErrorCode:kNWErrorKeychainItemNotFound error:error];`
`268`	`268`	`}`
`269`		`- return [NWErrorUtil nilWithErrorCode:kNWErrorKeychainCreateIdentity error:error];`
	`269`	`+ return [NWErrorUtil nilWithErrorCode:kNWErrorKeychainCreateIdentity reason:status error:error];`
`270`	`270`	`}`
`271`	`271`	`return identity;`
`272`	`272`	`}`