signald/libsignal-service-java
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add kbs settings patch file

Browse source
This commit is contained in:
Finn 2022-12-20 12:45:54 -08:00
parent 215952a8dd
commit 7bfa3bc807
3 changed files with 42 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build.sh
View file

@ -5,6 +5,7 @@ cd libsignal-service-java
git config user.email nobody@signald.org git config user.email nobody@signald.org
git config user.name signald git config user.name signald
git am ../libsignal-service-java.patch git am ../libsignal-service-java.patch
git am ../update-kbs-settings.patch
python3 ../update-verification-metadata.py python3 ../update-verification-metadata.py
git diff --color=always git diff --color=always
gradle assemble publish || (gradle --write-verification-metadata sha256 && git diff --color=always && exit 1) gradle assemble publish || (gradle --write-verification-metadata sha256 && git diff --color=always && exit 1)

6
libsignal-service-java.patch
View file

@ -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> From: signald <nobody@signald.org>
Date: Thu, 16 Jun 2022 13:04:00 -0700 Date: Thu, 16 Jun 2022 13:04:00 -0700
Subject: [PATCH] update build files and provide a way for the websocket 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 create mode 100644 service/src/main/java/org/whispersystems/signalservice/api/NotSavedException.java
diff --git a/build.gradle b/build.gradle diff --git a/build.gradle b/build.gradle
index 2498bfcb..965084e6 100644 index 2498bfcb..81f7038d 100644
--- a/build.gradle --- a/build.gradle
+++ b/build.gradle +++ b/build.gradle
@@ -9,11 +9,8 @@ buildscript { @@ -9,11 +9,8 @@ buildscript {
@ -48,7 +48,7 @@ index 2498bfcb..965084e6 100644
subprojects { subprojects {
- ext.lib_signal_service_version_number = "2.15.3_unofficial_50" - ext.lib_signal_service_version_number = "2.15.3_unofficial_50"
- ext.lib_signal_service_group_info = "com.github.turasa" - 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" + ext.lib_signal_service_group_info = "org.signald"
if (JavaVersion.current().isJava8Compatible()) { if (JavaVersion.current().isJava8Compatible()) {

38
update-kbs-settings.patch Normal file
View file

@ -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