keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixup certificate parsing tests

Browse Source 
Skip failure when running tests when we're explicitly testing failure cases.

Be more specific about failure conditions via NSError param
pull/1/head
Michael Kirk 7 years ago
parent 197f06af77
commit d492816664
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
SignalServiceKit/src/Contacts/CDSSigningCertificate.m
Unescape Escape View File

@ -88,7 +88,7 @@ NSError *CDSSigningCertificateErrorMake(CDSSigningCertificateErrorCode code, NSS
return nil; return nil;
} }
if (![self verifyDistinguishedNameOfCertificate:leafCertificateData]) { if (![self verifyDistinguishedNameOfCertificate:leafCertificateData]) {
OWSFailDebug(@"Leaf certificate has invalid name."); OWSFailDebugUnlessRunningTests(@"Leaf certificate has invalid name.");
*error = CDSSigningCertificateErrorMake( *error = CDSSigningCertificateErrorMake(
CDSSigningCertificateError_InvalidDistinguishedName, @"Could not extract leaf certificate data."); CDSSigningCertificateError_InvalidDistinguishedName, @"Could not extract leaf certificate data.");
return nil; return nil;
@ -231,7 +231,7 @@ NSError *CDSSigningCertificateErrorMake(CDSSigningCertificateErrorCode code, NSS
// necessary. // necessary.
NSData *_Nullable derData = [NSData dataFromBase64String:derString]; NSData *_Nullable derData = [NSData dataFromBase64String:derString];
if (derData.length < 1) { if (derData.length < 1) {
OWSFailDebug(@"could not parse PEM match."); OWSFailDebugUnlessRunningTests(@"could not parse PEM match.");
return; return;
} }
[certificateDatas addObject:derData]; [certificateDatas addObject:derData];
@ -292,7 +292,7 @@ NSError *CDSSigningCertificateErrorMake(CDSSigningCertificateErrorCode code, NSS
BOOL isValid = status == errSecSuccess; BOOL isValid = status == errSecSuccess;
if (!isValid) { if (!isValid) {
OWSFailDebug(@"signatures do not match."); OWSFailDebugUnlessRunningTests(@"signatures do not match.");
return NO; return NO;
} }
return YES; return YES;
@ -325,7 +325,7 @@ NSError *CDSSigningCertificateErrorMake(CDSSigningCertificateErrorCode code, NSS
}; };
if (![properties isEqualToDictionary:expectedProperties]) { if (![properties isEqualToDictionary:expectedProperties]) {
OWSFailDebug(@"Unexpected certificate properties. %@ != %@", expectedProperties, properties); OWSFailDebugUnlessRunningTests(@"Unexpected certificate properties. %@ != %@", expectedProperties, properties);
return NO; return NO;
} }
return YES; return YES;

Write Preview
Loading…
Cancel
Save