From 8da5fbe9dc37737968ebcb9897de9d65d05ab5f7 Mon Sep 17 00:00:00 2001
From: JanNiklas Grabowski <janniklas.grabowski.ext@bwi.de>
Date: Wed, 14 Aug 2024 14:05:53 +0200
Subject: [PATCH] feat: update public keys for server selection protection with
 JWT  (MESSENGER-6162)

---
 Config/BWIBuildSettings.swift | 6 ++----
 publickeys/jwt-test.key.pub   | 9 ---------
 publickeys/jwt-test2.key.pub  | 9 ---------
 publickeys/public-key-b.pem   | 9 +++++++++
 publickeys/public-key-k.pem   | 9 +++++++++
 5 files changed, 20 insertions(+), 22 deletions(-)
 delete mode 100644 publickeys/jwt-test.key.pub
 delete mode 100644 publickeys/jwt-test2.key.pub
 create mode 100644 publickeys/public-key-b.pem
 create mode 100644 publickeys/public-key-k.pem

diff --git a/Config/BWIBuildSettings.swift b/Config/BWIBuildSettings.swift
index 28915e0f4..090dc30f9 100644
--- a/Config/BWIBuildSettings.swift
+++ b/Config/BWIBuildSettings.swift
@@ -173,10 +173,8 @@ class BWIBuildSettings: NSObject {
     var bwiHashes = [ "a3f65e35a7476799afe8d80282fb3c45b39dab06d1d8c70dc98e45ab7d8e93a9",
                       "2fda1a831655c22a5e6096d7cfbff4429fbf27891141e191b46adbf168142a11",
                       "4f8cbb3fef885f7284d0477d797d7007f0e1ba76221834132752f4d645796e28",
- /*                     "24c2ec541e61e8e68944b96dc45ed5df12f6bdbda283cb0b3a522742aa970256",
-                        "1be0b314a6c915d4475290522baef5b642db1b6d68937792b8e0eb5b7b0d6666",
-  remove internal test server that is handled by token verification*/
-                     
+                      "24c2ec541e61e8e68944b96dc45ed5df12f6bdbda283cb0b3a522742aa970256",
+                      "1be0b314a6c915d4475290522baef5b642db1b6d68937792b8e0eb5b7b0d6666",
                       "3deb73db8cafcd1d5a59e25e251c35816162e1f6ee67b5d7d011da0e8d6ef931",
                       "42e57985d61202c2c7dd87d898cef9bdce020877a4c7a8c7cd699f6a28f58c0c",
                       "e1c3c7cac12bd65bd48de79a2677187d2e768d2769377627534023588b8d7a33",
diff --git a/publickeys/jwt-test.key.pub b/publickeys/jwt-test.key.pub
deleted file mode 100644
index 4ff9becd5..000000000
--- a/publickeys/jwt-test.key.pub
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4UILd45kW1+bkNy/Id4k
-tPPZRH52JICTpssW8Qe4pdVJvg422iAEhyOgLWbUDKlOrCGJrzTbS59jGf2AzUPj
-t1uvCWDUjHXXjqY90SyW1IGQI+R7ANe7CQqdGnA6gKx1eKpfRL1reY+Sc4w6E6Qd
-8J4xNmdIX73na1IvEVA+NOm8l4HA3TINsGn+p7yyx5ZghiY0Y3F0uWWxygTehJlp
-YGVHejZcXqdTeGSNjTUIvL7zljin47SxUr7HIRnDyEgeihdt5r9FT042Yr+igAHw
-4ywixNgPfRc+euJExbJ3TFqPQhf/J/BdKZSqUrq1b0J/Y9RgY6fvzd0LXGcR1SIi
-4QIDAQAB
------END PUBLIC KEY-----
diff --git a/publickeys/jwt-test2.key.pub b/publickeys/jwt-test2.key.pub
deleted file mode 100644
index f2c288993..000000000
--- a/publickeys/jwt-test2.key.pub
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAypUe1MYcVbjaeYQ6EPXD
-SSTinbfpdg2pPSQhNZQpjyRqZ06D1nOnN2ZITqO88rHc4UQ0/QGyLnMHEw3HGLPB
-UeaBEBCX67Vc4eH6In7HjnKPYbnin8lYdukyZNoFtvtdM/QmUTa6d34H4LJNIEnB
-cjfrLOCtK6K1q+a5TugwsgNO9CiHqOasQuFxLfeP7ToAz6q/sbE5gweL4V3mWRqF
-HAbEwYSnF6pdx+Z4sRmy0XmHzsJh0IBNfeqasROIMGiABH7cAs7J4Whj+GjXxJgd
-Ac7Fpa21i0Trzh1jlQW+MAaCI4ni8HhjlLIURpEq0lerVkpMFXT451AVB9l8Pxp2
-pQIDAQAB
------END PUBLIC KEY-----
\ No newline at end of file
diff --git a/publickeys/public-key-b.pem b/publickeys/public-key-b.pem
new file mode 100644
index 000000000..1f0aec503
--- /dev/null
+++ b/publickeys/public-key-b.pem
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmE1lHp38EGij3ghWlEbK
+K/H4fBcQxt7YyD4vTVUyzB0JizrXvwPkVQHqD9n92hZPpJALZiN0OgpjmlyJUgG7
+gv+2HYflPNrUklner7QAon1XVcEjMnHvQIAXVCCwaNzZ3zIsW33GRI+Y8M9sKKXi
+siVABgtxh/p3w3ye/WOs0Axr7JrBCw7ZsGBONvjXjqzsDU7M8ETmOU0i8ncjZNid
+/eHJsib7MwnPkF9LWlTijz9zxrrwpLC2DKoJXNax4SrvN38khk3tfOpBs1caUPrU
+mR/bJWIlWs35wvzgl8iJm8Ijj3CR3S1egDe7y/W/5tx2z4h4Pk6TrBa43zvoeeq2
+XwIDAQAB
+-----END PUBLIC KEY-----
diff --git a/publickeys/public-key-k.pem b/publickeys/public-key-k.pem
new file mode 100644
index 000000000..733589225
--- /dev/null
+++ b/publickeys/public-key-k.pem
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqAG+mO3cENobuwORCOX4
+HmohVhvEATGuM7HjRA0JzQrZgwwZFYcx9Uf3MfbSCr1UiNBdJt6c3Bo2vYSPXXyE
++kSfucXcL+UMUOhlYuUphCxwTEPgp/ChIO04LtzGEojELj5ycvUsvw3ymw8GEK10
+wlRy3Ex6InI6PultKjZvdZjHFv/ZWvLmhJrLiAYdSZ29Hrx7jj2T3qQAnNRc8MWb
+mMWlqzOplgwLQhToQ2QGDkMbGSHaWltBqXbSPE8CJI3l/A+x5p6PxKaahDMdrLJI
+cD9KoJ7s1xvEVy3X97/CnAJ7KJ9yZDwxr+9MRtXmDxLPORusnpROffq7hXqVay3i
+OwIDAQAB
+-----END PUBLIC KEY-----