From 7bfa3bc8070c13084c344d54a7364a23fe83c68a Mon Sep 17 00:00:00 2001
From: Finn <finn@janky.solutions>
Date: Tue, 20 Dec 2022 12:45:54 -0800
Subject: [PATCH] add kbs settings patch file

---
 build.sh                     |  1 +
 libsignal-service-java.patch |  6 +++---
 update-kbs-settings.patch    | 38 ++++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 update-kbs-settings.patch

diff --git a/build.sh b/build.sh
index 0d46342..4f84fb2 100755
--- a/build.sh
+++ b/build.sh
@@ -5,6 +5,7 @@ cd libsignal-service-java
 git config user.email nobody@signald.org
 git config user.name signald
 git am ../libsignal-service-java.patch
+git am ../update-kbs-settings.patch
 python3 ../update-verification-metadata.py
 git diff --color=always
 gradle assemble publish || (gradle --write-verification-metadata sha256 && git diff --color=always && exit 1)
diff --git a/libsignal-service-java.patch b/libsignal-service-java.patch
index 65bb6fc..cdf0862 100644
--- a/libsignal-service-java.patch
+++ b/libsignal-service-java.patch
@@ -1,4 +1,4 @@
-From ae19ed8b15251adae911868ffe570e5608bc2eef Mon Sep 17 00:00:00 2001
+From c51057ae26118490176af0b2421f8fa62d926c00 Mon Sep 17 00:00:00 2001
 From: signald <nobody@signald.org>
 Date: Thu, 16 Jun 2022 13:04:00 -0700
 Subject: [PATCH] update build files and provide a way for the websocket
@@ -16,7 +16,7 @@ Subject: [PATCH] update build files and provide a way for the websocket
  create mode 100644 service/src/main/java/org/whispersystems/signalservice/api/NotSavedException.java
 
 diff --git a/build.gradle b/build.gradle
-index 2498bfcb..965084e6 100644
+index 2498bfcb..81f7038d 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -9,11 +9,8 @@ buildscript {
@@ -48,7 +48,7 @@ index 2498bfcb..965084e6 100644
  subprojects {
 -    ext.lib_signal_service_version_number = "2.15.3_unofficial_50"
 -    ext.lib_signal_service_group_info     = "com.github.turasa"
-+    ext.lib_signal_service_version_number = "2.15.3_unofficial_50_signald_1"
++    ext.lib_signal_service_version_number = "2.15.3_unofficial_50_signald_2"
 +    ext.lib_signal_service_group_info     = "org.signald"
  
      if (JavaVersion.current().isJava8Compatible()) {
diff --git a/update-kbs-settings.patch b/update-kbs-settings.patch
new file mode 100644
index 0000000..7d65a5f
--- /dev/null
+++ b/update-kbs-settings.patch
@@ -0,0 +1,38 @@
+From d432b9234521947d7bb07434f69a30b407700f5c Mon Sep 17 00:00:00 2001
+From: Greyson Parrelli <greyson@signal.org>
+Date: Thu, 20 Oct 2022 13:12:27 -0400
+Subject: [PATCH 2/2] [Signal-Android] Updated KBS settings.
+ 9941ffe79c2508eb9b1f1fa78b47b84c465d1199
+
+---
+ .../internal/contacts/crypto/RemoteAttestationCipher.java  | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationCipher.java b/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationCipher.java
+index 05073edf..32e86c70 100644
+--- a/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationCipher.java
++++ b/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationCipher.java
+@@ -24,6 +24,11 @@ import java.util.Set;
+ 
+ public final class RemoteAttestationCipher {
+ 
++  private static final Set<String> ALLOWED_ADVISORIES = new HashSet<String>() {{
++    add("INTEL-SA-00334");
++    add("INTEL-SA-00615");
++  }};
++
+   private RemoteAttestationCipher() {
+   }
+ 
+@@ -100,7 +105,7 @@ public final class RemoteAttestationCipher {
+     if ("OK".equals(entity.getIsvEnclaveQuoteStatus())) {
+       return true;
+     } else if ("SW_HARDENING_NEEDED".equals(entity.getIsvEnclaveQuoteStatus())) {
+-      return entity.getAdvisoryIds().length == 1 && "INTEL-SA-00334".equals(entity.getAdvisoryIds()[0]);
++      return Arrays.stream(entity.getAdvisoryIds()).allMatch(ALLOWED_ADVISORIES::contains);
+     } else {
+       return false;
+     }
+-- 
+2.30.2
+