Merge pull request #128 from pauphi/fix/ca-keyid

Fix for CA when keyId is not nil
AndyQ · Jun 12, 2022 · d369c9d · d369c9d
2 parents 72a41af + 2c958cb
commit d369c9d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Sources/NFCPassportReader/DataGroups/SecurityInfo.swift b/Sources/NFCPassportReader/DataGroups/SecurityInfo.swift
@@ -102,15 +102,15 @@ public class SecurityInfo {
                 if optionalData == nil {
                     return ChipAuthenticationPublicKeyInfo(oid:oid, pubKey:subjectPublicKeyInfo);
                 } else {
-                    let keyId = Int(optionalData!.value)
+                    let keyId = Int(optionalData!.value, radix: 16)
                     return ChipAuthenticationPublicKeyInfo(oid:oid, pubKey:subjectPublicKeyInfo, keyId: keyId);
                 }
 
             }
         } else if ChipAuthenticationInfo.checkRequiredIdentifier(oid) {
             let version = Int(requiredData.value) ?? -1
             if let optionalData = optionalData {
-                let keyId = Int(optionalData.value)
+                let keyId = Int(optionalData.value, radix: 16)
                 return ChipAuthenticationInfo(oid: oid, version: version, keyId: keyId);
             } else {
                 return ChipAuthenticationInfo(oid: oid, version: version);