Skip to content

Commit

Permalink
Fixed issues with SSLCertificate class coming up when testing.
Browse files Browse the repository at this point in the history
  • Loading branch information
tladesignz committed Feb 22, 2022
1 parent fc61271 commit 21737b1
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions Endless/SSLCertificate.m
Expand Up @@ -108,9 +108,19 @@ Subject Unique Identifier (optional)
return nil;

NSArray *cData = [self safeFetchFromArray:cert atIndex:0 withType:[NSArray class]];
if (cData == nil)
return nil;

if (cData == nil) {
NSDictionary *cDic = [self safeFetchFromArray:cert atIndex:0 withType:[NSDictionary class]];
if (cDic == nil) {
return nil;
}

cData = [self safeFetchFromArray:cDic[cDic.allKeys.firstObject] atIndex:0 withType:[NSArray class]];

if (cData == nil) {
return nil;
}
}

/* X.509 version (0-based - https://tools.ietf.org/html/rfc2459#section-4.1) */
NSNumber *tver = [self safeFetchFromArray:cData atIndex:0 withType:[NSNumber class]];
if (tver == nil)
Expand Down Expand Up @@ -256,7 +266,7 @@ Subject Unique Identifier (optional)

- (BOOL)isExpired
{
return ([self validityNotAfter] > [NSDate date]);
return (NSDate.date > self.validityNotAfter);
}

- (BOOL)hasWeakSignatureAlgorithm
Expand Down

0 comments on commit 21737b1

Please sign in to comment.