From 57a1a023b47eb971201ef1ad9ddcee034b91770c Mon Sep 17 00:00:00 2001
From: Yannick Spreen <yannick.spreen@gmail.com>
Date: Sat, 24 Apr 2021 23:56:54 +0200
Subject: [PATCH 01/12] Add Alamofire; Start adding Gateway Service.

---
 DGCAVerifier.xcodeproj/project.pbxproj        | 21 +++++++
 .../xcshareddata/swiftpm/Package.resolved     |  9 +++
 DGCAVerifier/Services/KID.swift               |  2 +-
 DGCAVerifier/ViewControllers/Scan.swift       |  2 +
 DGCAVerifierTests/EHNTests.swift              |  4 +-
 .../Services/GatewayConnection.swift          | 57 +++++++++++++++++++
 6 files changed, 92 insertions(+), 3 deletions(-)
 create mode 100644 PatientScannerDemo/Services/GatewayConnection.swift

diff --git a/DGCAVerifier.xcodeproj/project.pbxproj b/DGCAVerifier.xcodeproj/project.pbxproj
index d332b17..8a49018 100644
--- a/DGCAVerifier.xcodeproj/project.pbxproj
+++ b/DGCAVerifier.xcodeproj/project.pbxproj
@@ -25,6 +25,8 @@
 		CE7DE7FA2625EF18007E6694 /* SwiftCBOR in Frameworks */ = {isa = PBXBuildFile; productRef = CE7DE7F92625EF18007E6694 /* SwiftCBOR */; };
 		CE8912E526321AA500CB92AF /* KID.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8912E426321AA500CB92AF /* KID.swift */; };
 		CE8912EA26321DAA00CB92AF /* SHA256.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8912E926321DAA00CB92AF /* SHA256.swift */; };
+		CE8912F52634C60E00CB92AF /* GatewayConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8912F42634C60E00CB92AF /* GatewayConnection.swift */; };
+		CE8912FB2634C6B900CB92AF /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = CE8912FA2634C6B900CB92AF /* Alamofire */; };
 		CEA1555D262F63B30024B7AC /* EuDgcSchema.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA1555C262F63B30024B7AC /* EuDgcSchema.swift */; };
 		CEA15563262F6DAB0024B7AC /* ChildDismissedDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA15562262F6DAB0024B7AC /* ChildDismissedDelegate.swift */; };
 		CEA1556B262F784E0024B7AC /* SelfSizedTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA1556A262F784E0024B7AC /* SelfSizedTableView.swift */; };
@@ -79,6 +81,7 @@
 		CE44799626306C9B009A836B /* Data+Base45.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+Base45.swift"; sourceTree = "<group>"; };
 		CE8912E426321AA500CB92AF /* KID.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KID.swift; sourceTree = "<group>"; };
 		CE8912E926321DAA00CB92AF /* SHA256.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SHA256.swift; sourceTree = "<group>"; };
+		CE8912F42634C60E00CB92AF /* GatewayConnection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GatewayConnection.swift; sourceTree = "<group>"; };
 		CEA1555C262F63B30024B7AC /* EuDgcSchema.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EuDgcSchema.swift; sourceTree = "<group>"; };
 		CEA15562262F6DAB0024B7AC /* ChildDismissedDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChildDismissedDelegate.swift; sourceTree = "<group>"; };
 		CEA1556A262F784E0024B7AC /* SelfSizedTableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelfSizedTableView.swift; sourceTree = "<group>"; };
@@ -112,6 +115,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CE8912FB2634C6B900CB92AF /* Alamofire in Frameworks */,
 				CE157F87262E24DE00FE4821 /* SwiftyJSON in Frameworks */,
 				CE44798D26304D8F009A836B /* JSONSchema in Frameworks */,
 				CE7DE7FA2625EF18007E6694 /* SwiftCBOR in Frameworks */,
@@ -159,6 +163,7 @@
 				CE1BDF98262A4CD600766F97 /* X509.swift */,
 				CE8912E426321AA500CB92AF /* KID.swift */,
 				CE8912E926321DAA00CB92AF /* SHA256.swift */,
+				CE8912F42634C60E00CB92AF /* GatewayConnection.swift */,
 			);
 			path = Services;
 			sourceTree = "<group>";
@@ -299,6 +304,7 @@
 				CE13CEFF262DCC180070C80E /* FloatingPanel */,
 				CE157F86262E24DE00FE4821 /* SwiftyJSON */,
 				CE44798C26304D8F009A836B /* JSONSchema */,
+				CE8912FA2634C6B900CB92AF /* Alamofire */,
 			);
 			productName = DGCAVerifier;
 			productReference = CEA6D6E8261F8D2700715333 /* DGCAVerifier.app */;
@@ -376,6 +382,7 @@
 				CE13CEFE262DCC180070C80E /* XCRemoteSwiftPackageReference "FloatingPanel" */,
 				CE157F85262E24DE00FE4821 /* XCRemoteSwiftPackageReference "SwiftyJSON" */,
 				CE44798B26304D8F009A836B /* XCRemoteSwiftPackageReference "JSONSchema" */,
+				CE8912F92634C6B900CB92AF /* XCRemoteSwiftPackageReference "Alamofire" */,
 			);
 			productRefGroup = CEA6D6E9261F8D2700715333 /* Products */;
 			projectDirPath = "";
@@ -429,6 +436,7 @@
 				CE8912EA26321DAA00CB92AF /* SHA256.swift in Sources */,
 				CE3CC9442628C2130079FB78 /* CBOR.swift in Sources */,
 				CE44799226306C86009A836B /* String.swift in Sources */,
+				CE8912F52634C60E00CB92AF /* GatewayConnection.swift in Sources */,
 				CE44799726306C9B009A836B /* Data+Base45.swift in Sources */,
 				CE13CF0F262DD0D80070C80E /* FullFloatingPanelLayout.swift in Sources */,
 				CEA1556B262F784E0024B7AC /* SelfSizedTableView.swift in Sources */,
@@ -817,6 +825,14 @@
 				minimumVersion = 0.4.3;
 			};
 		};
+		CE8912F92634C6B900CB92AF /* XCRemoteSwiftPackageReference "Alamofire" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/Alamofire/Alamofire";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 5.4.3;
+			};
+		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -840,6 +856,11 @@
 			package = CE7DE7F82625EF18007E6694 /* XCRemoteSwiftPackageReference "SwiftCBOR" */;
 			productName = SwiftCBOR;
 		};
+		CE8912FA2634C6B900CB92AF /* Alamofire */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = CE8912F92634C6B900CB92AF /* XCRemoteSwiftPackageReference "Alamofire" */;
+			productName = Alamofire;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = CEA6D6E0261F8D2700715333 /* Project object */;
diff --git a/DGCAVerifier.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DGCAVerifier.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index f915462..a3ac02e 100644
--- a/DGCAVerifier.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DGCAVerifier.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,6 +1,15 @@
 {
   "object": {
     "pins": [
+      {
+        "package": "Alamofire",
+        "repositoryURL": "https://github.com/Alamofire/Alamofire",
+        "state": {
+          "branch": null,
+          "revision": "f96b619bcb2383b43d898402283924b80e2c4bae",
+          "version": "5.4.3"
+        }
+      },
       {
         "package": "FloatingPanel",
         "repositoryURL": "https://github.com/SCENEE/FloatingPanel",
diff --git a/DGCAVerifier/Services/KID.swift b/DGCAVerifier/Services/KID.swift
index 905d62d..c6da198 100644
--- a/DGCAVerifier/Services/KID.swift
+++ b/DGCAVerifier/Services/KID.swift
@@ -31,7 +31,7 @@ import Foundation
 typealias KidBytes = [UInt8]
 
 struct KID {
-  public static func stringFrom(kidBytes: KidBytes) -> String {
+  public static func string(from kidBytes: KidBytes) -> String {
     return Data(kidBytes.prefix(8)).base64EncodedString()
   }
   public static func from(_ encodedCert: String) -> KidBytes {
diff --git a/DGCAVerifier/ViewControllers/Scan.swift b/DGCAVerifier/ViewControllers/Scan.swift
index ecc7ad7..84acea2 100644
--- a/DGCAVerifier/ViewControllers/Scan.swift
+++ b/DGCAVerifier/ViewControllers/Scan.swift
@@ -220,6 +220,8 @@ extension ScanVC {
 //    print(CBOR.payload(from: data)?.toString() ?? "")
 //    print(CBOR.header(from: data)?.toString() ?? "")
     presentViewer(for: HCert(from: data))
+
+    GatewayConnection.fetchCert()
   }
 
 }
diff --git a/DGCAVerifierTests/EHNTests.swift b/DGCAVerifierTests/EHNTests.swift
index 79675ed..ef22027 100644
--- a/DGCAVerifierTests/EHNTests.swift
+++ b/DGCAVerifierTests/EHNTests.swift
@@ -103,7 +103,7 @@ class EHNTests: XCTestCase {
       XCTAssert(false)
       return
     }
-    let kid = KID.stringFrom(kidBytes: kidBytes)
+    let kid = KID.string(from: kidBytes)
     guard
       let url = URL(string: "https://dgc.a-sit.at/ehn/cert/\(kid)")
     else {
@@ -122,7 +122,7 @@ class EHNTests: XCTestCase {
         return
       }
       let encodedCert = body.base64EncodedString()
-      XCTAssert(KID.stringFrom(kidBytes: KID.from(encodedCert)) == kid)
+      XCTAssert(KID.string(from: KID.from(encodedCert)) == kid)
       if COSE.verify(data, with: encodedCert) {
         expectation.fulfill()
       } else {
diff --git a/PatientScannerDemo/Services/GatewayConnection.swift b/PatientScannerDemo/Services/GatewayConnection.swift
new file mode 100644
index 0000000..6bee524
--- /dev/null
+++ b/PatientScannerDemo/Services/GatewayConnection.swift
@@ -0,0 +1,57 @@
+//
+/*-
+ * ---license-start
+ * eu-digital-green-certificates / dgca-verifier-app-ios
+ * ---
+ * Copyright (C) 2021 T-Systems International GmbH and all other contributors
+ * ---
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ---license-end
+ */
+//  
+//  GatewayConnection.swift
+//  PatientScannerDemo
+//  
+//  Created by Yannick Spreen on 4/24/21.
+//  
+        
+
+import Foundation
+import Alamofire
+
+struct GatewayConnection {
+  static let serverURI = "https://dgca-verifier-service.cfapps.eu10.hana.ondemand.com/"
+  static let updateEndpoint = "signercertificateUpdate"
+  static let statusEndpoint = "signercertificateStatus"
+
+  public static func fetchCert(resume resumeToken: String? = nil) {
+    AF.request(serverURI + updateEndpoint).response {
+      guard
+        case let .success(result) = $0.result,
+        let response = result,
+        let responseStr = String(data: response, encoding: .utf8),
+        let pubKey = X509.pubKey(from: responseStr),
+        let headers = $0.response?.headers,
+        let responseKid = headers["x-kid"]
+      else {
+        return
+      }
+      let kid = KID.from(responseStr)
+      let kidStr = KID.string(from: kid)
+      if kidStr != responseKid {
+        return
+      }
+      print(pubKey)
+    }
+  }
+}

From 3a72cbb56b62efb277c7e30d3ad22e7d582b038d Mon Sep 17 00:00:00 2001
From: Yannick Spreen <yannick.spreen@gmail.com>
Date: Sun, 25 Apr 2021 14:00:46 +0200
Subject: [PATCH 02/12] Start local encrypted db.

---
 DGCAVerifier.xcodeproj/project.pbxproj        |   8 +
 .../Base.lproj/LaunchScreen.storyboard        |  49 ++++--
 .../Storyboards/Base.lproj/Main.storyboard    |  61 +++++++-
 DGCAVerifier/ViewControllers/Scan.swift       |   5 +-
 PatientScannerDemo/Services/Enclave.swift     | 147 ++++++++++++++++++
 .../hea_dgf_icons-2.imageset/Contents.json    |  21 +++
 .../hea_dgf_icons-2.png                       | Bin 0 -> 4155 bytes
 PatientScannerDemo/ViewControllers/Home.swift |  38 +++++
 8 files changed, 311 insertions(+), 18 deletions(-)
 create mode 100644 PatientScannerDemo/Services/Enclave.swift
 create mode 100644 PatientScannerDemo/SupportingFiles/Assets.xcassets/hea_dgf_icons-2.imageset/Contents.json
 create mode 100644 PatientScannerDemo/SupportingFiles/Assets.xcassets/hea_dgf_icons-2.imageset/hea_dgf_icons-2.png
 create mode 100644 PatientScannerDemo/ViewControllers/Home.swift

diff --git a/DGCAVerifier.xcodeproj/project.pbxproj b/DGCAVerifier.xcodeproj/project.pbxproj
index 8a49018..7adaf54 100644
--- a/DGCAVerifier.xcodeproj/project.pbxproj
+++ b/DGCAVerifier.xcodeproj/project.pbxproj
@@ -27,6 +27,8 @@
 		CE8912EA26321DAA00CB92AF /* SHA256.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8912E926321DAA00CB92AF /* SHA256.swift */; };
 		CE8912F52634C60E00CB92AF /* GatewayConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8912F42634C60E00CB92AF /* GatewayConnection.swift */; };
 		CE8912FB2634C6B900CB92AF /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = CE8912FA2634C6B900CB92AF /* Alamofire */; };
+		CE891300263570CF00CB92AF /* Enclave.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8912FF263570CF00CB92AF /* Enclave.swift */; };
+		CE891305263581D900CB92AF /* Home.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE891304263581D900CB92AF /* Home.swift */; };
 		CEA1555D262F63B30024B7AC /* EuDgcSchema.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA1555C262F63B30024B7AC /* EuDgcSchema.swift */; };
 		CEA15563262F6DAB0024B7AC /* ChildDismissedDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA15562262F6DAB0024B7AC /* ChildDismissedDelegate.swift */; };
 		CEA1556B262F784E0024B7AC /* SelfSizedTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA1556A262F784E0024B7AC /* SelfSizedTableView.swift */; };
@@ -82,6 +84,8 @@
 		CE8912E426321AA500CB92AF /* KID.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KID.swift; sourceTree = "<group>"; };
 		CE8912E926321DAA00CB92AF /* SHA256.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SHA256.swift; sourceTree = "<group>"; };
 		CE8912F42634C60E00CB92AF /* GatewayConnection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GatewayConnection.swift; sourceTree = "<group>"; };
+		CE8912FF263570CF00CB92AF /* Enclave.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Enclave.swift; sourceTree = "<group>"; };
+		CE891304263581D900CB92AF /* Home.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Home.swift; sourceTree = "<group>"; };
 		CEA1555C262F63B30024B7AC /* EuDgcSchema.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EuDgcSchema.swift; sourceTree = "<group>"; };
 		CEA15562262F6DAB0024B7AC /* ChildDismissedDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChildDismissedDelegate.swift; sourceTree = "<group>"; };
 		CEA1556A262F784E0024B7AC /* SelfSizedTableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelfSizedTableView.swift; sourceTree = "<group>"; };
@@ -164,6 +168,7 @@
 				CE8912E426321AA500CB92AF /* KID.swift */,
 				CE8912E926321DAA00CB92AF /* SHA256.swift */,
 				CE8912F42634C60E00CB92AF /* GatewayConnection.swift */,
+				CE8912FF263570CF00CB92AF /* Enclave.swift */,
 			);
 			path = Services;
 			sourceTree = "<group>";
@@ -186,6 +191,7 @@
 			children = (
 				CE13CF09262DCDDA0070C80E /* CertificateViewer.swift */,
 				CEA6D6EF261F8D2700715333 /* Scan.swift */,
+				CE891304263581D900CB92AF /* Home.swift */,
 			);
 			path = ViewControllers;
 			sourceTree = "<group>";
@@ -433,6 +439,7 @@
 				CE13CF0A262DCDDA0070C80E /* CertificateViewer.swift in Sources */,
 				CEC2C4C32625ED030056E406 /* JWK.swift in Sources */,
 				CEC2C4C42625ED030056E406 /* Base45.swift in Sources */,
+				CE891300263570CF00CB92AF /* Enclave.swift in Sources */,
 				CE8912EA26321DAA00CB92AF /* SHA256.swift in Sources */,
 				CE3CC9442628C2130079FB78 /* CBOR.swift in Sources */,
 				CE44799226306C86009A836B /* String.swift in Sources */,
@@ -449,6 +456,7 @@
 				CEFAD86D2625F164009AFEF9 /* Signature.swift in Sources */,
 				CE13CF23262DDF810070C80E /* RoundedButton.swift in Sources */,
 				CEA6D6EC261F8D2700715333 /* AppDelegate.swift in Sources */,
+				CE891305263581D900CB92AF /* Home.swift in Sources */,
 				CEA15563262F6DAB0024B7AC /* ChildDismissedDelegate.swift in Sources */,
 				CEFAD8722625F29E009AFEF9 /* String+JSON.swift in Sources */,
 				CEC2C4C22625ED030056E406 /* ZLib.swift in Sources */,
diff --git a/DGCAVerifier/Storyboards/Base.lproj/LaunchScreen.storyboard b/DGCAVerifier/Storyboards/Base.lproj/LaunchScreen.storyboard
index 0b64f64..a3d9091 100644
--- a/DGCAVerifier/Storyboards/Base.lproj/LaunchScreen.storyboard
+++ b/DGCAVerifier/Storyboards/Base.lproj/LaunchScreen.storyboard
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <device id="retina4_7" orientation="portrait" appearance="light" />
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+        <deployment identifier="iOS" />
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703" />
+        <capability name="Safe area layout guides" minToolsVersion="9.0" />
+        <capability name="System colors in document resources" minToolsVersion="11.0" />
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0" />
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -14,20 +14,39 @@
             <objects>
                 <viewController id="01J-lp-oVM" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896" />
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" />
+                        <subviews>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="hea_dgf_icons-2" translatesAutoresizingMaskIntoConstraints="NO" id="W44-ZU-RIp">
+                                <rect key="frame" x="87.5" y="141.5" width="200" height="200" />
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="200" id="nmQ-8g-dAp" />
+                                    <constraint firstAttribute="height" constant="200" id="rTl-re-1de" />
+                                </constraints>
+                            </imageView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BaC-Rv-DYO">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="133.5" />
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace" />
+                            </view>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY" />
+                        <color key="backgroundColor" red="0.99607843137254903" green="0.93333333333333335" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="displayP3" />
+                        <constraints>
+                            <constraint firstItem="W44-ZU-RIp" firstAttribute="top" secondItem="BaC-Rv-DYO" secondAttribute="bottom" constant="8" id="A1q-lp-Ynh" />
+                            <constraint firstAttribute="trailing" secondItem="BaC-Rv-DYO" secondAttribute="trailing" id="F7A-pY-8Mk" />
+                            <constraint firstItem="BaC-Rv-DYO" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="JHZ-Yo-7a3" />
+                            <constraint firstItem="BaC-Rv-DYO" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="JhQ-xG-reB" />
+                            <constraint firstItem="BaC-Rv-DYO" firstAttribute="height" secondItem="Ze5-6b-2t3" secondAttribute="height" multiplier="0.2" id="g1x-Ss-QDG" />
+                            <constraint firstItem="W44-ZU-RIp" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="qNG-sL-f4L" />
+                        </constraints>
                     </view>
                 </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder" />
             </objects>
-            <point key="canvasLocation" x="53" y="375"/>
+            <point key="canvasLocation" x="52" y="374.66266866566718" />
         </scene>
     </scenes>
     <resources>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
+        <image name="hea_dgf_icons-2" width="201" height="201" />
     </resources>
 </document>
diff --git a/DGCAVerifier/Storyboards/Base.lproj/Main.storyboard b/DGCAVerifier/Storyboards/Base.lproj/Main.storyboard
index 71e66d0..e29862b 100644
--- a/DGCAVerifier/Storyboards/Base.lproj/Main.storyboard
+++ b/DGCAVerifier/Storyboards/Base.lproj/Main.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="q2g-Cz-5x2">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -17,10 +17,69 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
                     </view>
+                    <navigationItem key="navigationItem" id="DC8-2u-JQC"/>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="138" y="106"/>
         </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="ET7-36-BP0">
+            <objects>
+                <navigationController navigationBarHidden="YES" id="q2g-Cz-5x2" sceneMemberID="viewController">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="oay-40-aHM">
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="73A-19-HUe" kind="relationship" relationship="rootViewController" id="AQh-VG-O6B"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="5eU-tP-IWk" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-1504" y="106"/>
+        </scene>
+        <!--HomeVC-->
+        <scene sceneID="5NK-Oh-cKU">
+            <objects>
+                <viewController id="73A-19-HUe" customClass="HomeVC" customModule="PatientScannerDemo" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="itp-Pk-qqa">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="hea_dgf_icons-2" translatesAutoresizingMaskIntoConstraints="NO" id="uVo-xl-74N">
+                                <rect key="frame" x="107" y="187" width="200" height="200"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="200" id="cwN-8N-mhg"/>
+                                    <constraint firstAttribute="width" constant="200" id="lGB-VI-vWc"/>
+                                </constraints>
+                            </imageView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Fa-fZ-rcH">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="179"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            </view>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="4mO-IA-e98"/>
+                        <color key="backgroundColor" red="0.99607843139999996" green="0.93333333330000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                        <constraints>
+                            <constraint firstItem="1Fa-fZ-rcH" firstAttribute="height" secondItem="itp-Pk-qqa" secondAttribute="height" multiplier="0.2" id="2OP-qL-4P5"/>
+                            <constraint firstItem="uVo-xl-74N" firstAttribute="top" secondItem="1Fa-fZ-rcH" secondAttribute="bottom" constant="8" id="44p-j5-T5I"/>
+                            <constraint firstItem="uVo-xl-74N" firstAttribute="centerX" secondItem="itp-Pk-qqa" secondAttribute="centerX" id="5VX-vB-nMv"/>
+                            <constraint firstItem="1Fa-fZ-rcH" firstAttribute="top" secondItem="itp-Pk-qqa" secondAttribute="top" id="VuD-Ro-tli"/>
+                            <constraint firstItem="1Fa-fZ-rcH" firstAttribute="leading" secondItem="itp-Pk-qqa" secondAttribute="leading" id="ek5-ka-fDv"/>
+                            <constraint firstAttribute="trailing" secondItem="1Fa-fZ-rcH" secondAttribute="trailing" id="w5N-a8-0zX"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="3ZE-my-T2k"/>
+                    <connections>
+                        <segue destination="BYZ-38-t0r" kind="show" identifier="scanner" id="6xN-iL-kja"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="XEE-QW-Mei" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-674" y="106"/>
+        </scene>
     </scenes>
+    <resources>
+        <image name="hea_dgf_icons-2" width="201" height="201"/>
+    </resources>
 </document>
diff --git a/DGCAVerifier/ViewControllers/Scan.swift b/DGCAVerifier/ViewControllers/Scan.swift
index 84acea2..f9b243a 100644
--- a/DGCAVerifier/ViewControllers/Scan.swift
+++ b/DGCAVerifier/ViewControllers/Scan.swift
@@ -47,8 +47,9 @@ class ScanVC: UIViewController {
 
   override func viewDidLoad() {
     super.viewDidLoad()
-//    checkPermissions()
-//    setupCameraLiveView()
+    checkPermissions()
+    setupCameraLiveView()
+    return;
     DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
       self.observationHandler(payloadS: nil)
 //      let reason = "Log in to your account"
diff --git a/PatientScannerDemo/Services/Enclave.swift b/PatientScannerDemo/Services/Enclave.swift
new file mode 100644
index 0000000..374206f
--- /dev/null
+++ b/PatientScannerDemo/Services/Enclave.swift
@@ -0,0 +1,147 @@
+//
+/*-
+ * ---license-start
+ * eu-digital-green-certificates / dgca-verifier-app-ios
+ * ---
+ * Copyright (C) 2021 T-Systems International GmbH and all other contributors
+ * ---
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ---license-end
+ */
+//  
+//  Enclave.swift
+//  PatientScannerDemo
+//  
+//  Created by Yannick Spreen on 4/25/21.
+//  
+
+
+import Foundation
+
+struct Enclave {
+  static let algorithm = SecKeyAlgorithm.eciesEncryptionCofactorVariableIVX963SHA256AESGCM
+  static let symmetricKey = generateOrLoadKey(with: "symmetricKey")
+
+  static func tag(for name: String) -> Data {
+    "\(Bundle.main.bundleIdentifier ?? "app").\(name)".data(using: .utf8)!
+  }
+
+  static func generateKey(with name: String? = nil) -> (SecKey?, String?) {
+    let name = name ?? UUID().uuidString
+    let tag = Enclave.tag(for: name)
+    var error: Unmanaged<CFError>?
+    guard
+      let access =
+        SecAccessControlCreateWithFlags(
+          kCFAllocatorDefault,
+          kSecAttrAccessibleWhenUnlockedThisDeviceOnly,
+          [.privateKeyUsage, .biometryCurrentSet],
+          &error
+        )
+    else {
+      return (nil, error?.takeRetainedValue().localizedDescription)
+    }
+    let attributes: [String: Any] = [
+      kSecAttrKeyType as String:          kSecAttrKeyTypeEC,
+      kSecAttrKeySizeInBits as String:    256,
+      kSecAttrTokenID as String:          kSecAttrTokenIDSecureEnclave,
+      kSecPrivateKeyAttrs as String: [
+        kSecAttrIsPermanent as String:    true,
+        kSecAttrApplicationTag as String: tag,
+        kSecAttrAccessControl as String:  access
+      ]
+    ]
+    guard
+      let privateKey = SecKeyCreateRandomKey(
+        attributes as CFDictionary,
+        &error
+      )
+    else {
+      return (nil, error?.takeRetainedValue().localizedDescription)
+    }
+    error?.release()
+    return (privateKey, nil)
+  }
+
+  static func loadKey(with name: String) -> SecKey? {
+    let tag = Enclave.tag(for: name)
+    let query: [String: Any] = [
+      kSecClass as String                 : kSecClassKey,
+      kSecAttrKeyType as String           : kSecAttrKeyTypeEC,
+      kSecAttrApplicationTag as String    : tag,
+      kSecReturnRef as String             : true
+    ]
+
+    var item: CFTypeRef?
+    let status = SecItemCopyMatching(query as CFDictionary, &item)
+    guard
+      status == errSecSuccess
+    else {
+      return nil
+    }
+    return (item as! SecKey)
+  }
+
+  static func generateOrLoadKey(with name: String) -> SecKey? {
+    if let key = loadKey(with: name) {
+      return key
+    }
+    return generateKey(with: name).0
+  }
+
+  static func encrypt(data: Data, with key: SecKey) -> (Data?, String?) {
+    guard let publicKey = SecKeyCopyPublicKey(key) else {
+      return (nil, "Cannot retrieve public key.")
+    }
+    guard SecKeyIsAlgorithmSupported(publicKey, .encrypt, algorithm) else {
+      return (nil, "Algorithm not supported.")
+    }
+    var error: Unmanaged<CFError>?
+    let cipherData = SecKeyCreateEncryptedData(
+      publicKey,
+      algorithm,
+      data as CFData,
+      &error
+    ) as Data?
+    guard cipherData != nil else {
+      return (nil, error?.takeRetainedValue().localizedDescription)
+    }
+    error?.release()
+    return (cipherData, nil)
+  }
+
+  static func decrypt(data: Data, with key: SecKey, completion: @escaping (Data?, String?) -> Void) {
+    DispatchQueue.global(qos: .userInitiated).async {
+      let (result, error) = syncDecrypt(data: data, with: key)
+      completion(result, error)
+    }
+  }
+
+  static func syncDecrypt(data: Data, with key: SecKey) -> (Data?, String?) {
+    guard SecKeyIsAlgorithmSupported(key, .decrypt, algorithm) else {
+      return (nil, "Algorithm not supported.")
+    }
+    var error: Unmanaged<CFError>?
+    let clearData = SecKeyCreateDecryptedData(
+      key,
+      algorithm,
+      data as CFData,
+      &error
+    ) as Data?
+    guard clearData != nil else {
+      return (nil, error?.takeRetainedValue().localizedDescription)
+    }
+    error?.release()
+    return (clearData, nil)
+  }
+}
diff --git a/PatientScannerDemo/SupportingFiles/Assets.xcassets/hea_dgf_icons-2.imageset/Contents.json b/PatientScannerDemo/SupportingFiles/Assets.xcassets/hea_dgf_icons-2.imageset/Contents.json
new file mode 100644
index 0000000..7d903a7
--- /dev/null
+++ b/PatientScannerDemo/SupportingFiles/Assets.xcassets/hea_dgf_icons-2.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "hea_dgf_icons-2.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/PatientScannerDemo/SupportingFiles/Assets.xcassets/hea_dgf_icons-2.imageset/hea_dgf_icons-2.png b/PatientScannerDemo/SupportingFiles/Assets.xcassets/hea_dgf_icons-2.imageset/hea_dgf_icons-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fd98158e609e8e330fa885f9fb50356a41f095c
GIT binary patch
literal 4155
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
FV1lm;su2JH

literal 0
HcmV?d00001

diff --git a/PatientScannerDemo/ViewControllers/Home.swift b/PatientScannerDemo/ViewControllers/Home.swift
new file mode 100644
index 0000000..3986a3f
--- /dev/null
+++ b/PatientScannerDemo/ViewControllers/Home.swift
@@ -0,0 +1,38 @@
+//
+/*-
+ * ---license-start
+ * eu-digital-green-certificates / dgca-verifier-app-ios
+ * ---
+ * Copyright (C) 2021 T-Systems International GmbH and all other contributors
+ * ---
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ---license-end
+ */
+//  
+//  Home.swift
+//  PatientScannerDemo
+//  
+//  Created by Yannick Spreen on 4/25/21.
+//  
+        
+
+import Foundation
+import UIKit
+
+class HomeVC: UIViewController {
+  override func viewDidLoad() {
+    super.viewDidLoad()
+
+    performSegue(withIdentifier: "scanner", sender: self)
+  }
+}

From 1fb1868cca356124da948e0755487435afc2b4f9 Mon Sep 17 00:00:00 2001
From: Yannick Spreen <yannick.spreen@gmail.com>
Date: Sun, 25 Apr 2021 14:16:56 +0200
Subject: [PATCH 03/12] Complete rebase.

---
 .../Services/Enclave.swift                          |   0
 .../Services/GatewayConnection.swift                |   0
 .../hea_dgf_icons-2.imageset/Contents.json          |   0
 .../hea_dgf_icons-2.imageset/hea_dgf_icons-2.png    | Bin
 .../ViewControllers/Home.swift                      |   0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename {PatientScannerDemo => DGCAVerifier}/Services/Enclave.swift (100%)
 rename {PatientScannerDemo => DGCAVerifier}/Services/GatewayConnection.swift (100%)
 rename {PatientScannerDemo => DGCAVerifier}/SupportingFiles/Assets.xcassets/hea_dgf_icons-2.imageset/Contents.json (100%)
 rename {PatientScannerDemo => DGCAVerifier}/SupportingFiles/Assets.xcassets/hea_dgf_icons-2.imageset/hea_dgf_icons-2.png (100%)
 rename {PatientScannerDemo => DGCAVerifier}/ViewControllers/Home.swift (100%)

diff --git a/PatientScannerDemo/Services/Enclave.swift b/DGCAVerifier/Services/Enclave.swift
similarity index 100%
rename from PatientScannerDemo/Services/Enclave.swift
rename to DGCAVerifier/Services/Enclave.swift
diff --git a/PatientScannerDemo/Services/GatewayConnection.swift b/DGCAVerifier/Services/GatewayConnection.swift
similarity index 100%
rename from PatientScannerDemo/Services/GatewayConnection.swift
rename to DGCAVerifier/Services/GatewayConnection.swift
diff --git a/PatientScannerDemo/SupportingFiles/Assets.xcassets/hea_dgf_icons-2.imageset/Contents.json b/DGCAVerifier/SupportingFiles/Assets.xcassets/hea_dgf_icons-2.imageset/Contents.json
similarity index 100%
rename from PatientScannerDemo/SupportingFiles/Assets.xcassets/hea_dgf_icons-2.imageset/Contents.json
rename to DGCAVerifier/SupportingFiles/Assets.xcassets/hea_dgf_icons-2.imageset/Contents.json
diff --git a/PatientScannerDemo/SupportingFiles/Assets.xcassets/hea_dgf_icons-2.imageset/hea_dgf_icons-2.png b/DGCAVerifier/SupportingFiles/Assets.xcassets/hea_dgf_icons-2.imageset/hea_dgf_icons-2.png
similarity index 100%
rename from PatientScannerDemo/SupportingFiles/Assets.xcassets/hea_dgf_icons-2.imageset/hea_dgf_icons-2.png
rename to DGCAVerifier/SupportingFiles/Assets.xcassets/hea_dgf_icons-2.imageset/hea_dgf_icons-2.png
diff --git a/PatientScannerDemo/ViewControllers/Home.swift b/DGCAVerifier/ViewControllers/Home.swift
similarity index 100%
rename from PatientScannerDemo/ViewControllers/Home.swift
rename to DGCAVerifier/ViewControllers/Home.swift

From c01eb8959cf22a3312362a227e8fb640b7acc720 Mon Sep 17 00:00:00 2001
From: Yannick Spreen <yannick.spreen@gmail.com>
Date: Sun, 25 Apr 2021 14:18:57 +0200
Subject: [PATCH 04/12] Give dead VC an identifier.

---
 .../Storyboards/CertificateViewer.storyboard       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/DGCAVerifier/Storyboards/CertificateViewer.storyboard b/DGCAVerifier/Storyboards/CertificateViewer.storyboard
index f258f03..3828909 100644
--- a/DGCAVerifier/Storyboards/CertificateViewer.storyboard
+++ b/DGCAVerifier/Storyboards/CertificateViewer.storyboard
@@ -28,7 +28,7 @@
                                 <rect key="frame" x="0.0" y="44" width="375" height="734"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a9u-Ia-KEX" customClass="RoundedButton" customModule="DGCAVerifier" customModuleProvider="target">
-                                        <rect key="frame" x="159.66666666666666" y="691" width="56" height="39"/>
+                                        <rect key="frame" x="147.66666666666666" y="679" width="80" height="51"/>
                                         <color key="backgroundColor" systemColor="systemBlueColor"/>
                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
                                         <state key="normal" title="Retry">
@@ -66,7 +66,7 @@
                                         <color key="selectedSegmentTintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </segmentedControl>
                                     <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" contentInsetAdjustmentBehavior="never" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="NIJ-V3-NpL">
-                                        <rect key="frame" x="0.0" y="256" width="375" height="403"/>
+                                        <rect key="frame" x="0.0" y="256" width="375" height="391"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <prototypes>
@@ -158,7 +158,7 @@
         <!--Certificate ViewerVC-->
         <scene sceneID="8v3-7S-rdw">
             <objects>
-                <viewController id="7Cd-Mh-QtV" customClass="CertificateViewerVC" customModule="DGCAVerifier" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="enabled" id="7Cd-Mh-QtV" customClass="CertificateViewerVC" customModule="DGCAVerifier" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="QEz-8z-pTe">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -174,7 +174,7 @@
                                 <rect key="frame" x="0.0" y="44" width="375" height="734"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7ne-Bz-KZx" customClass="RoundedButton" customModule="DGCAVerifier" customModuleProvider="target">
-                                        <rect key="frame" x="161" y="691" width="53" height="39"/>
+                                        <rect key="frame" x="149" y="679" width="77" height="51"/>
                                         <color key="backgroundColor" systemColor="systemBlueColor"/>
                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
                                         <state key="normal" title="Okay">
@@ -212,7 +212,7 @@
                                         <color key="selectedSegmentTintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </segmentedControl>
                                     <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" contentInsetAdjustmentBehavior="never" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="yZB-XR-qum">
-                                        <rect key="frame" x="0.0" y="256" width="375" height="403"/>
+                                        <rect key="frame" x="0.0" y="256" width="375" height="391"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <prototypes>
@@ -303,10 +303,10 @@
     </scenes>
     <designables>
         <designable name="7ne-Bz-KZx">
-            <size key="intrinsicContentSize" width="53" height="39"/>
+            <size key="intrinsicContentSize" width="77" height="51"/>
         </designable>
         <designable name="a9u-Ia-KEX">
-            <size key="intrinsicContentSize" width="56" height="39"/>
+            <size key="intrinsicContentSize" width="80" height="51"/>
         </designable>
     </designables>
     <resources>

From 5012129c9811617b25ca810275ca6a7815294a37 Mon Sep 17 00:00:00 2001
From: Yannick Spreen <yannick.spreen@gmail.com>
Date: Sun, 25 Apr 2021 22:49:23 +0200
Subject: [PATCH 05/12] Add symmetric encryption.

---
 DGCAVerifier.xcodeproj/project.pbxproj        |  8 ++
 DGCAVerifier/Models/LocalData.swift           | 47 +++++++++
 DGCAVerifier/Services/GatewayConnection.swift |  7 +-
 DGCAVerifier/Services/SecureStorage.swift     | 95 +++++++++++++++++++
 DGCAVerifier/SupportingFiles/Info.plist       |  2 +
 DGCAVerifier/ViewControllers/Home.swift       |  9 +-
 DGCAVerifier/ViewControllers/Scan.swift       |  6 +-
 7 files changed, 167 insertions(+), 7 deletions(-)
 create mode 100644 DGCAVerifier/Models/LocalData.swift
 create mode 100644 DGCAVerifier/Services/SecureStorage.swift

diff --git a/DGCAVerifier.xcodeproj/project.pbxproj b/DGCAVerifier.xcodeproj/project.pbxproj
index 7adaf54..8a2b616 100644
--- a/DGCAVerifier.xcodeproj/project.pbxproj
+++ b/DGCAVerifier.xcodeproj/project.pbxproj
@@ -17,11 +17,13 @@
 		CE157F8D262E24F900FE4821 /* HCert.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE157F8C262E24F900FE4821 /* HCert.swift */; };
 		CE157F9B262E2A9F00FE4821 /* SwiftCBOR.CBOR.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE157F9A262E2A9F00FE4821 /* SwiftCBOR.CBOR.swift */; };
 		CE1BDF99262A4CD600766F97 /* X509.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1BDF98262A4CD600766F97 /* X509.swift */; };
+		CE1D1EF6263597A2004C8919 /* LocalData.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1D1EF5263597A2004C8919 /* LocalData.swift */; };
 		CE3CC93C2628A7820079FB78 /* ASN1.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3CC93B2628A7820079FB78 /* ASN1.swift */; };
 		CE3CC9442628C2130079FB78 /* CBOR.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3CC9432628C2130079FB78 /* CBOR.swift */; };
 		CE44798D26304D8F009A836B /* JSONSchema in Frameworks */ = {isa = PBXBuildFile; productRef = CE44798C26304D8F009A836B /* JSONSchema */; };
 		CE44799226306C86009A836B /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE44799126306C86009A836B /* String.swift */; };
 		CE44799726306C9B009A836B /* Data+Base45.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE44799626306C9B009A836B /* Data+Base45.swift */; };
+		CE582DC12635AE5F008F35D7 /* SecureStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE582DC02635AE5F008F35D7 /* SecureStorage.swift */; };
 		CE7DE7FA2625EF18007E6694 /* SwiftCBOR in Frameworks */ = {isa = PBXBuildFile; productRef = CE7DE7F92625EF18007E6694 /* SwiftCBOR */; };
 		CE8912E526321AA500CB92AF /* KID.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8912E426321AA500CB92AF /* KID.swift */; };
 		CE8912EA26321DAA00CB92AF /* SHA256.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8912E926321DAA00CB92AF /* SHA256.swift */; };
@@ -77,10 +79,12 @@
 		CE157F8C262E24F900FE4821 /* HCert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HCert.swift; sourceTree = "<group>"; };
 		CE157F9A262E2A9F00FE4821 /* SwiftCBOR.CBOR.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftCBOR.CBOR.swift; sourceTree = "<group>"; };
 		CE1BDF98262A4CD600766F97 /* X509.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = X509.swift; sourceTree = "<group>"; };
+		CE1D1EF5263597A2004C8919 /* LocalData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalData.swift; sourceTree = "<group>"; };
 		CE3CC93B2628A7820079FB78 /* ASN1.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ASN1.swift; sourceTree = "<group>"; };
 		CE3CC9432628C2130079FB78 /* CBOR.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CBOR.swift; sourceTree = "<group>"; };
 		CE44799126306C86009A836B /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = "<group>"; };
 		CE44799626306C9B009A836B /* Data+Base45.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+Base45.swift"; sourceTree = "<group>"; };
+		CE582DC02635AE5F008F35D7 /* SecureStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureStorage.swift; sourceTree = "<group>"; };
 		CE8912E426321AA500CB92AF /* KID.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KID.swift; sourceTree = "<group>"; };
 		CE8912E926321DAA00CB92AF /* SHA256.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SHA256.swift; sourceTree = "<group>"; };
 		CE8912F42634C60E00CB92AF /* GatewayConnection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GatewayConnection.swift; sourceTree = "<group>"; };
@@ -169,6 +173,7 @@
 				CE8912E926321DAA00CB92AF /* SHA256.swift */,
 				CE8912F42634C60E00CB92AF /* GatewayConnection.swift */,
 				CE8912FF263570CF00CB92AF /* Enclave.swift */,
+				CE582DC02635AE5F008F35D7 /* SecureStorage.swift */,
 			);
 			path = Services;
 			sourceTree = "<group>";
@@ -223,6 +228,7 @@
 			isa = PBXGroup;
 			children = (
 				CE157F8C262E24F900FE4821 /* HCert.swift */,
+				CE1D1EF5263597A2004C8919 /* LocalData.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -444,10 +450,12 @@
 				CE3CC9442628C2130079FB78 /* CBOR.swift in Sources */,
 				CE44799226306C86009A836B /* String.swift in Sources */,
 				CE8912F52634C60E00CB92AF /* GatewayConnection.swift in Sources */,
+				CE582DC12635AE5F008F35D7 /* SecureStorage.swift in Sources */,
 				CE44799726306C9B009A836B /* Data+Base45.swift in Sources */,
 				CE13CF0F262DD0D80070C80E /* FullFloatingPanelLayout.swift in Sources */,
 				CEA1556B262F784E0024B7AC /* SelfSizedTableView.swift in Sources */,
 				CE157F81262E1F7A00FE4821 /* Date.swift in Sources */,
+				CE1D1EF6263597A2004C8919 /* LocalData.swift in Sources */,
 				CE1BDF99262A4CD600766F97 /* X509.swift in Sources */,
 				CEA1555D262F63B30024B7AC /* EuDgcSchema.swift in Sources */,
 				CEA6D6F0261F8D2700715333 /* Scan.swift in Sources */,
diff --git a/DGCAVerifier/Models/LocalData.swift b/DGCAVerifier/Models/LocalData.swift
new file mode 100644
index 0000000..8a13564
--- /dev/null
+++ b/DGCAVerifier/Models/LocalData.swift
@@ -0,0 +1,47 @@
+//
+/*-
+ * ---license-start
+ * eu-digital-green-certificates / dgca-verifier-app-ios
+ * ---
+ * Copyright (C) 2021 T-Systems International GmbH and all other contributors
+ * ---
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ---license-end
+ */
+//  
+//  LocalData.swift
+//  DGCAVerifier
+//  
+//  Created by Yannick Spreen on 4/25/21.
+//  
+        
+
+import Foundation
+
+struct LocalData: Codable {
+  static var sharedInstance = LocalData()
+
+  var encodedPublicKeys = [String: String]()
+  var resumeToken: String?
+
+  static func add(encodedPublicKey: String) {
+    let kid = KID.from(encodedPublicKey)
+    let kidStr = KID.string(from: kid)
+
+    sharedInstance.encodedPublicKeys[kidStr] = encodedPublicKey
+  }
+
+  static func set(resumeToken: String) {
+    sharedInstance.resumeToken = resumeToken
+  }
+}
diff --git a/DGCAVerifier/Services/GatewayConnection.swift b/DGCAVerifier/Services/GatewayConnection.swift
index 6bee524..7b4b079 100644
--- a/DGCAVerifier/Services/GatewayConnection.swift
+++ b/DGCAVerifier/Services/GatewayConnection.swift
@@ -40,9 +40,9 @@ struct GatewayConnection {
         case let .success(result) = $0.result,
         let response = result,
         let responseStr = String(data: response, encoding: .utf8),
-        let pubKey = X509.pubKey(from: responseStr),
         let headers = $0.response?.headers,
-        let responseKid = headers["x-kid"]
+        let responseKid = headers["x-kid"],
+        let newResumeToken = headers["x-resume-token"]
       else {
         return
       }
@@ -51,7 +51,8 @@ struct GatewayConnection {
       if kidStr != responseKid {
         return
       }
-      print(pubKey)
+      LocalData.add(encodedPublicKey: responseStr)
+      LocalData.set(resumeToken: newResumeToken)
     }
   }
 }
diff --git a/DGCAVerifier/Services/SecureStorage.swift b/DGCAVerifier/Services/SecureStorage.swift
new file mode 100644
index 0000000..cf4f6ca
--- /dev/null
+++ b/DGCAVerifier/Services/SecureStorage.swift
@@ -0,0 +1,95 @@
+//
+/*-
+ * ---license-start
+ * eu-digital-green-certificates / dgca-verifier-app-ios
+ * ---
+ * Copyright (C) 2021 T-Systems International GmbH and all other contributors
+ * ---
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ---license-end
+ */
+//  
+//  SecureStorage.swift
+//  DGCAVerifier
+//  
+//  Created by Yannick Spreen on 4/25/21.
+//  
+
+
+import Foundation
+
+struct SecureStorage {
+  static let documents: URL! = try? FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor: nil, create: true)
+  static let path: URL! = URL(string: documents.absoluteString + "secure.db")
+
+  public static func load(completion: @escaping (Bool) -> Void) {
+    if !FileManager.default.fileExists(atPath: path.path) {
+      save()
+      if FileManager.default.fileExists(atPath: path.path) {
+        load(completion: completion)
+      } else {
+        completion(false)
+      }
+      return
+    }
+
+    guard
+      let data = read(),
+      let key = Enclave.symmetricKey
+    else {
+      completion(false)
+      return
+    }
+    Enclave.decrypt(data: data, with: key) { decrypted, err in
+      guard
+        let decrypted = decrypted,
+        err == nil,
+        let data = try? JSONDecoder().decode(LocalData.self, from: decrypted)
+      else {
+        completion(false)
+        return
+      }
+      LocalData.sharedInstance = data
+      completion(true)
+    }
+  }
+
+  public static func save() {
+    guard
+      let data = try? JSONEncoder().encode(LocalData.sharedInstance),
+      let key = Enclave.symmetricKey,
+      let encrypted = Enclave.encrypt(data: data, with: key).0
+    else {
+      return
+    }
+    print("write", write(data: encrypted))
+  }
+
+  static func write(data: Data) -> Bool {
+    do {
+      try data.write(to: path)
+    } catch {
+      return false
+    }
+    return true
+  }
+
+  static func read() -> Data? {
+    do {
+      let savedData = try Data(contentsOf: path)
+      return savedData
+    } catch {
+      return nil
+    }
+  }
+}
diff --git a/DGCAVerifier/SupportingFiles/Info.plist b/DGCAVerifier/SupportingFiles/Info.plist
index e24a474..4b7a065 100644
--- a/DGCAVerifier/SupportingFiles/Info.plist
+++ b/DGCAVerifier/SupportingFiles/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSFaceIDUsageDescription</key>
+	<string>Unlock sensitive data.</string>
 	<key>UIUserInterfaceStyle</key>
 	<string>Light</string>
 	<key>NSCameraUsageDescription</key>
diff --git a/DGCAVerifier/ViewControllers/Home.swift b/DGCAVerifier/ViewControllers/Home.swift
index 3986a3f..f0ff2d4 100644
--- a/DGCAVerifier/ViewControllers/Home.swift
+++ b/DGCAVerifier/ViewControllers/Home.swift
@@ -33,6 +33,13 @@ class HomeVC: UIViewController {
   override func viewDidLoad() {
     super.viewDidLoad()
 
-    performSegue(withIdentifier: "scanner", sender: self)
+    SecureStorage.load { [weak self] success in
+      guard success else {
+        return
+      }
+      DispatchQueue.main.async {
+        self?.performSegue(withIdentifier: "scanner", sender: self)
+      }
+    }
   }
 }
diff --git a/DGCAVerifier/ViewControllers/Scan.swift b/DGCAVerifier/ViewControllers/Scan.swift
index f9b243a..7a1219b 100644
--- a/DGCAVerifier/ViewControllers/Scan.swift
+++ b/DGCAVerifier/ViewControllers/Scan.swift
@@ -47,9 +47,9 @@ class ScanVC: UIViewController {
 
   override func viewDidLoad() {
     super.viewDidLoad()
-    checkPermissions()
-    setupCameraLiveView()
-    return;
+//    checkPermissions()
+//    setupCameraLiveView()
+//    return;
     DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
       self.observationHandler(payloadS: nil)
 //      let reason = "Log in to your account"

From 535aadeb2c85f25cf77fadc2fc2bb06aa32d9ff3 Mon Sep 17 00:00:00 2001
From: Yannick Spreen <yannick.spreen@gmail.com>
Date: Mon, 26 Apr 2021 18:53:43 +0200
Subject: [PATCH 06/12] Make green more dim; Allow key generation on simulator;
 Disable biometry

---
 DGCAVerifier/Services/Enclave.swift                   | 8 +++++---
 DGCAVerifier/Storyboards/CertificateViewer.storyboard | 6 +++---
 DGCAVerifier/ViewControllers/CertificateViewer.swift  | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/DGCAVerifier/Services/Enclave.swift b/DGCAVerifier/Services/Enclave.swift
index 374206f..de74587 100644
--- a/DGCAVerifier/Services/Enclave.swift
+++ b/DGCAVerifier/Services/Enclave.swift
@@ -45,22 +45,24 @@ struct Enclave {
         SecAccessControlCreateWithFlags(
           kCFAllocatorDefault,
           kSecAttrAccessibleWhenUnlockedThisDeviceOnly,
-          [.privateKeyUsage, .biometryCurrentSet],
+          [.privateKeyUsage], // , .biometryCurrentSet],
           &error
         )
     else {
       return (nil, error?.takeRetainedValue().localizedDescription)
     }
-    let attributes: [String: Any] = [
+    var attributes: [String: Any] = [
       kSecAttrKeyType as String:          kSecAttrKeyTypeEC,
       kSecAttrKeySizeInBits as String:    256,
-      kSecAttrTokenID as String:          kSecAttrTokenIDSecureEnclave,
       kSecPrivateKeyAttrs as String: [
         kSecAttrIsPermanent as String:    true,
         kSecAttrApplicationTag as String: tag,
         kSecAttrAccessControl as String:  access
       ]
     ]
+    #if !targetEnvironment(simulator)
+    attributes[kSecAttrTokenID as String] = kSecAttrTokenIDSecureEnclave
+    #endif
     guard
       let privateKey = SecKeyCreateRandomKey(
         attributes as CFDictionary,
diff --git a/DGCAVerifier/Storyboards/CertificateViewer.storyboard b/DGCAVerifier/Storyboards/CertificateViewer.storyboard
index 3828909..b1f7378 100644
--- a/DGCAVerifier/Storyboards/CertificateViewer.storyboard
+++ b/DGCAVerifier/Storyboards/CertificateViewer.storyboard
@@ -19,7 +19,7 @@
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Sd1-4U-jsd">
                                 <rect key="frame" x="0.0" y="0.0" width="0.0" height="812"/>
-                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.050000000000000003" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.10000000000000001" colorSpace="custom" customColorSpace="displayP3"/>
                                 <constraints>
                                     <constraint firstAttribute="width" priority="150" id="od5-ib-Ukc"/>
                                 </constraints>
@@ -165,7 +165,7 @@
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mVj-cd-LLW">
                                 <rect key="frame" x="0.0" y="0.0" width="0.0" height="812"/>
-                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.050000000000000003" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.10000000000000001" colorSpace="custom" customColorSpace="displayP3"/>
                                 <constraints>
                                     <constraint firstAttribute="width" priority="150" id="X3Y-ek-Sk0"/>
                                 </constraints>
@@ -275,7 +275,7 @@
                             </view>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="2S7-FB-tUG"/>
-                        <color key="backgroundColor" red="0.0" green="0.32707966550000001" blue="0.088716190390000005" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.081256533510752751" green="0.19497380959577462" blue="0.074342156889608199" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                         <constraints>
                             <constraint firstItem="mVj-cd-LLW" firstAttribute="top" secondItem="QEz-8z-pTe" secondAttribute="top" id="1Xv-In-jyj"/>
                             <constraint firstAttribute="topMargin" secondItem="QXS-Ot-xzX" secondAttribute="top" id="227-ff-tfJ"/>
diff --git a/DGCAVerifier/ViewControllers/CertificateViewer.swift b/DGCAVerifier/ViewControllers/CertificateViewer.swift
index 466e5ee..ca01631 100644
--- a/DGCAVerifier/ViewControllers/CertificateViewer.swift
+++ b/DGCAVerifier/ViewControllers/CertificateViewer.swift
@@ -39,7 +39,7 @@ let buttonText = [
   HCertValidity.invalid: "Retry",
 ]
 let backgroundColor = [
-  HCertValidity.valid: UIColor(red: 0, green: 0.32708, blue: 0.08872, alpha: 1),
+  HCertValidity.valid: UIColor(red: 0.08126, green: 0.19497, blue: 0.07434, alpha: 1),
   HCertValidity.invalid: UIColor(red: 0.36290, green: 0, blue: 0, alpha: 1),
 ]
 let textColor = [

From 9978ff5f6d05c736cc790d4560257d4e2ddb5f6f Mon Sep 17 00:00:00 2001
From: Yannick Spreen <yannick.spreen@gmail.com>
Date: Mon, 26 Apr 2021 19:38:20 +0200
Subject: [PATCH 07/12] Add signing of encrypted local storage.

---
 DGCAVerifier/Services/Enclave.swift       | 64 ++++++++++++++++++-----
 DGCAVerifier/Services/SecureStorage.swift | 54 ++++++++++++-------
 2 files changed, 88 insertions(+), 30 deletions(-)

diff --git a/DGCAVerifier/Services/Enclave.swift b/DGCAVerifier/Services/Enclave.swift
index de74587..bb5ad34 100644
--- a/DGCAVerifier/Services/Enclave.swift
+++ b/DGCAVerifier/Services/Enclave.swift
@@ -29,7 +29,8 @@
 import Foundation
 
 struct Enclave {
-  static let algorithm = SecKeyAlgorithm.eciesEncryptionCofactorVariableIVX963SHA256AESGCM
+  static let encryptAlg = SecKeyAlgorithm.eciesEncryptionCofactorVariableIVX963SHA256AESGCM
+  static let signAlg = SecKeyAlgorithm.ecdsaSignatureMessageX962SHA512
   static let symmetricKey = generateOrLoadKey(with: "symmetricKey")
 
   static func tag(for name: String) -> Data {
@@ -105,21 +106,19 @@ struct Enclave {
     guard let publicKey = SecKeyCopyPublicKey(key) else {
       return (nil, "Cannot retrieve public key.")
     }
-    guard SecKeyIsAlgorithmSupported(publicKey, .encrypt, algorithm) else {
+    guard SecKeyIsAlgorithmSupported(publicKey, .encrypt, encryptAlg) else {
       return (nil, "Algorithm not supported.")
     }
     var error: Unmanaged<CFError>?
     let cipherData = SecKeyCreateEncryptedData(
       publicKey,
-      algorithm,
+      encryptAlg,
       data as CFData,
       &error
     ) as Data?
-    guard cipherData != nil else {
-      return (nil, error?.takeRetainedValue().localizedDescription)
-    }
+    let err = error?.takeRetainedValue().localizedDescription
     error?.release()
-    return (cipherData, nil)
+    return (cipherData, err)
   }
 
   static func decrypt(data: Data, with key: SecKey, completion: @escaping (Data?, String?) -> Void) {
@@ -130,20 +129,61 @@ struct Enclave {
   }
 
   static func syncDecrypt(data: Data, with key: SecKey) -> (Data?, String?) {
-    guard SecKeyIsAlgorithmSupported(key, .decrypt, algorithm) else {
+    guard SecKeyIsAlgorithmSupported(key, .decrypt, encryptAlg) else {
       return (nil, "Algorithm not supported.")
     }
     var error: Unmanaged<CFError>?
     let clearData = SecKeyCreateDecryptedData(
       key,
-      algorithm,
+      encryptAlg,
       data as CFData,
       &error
     ) as Data?
-    guard clearData != nil else {
-      return (nil, error?.takeRetainedValue().localizedDescription)
+    let err = error?.takeRetainedValue().localizedDescription
+    error?.release()
+    return (clearData, err)
+  }
+
+  static func verify(data: Data, signature: Data, with key: SecKey) -> (Bool, String?) {
+    guard let publicKey = SecKeyCopyPublicKey(key) else {
+      return (false, "Cannot retrieve public key.")
     }
+    guard SecKeyIsAlgorithmSupported(publicKey, .verify, signAlg) else {
+      return (false, "Algorithm not supported.")
+    }
+    var error: Unmanaged<CFError>?
+    let isValid = SecKeyVerifySignature(
+      publicKey,
+      signAlg,
+      data as CFData,
+      signature as CFData,
+      &error
+    )
+    let err = error?.takeRetainedValue().localizedDescription
+    error?.release()
+    return (isValid, err)
+  }
+
+  static func sign(data: Data, with key: SecKey, completion: @escaping (Data?, String?) -> Void) {
+    DispatchQueue.global(qos: .userInitiated).async {
+      let (result, error) = syncSign(data: data, with: key)
+      completion(result, error)
+    }
+  }
+
+  static func syncSign(data: Data, with key: SecKey) -> (Data?, String?) {
+    guard SecKeyIsAlgorithmSupported(key, .sign, signAlg) else {
+      return (nil, "Algorithm not supported.")
+    }
+    var error: Unmanaged<CFError>?
+    let signature = SecKeyCreateSignature(
+      key,
+      signAlg,
+      data as CFData,
+      &error
+    ) as Data?
+    let err = error?.takeRetainedValue().localizedDescription
     error?.release()
-    return (clearData, nil)
+    return (signature, err)
   }
 }
diff --git a/DGCAVerifier/Services/SecureStorage.swift b/DGCAVerifier/Services/SecureStorage.swift
index cf4f6ca..b0f196f 100644
--- a/DGCAVerifier/Services/SecureStorage.swift
+++ b/DGCAVerifier/Services/SecureStorage.swift
@@ -28,26 +28,32 @@
 
 import Foundation
 
+struct SecureDB: Codable {
+  let data: Data
+  let signature: Data
+}
+
 struct SecureStorage {
   static let documents: URL! = try? FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor: nil, create: true)
   static let path: URL! = URL(string: documents.absoluteString + "secure.db")
 
-  public static func load(completion: @escaping (Bool) -> Void) {
+  public static func load(completion: ((Bool) -> Void)? = nil) {
     if !FileManager.default.fileExists(atPath: path.path) {
       save()
       if FileManager.default.fileExists(atPath: path.path) {
         load(completion: completion)
       } else {
-        completion(false)
+        completion?(false)
       }
       return
     }
 
     guard
-      let data = read(),
-      let key = Enclave.symmetricKey
+      let (data, signature) = read(),
+      let key = Enclave.symmetricKey,
+      Enclave.verify(data: data, signature: signature, with: key).0
     else {
-      completion(false)
+      completion?(false)
       return
     }
     Enclave.decrypt(data: data, with: key) { decrypted, err in
@@ -56,40 +62,52 @@ struct SecureStorage {
         err == nil,
         let data = try? JSONDecoder().decode(LocalData.self, from: decrypted)
       else {
-        completion(false)
+        completion?(false)
         return
       }
       LocalData.sharedInstance = data
-      completion(true)
+      completion?(true)
     }
   }
 
-  public static func save() {
+  public static func save(completion: ((Bool) -> Void)? = nil) {
     guard
       let data = try? JSONEncoder().encode(LocalData.sharedInstance),
       let key = Enclave.symmetricKey,
       let encrypted = Enclave.encrypt(data: data, with: key).0
     else {
+      completion?(false)
       return
     }
-    print("write", write(data: encrypted))
+    Enclave.sign(data: data, with: key) { signature, err in
+      guard
+        let signature = signature,
+        err == nil
+      else {
+        completion?(false)
+        return
+      }
+      completion?(write(data: encrypted, signature: signature))
+    }
   }
 
-  static func write(data: Data) -> Bool {
-    do {
-      try data.write(to: path)
-    } catch {
+  static func write(data: Data, signature: Data) -> Bool {
+    guard
+      let rawData = try? JSONEncoder().encode(SecureDB(data: data, signature: signature)),
+      let _ = try? rawData.write(to: path)
+    else {
       return false
     }
     return true
   }
 
-  static func read() -> Data? {
-    do {
-      let savedData = try Data(contentsOf: path)
-      return savedData
-    } catch {
+  static func read() -> (Data, Data)? {
+    guard
+      let rawData = try? Data(contentsOf: path),
+      let result = try? JSONDecoder().decode(SecureDB.self, from: rawData)
+    else {
       return nil
     }
+    return (result.data, result.signature)
   }
 }

From a2deb9581bd4904c1f916693e4452d0c4b757a84 Mon Sep 17 00:00:00 2001
From: Yannick Spreen <yannick.spreen@gmail.com>
Date: Mon, 26 Apr 2021 19:56:32 +0200
Subject: [PATCH 08/12] Fix signing.

---
 DGCAVerifier/Services/Enclave.swift       |  5 -----
 DGCAVerifier/Services/SecureStorage.swift | 17 ++++++++++++++++-
 DGCAVerifier/ViewControllers/Home.swift   |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/DGCAVerifier/Services/Enclave.swift b/DGCAVerifier/Services/Enclave.swift
index bb5ad34..acfaa48 100644
--- a/DGCAVerifier/Services/Enclave.swift
+++ b/DGCAVerifier/Services/Enclave.swift
@@ -72,7 +72,6 @@ struct Enclave {
     else {
       return (nil, error?.takeRetainedValue().localizedDescription)
     }
-    error?.release()
     return (privateKey, nil)
   }
 
@@ -117,7 +116,6 @@ struct Enclave {
       &error
     ) as Data?
     let err = error?.takeRetainedValue().localizedDescription
-    error?.release()
     return (cipherData, err)
   }
 
@@ -140,7 +138,6 @@ struct Enclave {
       &error
     ) as Data?
     let err = error?.takeRetainedValue().localizedDescription
-    error?.release()
     return (clearData, err)
   }
 
@@ -160,7 +157,6 @@ struct Enclave {
       &error
     )
     let err = error?.takeRetainedValue().localizedDescription
-    error?.release()
     return (isValid, err)
   }
 
@@ -183,7 +179,6 @@ struct Enclave {
       &error
     ) as Data?
     let err = error?.takeRetainedValue().localizedDescription
-    error?.release()
     return (signature, err)
   }
 }
diff --git a/DGCAVerifier/Services/SecureStorage.swift b/DGCAVerifier/Services/SecureStorage.swift
index b0f196f..46d814c 100644
--- a/DGCAVerifier/Services/SecureStorage.swift
+++ b/DGCAVerifier/Services/SecureStorage.swift
@@ -37,6 +37,21 @@ struct SecureStorage {
   static let documents: URL! = try? FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor: nil, create: true)
   static let path: URL! = URL(string: documents.absoluteString + "secure.db")
 
+  /**
+   Loads encrypted db and overrides it with an empty one if that fails.
+   */
+  public static func loadOverride(completion: ((Bool) -> Void)? = nil) {
+    load { success in
+      if success {
+        completion?(true)
+        return
+      }
+      save { _ in
+        load(completion: completion)
+      }
+    }
+  }
+
   public static func load(completion: ((Bool) -> Void)? = nil) {
     if !FileManager.default.fileExists(atPath: path.path) {
       save()
@@ -79,7 +94,7 @@ struct SecureStorage {
       completion?(false)
       return
     }
-    Enclave.sign(data: data, with: key) { signature, err in
+    Enclave.sign(data: encrypted, with: key) { signature, err in
       guard
         let signature = signature,
         err == nil
diff --git a/DGCAVerifier/ViewControllers/Home.swift b/DGCAVerifier/ViewControllers/Home.swift
index f0ff2d4..43eb29e 100644
--- a/DGCAVerifier/ViewControllers/Home.swift
+++ b/DGCAVerifier/ViewControllers/Home.swift
@@ -33,7 +33,7 @@ class HomeVC: UIViewController {
   override func viewDidLoad() {
     super.viewDidLoad()
 
-    SecureStorage.load { [weak self] success in
+    SecureStorage.loadOverride { [weak self] success in
       guard success else {
         return
       }

From d0806cca46b587626249a01f32c0ebb86e6afa15 Mon Sep 17 00:00:00 2001
From: Yannick Spreen <yannick.spreen@gmail.com>
Date: Mon, 26 Apr 2021 20:10:01 +0200
Subject: [PATCH 09/12] Make generic.

---
 DGCAVerifier/Models/LocalData.swift       |  2 ++
 DGCAVerifier/Services/SecureStorage.swift | 42 ++++++++++-------------
 DGCAVerifier/ViewControllers/Home.swift   |  5 +--
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/DGCAVerifier/Models/LocalData.swift b/DGCAVerifier/Models/LocalData.swift
index 8a13564..cef538d 100644
--- a/DGCAVerifier/Models/LocalData.swift
+++ b/DGCAVerifier/Models/LocalData.swift
@@ -44,4 +44,6 @@ struct LocalData: Codable {
   static func set(resumeToken: String) {
     sharedInstance.resumeToken = resumeToken
   }
+
+  static let storage = SecureStorage<LocalData>()
 }
diff --git a/DGCAVerifier/Services/SecureStorage.swift b/DGCAVerifier/Services/SecureStorage.swift
index 46d814c..64316c0 100644
--- a/DGCAVerifier/Services/SecureStorage.swift
+++ b/DGCAVerifier/Services/SecureStorage.swift
@@ -33,33 +33,28 @@ struct SecureDB: Codable {
   let signature: Data
 }
 
-struct SecureStorage {
-  static let documents: URL! = try? FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor: nil, create: true)
-  static let path: URL! = URL(string: documents.absoluteString + "secure.db")
+struct SecureStorage<T: Codable> {
+  let documents: URL! = try? FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor: nil, create: true)
+  var path: URL! { URL(string: documents.absoluteString + "secure.db") }
 
   /**
    Loads encrypted db and overrides it with an empty one if that fails.
    */
-  public static func loadOverride(completion: ((Bool) -> Void)? = nil) {
-    load { success in
-      if success {
-        completion?(true)
+  public func loadOverride(fallback: T, completion: ((T?) -> Void)? = nil) {
+    load { result in
+      if result != nil {
+        completion?(result)
         return
       }
-      save { _ in
+      save(fallback) { _ in
         load(completion: completion)
       }
     }
   }
 
-  public static func load(completion: ((Bool) -> Void)? = nil) {
+  public func load(completion: ((T?) -> Void)? = nil) {
     if !FileManager.default.fileExists(atPath: path.path) {
-      save()
-      if FileManager.default.fileExists(atPath: path.path) {
-        load(completion: completion)
-      } else {
-        completion?(false)
-      }
+      completion?(nil)
       return
     }
 
@@ -68,26 +63,25 @@ struct SecureStorage {
       let key = Enclave.symmetricKey,
       Enclave.verify(data: data, signature: signature, with: key).0
     else {
-      completion?(false)
+      completion?(nil)
       return
     }
     Enclave.decrypt(data: data, with: key) { decrypted, err in
       guard
         let decrypted = decrypted,
         err == nil,
-        let data = try? JSONDecoder().decode(LocalData.self, from: decrypted)
+        let data = try? JSONDecoder().decode(T.self, from: decrypted)
       else {
-        completion?(false)
+        completion?(nil)
         return
       }
-      LocalData.sharedInstance = data
-      completion?(true)
+      completion?(data)
     }
   }
 
-  public static func save(completion: ((Bool) -> Void)? = nil) {
+  public func save(_ instance: T, completion: ((Bool) -> Void)? = nil) {
     guard
-      let data = try? JSONEncoder().encode(LocalData.sharedInstance),
+      let data = try? JSONEncoder().encode(instance),
       let key = Enclave.symmetricKey,
       let encrypted = Enclave.encrypt(data: data, with: key).0
     else {
@@ -106,7 +100,7 @@ struct SecureStorage {
     }
   }
 
-  static func write(data: Data, signature: Data) -> Bool {
+  func write(data: Data, signature: Data) -> Bool {
     guard
       let rawData = try? JSONEncoder().encode(SecureDB(data: data, signature: signature)),
       let _ = try? rawData.write(to: path)
@@ -116,7 +110,7 @@ struct SecureStorage {
     return true
   }
 
-  static func read() -> (Data, Data)? {
+  func read() -> (Data, Data)? {
     guard
       let rawData = try? Data(contentsOf: path),
       let result = try? JSONDecoder().decode(SecureDB.self, from: rawData)
diff --git a/DGCAVerifier/ViewControllers/Home.swift b/DGCAVerifier/ViewControllers/Home.swift
index 43eb29e..db7cc5c 100644
--- a/DGCAVerifier/ViewControllers/Home.swift
+++ b/DGCAVerifier/ViewControllers/Home.swift
@@ -33,10 +33,11 @@ class HomeVC: UIViewController {
   override func viewDidLoad() {
     super.viewDidLoad()
 
-    SecureStorage.loadOverride { [weak self] success in
-      guard success else {
+    LocalData.storage.loadOverride(fallback: LocalData.sharedInstance) { [weak self] success in
+      guard let result = success else {
         return
       }
+      LocalData.sharedInstance = result
       DispatchQueue.main.async {
         self?.performSegue(withIdentifier: "scanner", sender: self)
       }

From c2cfcfbb2f37541354d84359e5cbf029d59a63a2 Mon Sep 17 00:00:00 2001
From: Yannick Spreen <yannick.spreen@gmail.com>
Date: Mon, 26 Apr 2021 20:19:51 +0200
Subject: [PATCH 10/12] More spacing.

---
 .../Storyboards/CertificateViewer.storyboard  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/DGCAVerifier/Storyboards/CertificateViewer.storyboard b/DGCAVerifier/Storyboards/CertificateViewer.storyboard
index b1f7378..3c3bab7 100644
--- a/DGCAVerifier/Storyboards/CertificateViewer.storyboard
+++ b/DGCAVerifier/Storyboards/CertificateViewer.storyboard
@@ -50,13 +50,13 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Invalid" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NjI-L7-yat">
-                                        <rect key="frame" x="16" y="154.66666666666666" width="343" height="38.333333333333343"/>
+                                        <rect key="frame" x="16" y="162.66666666666666" width="343" height="38.333333333333343"/>
                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="32"/>
                                         <color key="textColor" red="1" green="0.14315580985915488" blue="0.14315580985915488" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <segmentedControl opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="9hO-yQ-B4J">
-                                        <rect key="frame" x="16" y="209" width="343" height="32"/>
+                                        <rect key="frame" x="16" y="217" width="343" height="32"/>
                                         <segments>
                                             <segment title="Test"/>
                                             <segment title="Vac#1"/>
@@ -66,25 +66,25 @@
                                         <color key="selectedSegmentTintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </segmentedControl>
                                     <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" contentInsetAdjustmentBehavior="never" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="NIJ-V3-NpL">
-                                        <rect key="frame" x="0.0" y="256" width="375" height="391"/>
+                                        <rect key="frame" x="0.0" y="264" width="375" height="383"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <prototypes>
-                                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="infoCell" rowHeight="96" id="C3K-o8-BC5" customClass="InfoCell" customModule="DGCAVerifier" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="28" width="375" height="96"/>
+                                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="infoCell" rowHeight="147" id="C3K-o8-BC5" customClass="InfoCell" customModule="DGCAVerifier" customModuleProvider="target">
+                                                <rect key="frame" x="0.0" y="28" width="375" height="147"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="C3K-o8-BC5" id="Xhy-8E-hY4">
-                                                    <rect key="frame" x="0.0" y="0.0" width="375" height="96"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="375" height="147"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="999" text="DE4382974329" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dbw-zt-5Bq">
-                                                            <rect key="frame" x="16" y="49.666666666666657" width="343" height="38.333333333333343"/>
+                                                            <rect key="frame" x="16" y="100.66666666666667" width="343" height="38.333333333333329"/>
                                                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="32"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="998" text="Identification Number" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1YP-3x-Q7c">
-                                                            <rect key="frame" x="16" y="8" width="343" height="37.666666666666664"/>
+                                                            <rect key="frame" x="16" y="16" width="343" height="80.666666666666671"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <nil key="highlightedColor"/>
@@ -92,7 +92,7 @@
                                                     </subviews>
                                                     <constraints>
                                                         <constraint firstAttribute="bottom" secondItem="dbw-zt-5Bq" secondAttribute="bottom" constant="8" id="6RB-eC-VdG"/>
-                                                        <constraint firstItem="1YP-3x-Q7c" firstAttribute="top" secondItem="Xhy-8E-hY4" secondAttribute="top" constant="8" id="Gqz-1L-Yoj"/>
+                                                        <constraint firstItem="1YP-3x-Q7c" firstAttribute="top" secondItem="Xhy-8E-hY4" secondAttribute="top" constant="16" id="Gqz-1L-Yoj"/>
                                                         <constraint firstItem="dbw-zt-5Bq" firstAttribute="leading" secondItem="Xhy-8E-hY4" secondAttribute="leading" constant="16" id="HXP-rX-faJ"/>
                                                         <constraint firstItem="dbw-zt-5Bq" firstAttribute="top" secondItem="1YP-3x-Q7c" secondAttribute="bottom" constant="4" id="Uwv-ga-rrc"/>
                                                         <constraint firstAttribute="trailing" secondItem="1YP-3x-Q7c" secondAttribute="trailing" constant="16" id="WR1-qN-UTj"/>
@@ -121,7 +121,7 @@
                                     <constraint firstItem="DVW-2y-e4I" firstAttribute="leading" secondItem="yEe-AH-rsr" secondAttribute="leading" constant="16" id="iQB-29-cRZ"/>
                                     <constraint firstItem="a9u-Ia-KEX" firstAttribute="centerX" secondItem="yEe-AH-rsr" secondAttribute="centerX" id="j6y-x9-na3"/>
                                     <constraint firstItem="NjI-L7-yat" firstAttribute="leading" secondItem="yEe-AH-rsr" secondAttribute="leading" constant="16" id="jha-Fk-syh"/>
-                                    <constraint firstItem="NjI-L7-yat" firstAttribute="top" secondItem="DVW-2y-e4I" secondAttribute="bottom" constant="8" id="lP1-ux-6At"/>
+                                    <constraint firstItem="NjI-L7-yat" firstAttribute="top" secondItem="DVW-2y-e4I" secondAttribute="bottom" constant="16" id="lP1-ux-6At"/>
                                     <constraint firstItem="9hO-yQ-B4J" firstAttribute="leading" secondItem="yEe-AH-rsr" secondAttribute="leading" constant="16" id="mYn-Jw-TYN"/>
                                     <constraint firstAttribute="trailing" secondItem="NjI-L7-yat" secondAttribute="trailing" constant="16" id="ox4-at-JzV"/>
                                     <constraint firstItem="a9u-Ia-KEX" firstAttribute="top" secondItem="NIJ-V3-NpL" secondAttribute="bottom" constant="32" id="wZx-rx-Vmt"/>

From 5002d00abca91d1fe2954d140aa950180c6422e2 Mon Sep 17 00:00:00 2001
From: Yannick Spreen <yannick.spreen@gmail.com>
Date: Mon, 26 Apr 2021 22:08:33 +0200
Subject: [PATCH 11/12] Clean up VC.

---
 DGCAVerifier/ViewControllers/Scan.swift | 67 +++----------------------
 1 file changed, 8 insertions(+), 59 deletions(-)

diff --git a/DGCAVerifier/ViewControllers/Scan.swift b/DGCAVerifier/ViewControllers/Scan.swift
index 7a1219b..df8a41f 100644
--- a/DGCAVerifier/ViewControllers/Scan.swift
+++ b/DGCAVerifier/ViewControllers/Scan.swift
@@ -47,63 +47,21 @@ class ScanVC: UIViewController {
 
   override func viewDidLoad() {
     super.viewDidLoad()
-//    checkPermissions()
-//    setupCameraLiveView()
-//    return;
-    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-      self.observationHandler(payloadS: nil)
-//      let reason = "Log in to your account"
-//      var context = LAContext()
-//      context.localizedCancelTitle = "Enter Username/Password"
-//      context.evaluatePolicy(.deviceOwnerAuthentication, localizedReason: reason ) { success, error in
-//
-//          if success {
-//
-//              // Move to the main thread because a state update triggers UI changes.
-//              DispatchQueue.main.async { [unowned self] in
-//                  print("loggedin")
-//              }
-//
-//          } else {
-//              print(error?.localizedDescription ?? "Failed to authenticate")
-//
-//              // Fall back to a asking for username and password.
-//              // ...
-//          }
-//      }
-    }
+    checkPermissions()
+    setupCameraLiveView()
   }
+
   override func viewWillDisappear(_ animated: Bool) {
     super.viewWillDisappear(animated)
     captureSession.stopRunning()
   }
 
-//  let curve: EllipticCurve = .prime256v1
-  let name: String = "ECDSA"
-  var presentingViewer: CertificateViewerVC?
-
-  // Send the base64URLencoded signature and `header.claims` to BlueECC for verification.
-//  func verifySignature(key: Data, signature: Data, for data: Data) -> Bool {
-//    do {
-//      guard let keyString = String(data: key, encoding: .utf8) else {
-//        return false
-//      }
-//      let r = signature.subdata(in: 0 ..< signature.count/2)
-//      let s = signature.subdata(in: signature.count/2 ..< signature.count)
-//      let signature = try ECSignature(r: r, s: s)
-//      let publicKey = try ECPublicKey(key: keyString)
-//      guard publicKey.curve == curve else {
-//        return false
-//      }
-//      return signature.verify(plaintext: data, using: publicKey)
-//    }
-//    catch {
-//      print("Verification failed: \(error)")
-//      return false
-//    }
-//
-//  }
+  override func viewDidAppear(_ animated: Bool) {
+    super.viewDidAppear(animated)
+    captureSession.startRunning()
+  }
 
+  var presentingViewer: CertificateViewerVC?
   func presentViewer(for certificate: HCert?) {
     guard
       presentingViewer == nil,
@@ -170,8 +128,6 @@ extension ScanVC {
     captureSession.addOutput(captureOutput)
 
     configurePreviewLayer()
-
-    captureSession.startRunning()
   }
 
   func processClassification(_ request: VNRequest) {
@@ -196,7 +152,6 @@ extension ScanVC {
   }
 
   func observationHandler(payloadS: String?) {
-    let payloadS: String? = payloadS ?? "HC1:NCFD:MFY7AP2.532EE3*45+G W84$2J85AUFA3QHN7SXNF$S-4THFSJFIMSKD3799U/LN71G32S0L43XHEIB*983A8RMF1/MMMIS6AQC0QNGU+I.AKYQKBPL%YA-ZVT28J3D+WNNL6SEV%GH$$3NRHO%L8BVLJBL:3F0AKIH3.1U2VS0WZLD75Q52EAENQ-HAYIXTGFH9%ZKA6Q$8A4J67E585MUDPCGCSY3SA7YPCPXCVDL-S0Z.CM6M7%H5POR-ACBI7MT3ZARJ7%S29G596OFMRF-65T6O*M.BJ3DI0W3%:ITBAF 9B1D3SQ$A5LOCTQQZ 40IPR:R3 PUXUN01XD8SJ62MRN$BV502.0HLGS/NXXJ AS.X5QZ2SGTEKLKHB4T8F%S664E02MH2F A.BH9+R7N6N5N.USZXL7DO2AIV2P0XU2.OPI6 C395EPMMGDAD4G-S1DC8ZVJT:3CR3-P8ZVGV8A$DD+*0/MH5+MPDO:L9IJ6MU278C924V:09%1MUQTR2FBL5 6CLODPT304L3GK6OT-7 97U*IO7J:1MB1EU0E.G3C/4P7FXRF-04F9O-9VREIPOSWTFU2W%2F4-B$CSSVNWKAHWJA4NCEU$KLU$GQ6OJ-97UN"
     guard
       var payloadString = payloadS
     else {
@@ -216,13 +171,7 @@ extension ScanVC {
     }
 
     let data = decompress(compressed)
-//    let payload = CBOR.payload(from: data)
-//    presentViewer(for: payload)
-//    print(CBOR.payload(from: data)?.toString() ?? "")
-//    print(CBOR.header(from: data)?.toString() ?? "")
     presentViewer(for: HCert(from: data))
-
-    GatewayConnection.fetchCert()
   }
 
 }

From 216ede3539fb5179c9ef0f4a1ca264aed2ac0b03 Mon Sep 17 00:00:00 2001
From: Yannick Spreen <yannick.spreen@gmail.com>
Date: Tue, 27 Apr 2021 14:56:04 +0200
Subject: [PATCH 12/12] Check for simulator environment.

---
 DGCAVerifier/ViewControllers/Scan.swift | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/DGCAVerifier/ViewControllers/Scan.swift b/DGCAVerifier/ViewControllers/Scan.swift
index df8a41f..af85ba7 100644
--- a/DGCAVerifier/ViewControllers/Scan.swift
+++ b/DGCAVerifier/ViewControllers/Scan.swift
@@ -47,8 +47,14 @@ class ScanVC: UIViewController {
 
   override func viewDidLoad() {
     super.viewDidLoad()
+    #if targetEnvironment(simulator)
+    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+      self.observationHandler(payloadS: "HC1:NCFOXNYTS3DH$YO:CQSU40 H 804 2FI15B3LR5OGILG9N:5-RII9DL-VAD65D6 NI4EFFZSE+S.SSH2HGUS XKVD9HB58QHVM6IQ17XH0S9S-JX%EI$HGL24EGYJ2SKISE02UQHPMYO9MN9JUHLKH.O93UQFJ6GL28LHXOAYJAPRAAUICO10W59UE1YHU-H4PIUF2VSJGV4J4LV/AYVG2$436D$X40YC2ATNS4Y6TKR2*G5C%CO8TJV4423 L0VV2 73-E3ND3DAJ-432$4U1JS.S./0LWTKD33236J3TA3E-4%:K7-SN2H N37J3JFTULJ5CBP:2C 2+*4HTC/2DBAJDAJCNB-43GV4MCTKD08DJHSI PISVDGZK4EC8.SX1LC8C8DJOMI$MI-N09*0245$UH8QIBD2GMJCKH9AO2R7./HBR6$LE KMDGKRFRSGHQED10H% 0R%0D 8YIPFHL:OTEGJUY25$0P/HX$4T0H//CI+CF/8-0LO1PX$4D4TVZ0D-4VZ0S1LZ0L:M623Q$B65VCNAIO38ZIIT-ROGV86O*$2/6PSQHV-P TN3H38EU2VME.3F$MM3WYC3A1N%IFBZV3P6$A9X81M:L-5TTPNFIVD6KL/O63UX0O7V9BYEB:IB BUAA9JM:ATN.AR81Y4GP21CPVY6P:KPG:LNLL%70/6MRVMT0LV0E7*EVLS2UIU6V2M3%26%Q3J*H:5L-28SXRWUH$LCQ/S3QTY5NG.8C5MN$V4-BXJMF5RG3U6-1RDVRWNY$3/ZB3MOQDWC*08M0AV5*/0QX4B-EF0MGH5X1FYHRGX8:+RY/EI%BQ95TC5*DW/ESR4S0:1ZF59*5GK1-OH4Z6-6FUOTN*H$38IPR4GT1$OE07B*SWKN*HF83N MO.CFOW3R%GB28Z$UOH7DROI9BW/CXPS0.PS USQE:LAVZP320%R902")
+    }
+    #else
     checkPermissions()
     setupCameraLiveView()
+    #endif
   }
 
   override func viewWillDisappear(_ animated: Bool) {