Fix negint decoding.

valpackett/SwiftCBOR#37
eu-digital-green-certificates · Apr 21, 2021 · 510574b · 510574b
1 parent 0e6e71f
commit 510574b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/PatientScannerDemo/Extensions/SwiftCBOR.CBOR.swift b/PatientScannerDemo/Extensions/SwiftCBOR.CBOR.swift
@@ -25,7 +25,7 @@ extension SwiftCBOR.CBOR {
     case let .unsignedInt(val):
       return "\(val)"
     case let .negativeInt(val):
-      return "-\(val)"
+      return "-\(val + 1)"
     case let .utf8String(val):
       return "\"\(val)\""
     case let .array(vals):

diff --git a/PatientScannerDemo/Models/HCert.swift b/PatientScannerDemo/Models/HCert.swift
@@ -20,8 +20,9 @@ struct HCert {
     let bodyStr = CBOR.payload(from: cborData)?.toString() ?? "{}"
     header = JSON(parseJSON: headerStr)
     var body = JSON(parseJSON: bodyStr)
-    if body["-259"].exists() {
-      body = body["-259"]
+    print(body)
+    if body["-260"].exists() {
+      body = body["-260"]
     }
     if body["1"].exists() {
       body = body["1"]