From bda78c9e8e841b0d6f52a14259dd92d9096d07a1 Mon Sep 17 00:00:00 2001
From: Yuval Adam <_@yuv.al>
Date: Thu, 7 Oct 2021 08:41:18 +0300
Subject: Initial v2 implementation

---
 certs/IL-NB-DSC-01.der | Bin 0 -> 1052 bytes
 certs/IL-NB-DSC-01.pem |   4 ++++
 verify.py              |  35 +++++++++++++++++++++++------------
 3 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 certs/IL-NB-DSC-01.der
 create mode 100644 certs/IL-NB-DSC-01.pem

diff --git a/certs/IL-NB-DSC-01.der b/certs/IL-NB-DSC-01.der
new file mode 100644
index 0000000..c52c364
Binary files /dev/null and b/certs/IL-NB-DSC-01.der differ
diff --git a/certs/IL-NB-DSC-01.pem b/certs/IL-NB-DSC-01.pem
new file mode 100644
index 0000000..f73acd5
--- /dev/null
+++ b/certs/IL-NB-DSC-01.pem
@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEcw+UZUnryP4rqSw+a8xQw4wLHZkc
+u4MDjJP7QeBUEpDt8xh4i4RSIBEJrBkAukSSobRDkwMb0dSCsWwK0rfMgQ==
+-----END PUBLIC KEY-----
diff --git a/verify.py b/verify.py
index e1c9cdc..2ed7d24 100644
--- a/verify.py
+++ b/verify.py
@@ -7,7 +7,7 @@ from io import BytesIO
 from pathlib import Path
 
 from cryptography.hazmat.primitives import hashes, serialization
-from cryptography.hazmat.primitives.asymmetric import padding
+from cryptography.hazmat.primitives.asymmetric import padding, ec
 from cryptography.exceptions import InvalidSignature
 from PIL import Image
 from pyzbar import pyzbar
@@ -25,7 +25,8 @@ class GreenPassVerifier(object):
         self.details = self.get_details()
         self.digest = self.get_digest()
 
-        self.cert = self.get_cert_path("RamzorQRPubKey.pem")
+        self.ec_cert = self.get_cert_path("IL-NB-DSC-01.pem")
+        self.rsa_cert = self.get_cert_path("RamzorQRPubKey.pem")
 
     @classmethod
     def from_payload(cls, path):
@@ -43,6 +44,7 @@ class GreenPassVerifier(object):
             for img in doc.get_page_images(i):
                 xref, width = img[0], img[2]
                 if width in (
+                    3080,  # in green pass v2
                     3720,  # in green pass
                     4200,  # in vaccination certificate
                 ):
@@ -106,18 +108,27 @@ class GreenPassVerifier(object):
             click.echo(f"\tID valid by {d['valid_by']}")
             click.echo(f"\tCert Unique ID {d['cert_id']}")
 
-        with open(self.cert, "rb") as f:
-            k = serialization.load_pem_public_key(f.read())
-            try:
-                k.verify(
-                    self.signature,
-                    self.digest,
+        certs = [
+            [
+                self.rsa_cert,
+                [
                     padding.PKCS1v15(),
                     hashes.SHA256(),
-                )
-                click.secho("✅ Valid signature!", fg="green", bold=True)
-            except InvalidSignature:
-                click.secho("❌ Invalid signature!", fg="red", bold=True)
+                ],
+            ],
+            [self.ec_cert, [ec.ECDSA(hashes.SHA256())]],
+        ]
+        for cert, method in certs:
+            with open(cert, "rb") as f:
+                k = serialization.load_pem_public_key(f.read())
+                try:
+                    k.verify(self.signature, self.digest, *method)
+                    click.secho("✅ Valid signature!", fg="green", bold=True)
+                    break
+                except InvalidSignature:
+                    pass
+        else:
+            click.secho("❌ Invalid signature!", fg="red", bold=True)
 
 
 @click.command()
-- 
cgit v1.3.1