mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Add type to KBS json.

fork-5.53.8
Alan Evans 2020-01-24 18:38:29 -05:00 zatwierdzone przez Greyson Parrelli
rodzic 1d9fff3c98
commit ba6e1ab15a
2 zmienionych plików z 19 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/KeyBackupCipher.java
Wyświetl plik

@ -46,7 +46,7 @@ public final class KeyBackupCipher {
Request requestData = Request.newBuilder().setBackup(backupRequest).build();
return createKeyBackupRequest(requestData, remoteAttestation);
return createKeyBackupRequest(requestData, remoteAttestation, "backup");
}
public static KeyBackupRequest createKeyRestoreRequest(byte[] kbsAccessKey,
@ -66,7 +66,7 @@ public final class KeyBackupCipher {
Request request = Request.newBuilder().setRestore(restoreRequest).build();
return createKeyBackupRequest(request, remoteAttestation);
return createKeyBackupRequest(request, remoteAttestation, "restore");
}
public static KeyBackupRequest createKeyDeleteRequest(TokenResponse token,
@ -80,7 +80,7 @@ public final class KeyBackupCipher {
Request request = Request.newBuilder().setDelete(deleteRequest).build();
return createKeyBackupRequest(request, remoteAttestation);
return createKeyBackupRequest(request, remoteAttestation, "delete");
}
public static BackupResponse getKeyBackupResponse(KeyBackupResponse response, RemoteAttestation remoteAttestation)
@ -109,13 +109,13 @@ public final class KeyBackupCipher {
return DeleteResponse.parseFrom(data);
}
private static KeyBackupRequest createKeyBackupRequest(Request requestData, RemoteAttestation remoteAttestation) {
private static KeyBackupRequest createKeyBackupRequest(Request requestData, RemoteAttestation remoteAttestation, String type) {
byte[] clientKey = remoteAttestation.getKeys().getClientKey();
byte[] aad = remoteAttestation.getRequestId();
AESCipher.AESEncryptedResult aesEncryptedResult = AESCipher.encrypt(clientKey, aad, requestData.toByteArray());
return new KeyBackupRequest(aesEncryptedResult.aad, aesEncryptedResult.iv, aesEncryptedResult.data, aesEncryptedResult.mac);
return new KeyBackupRequest(aesEncryptedResult.aad, aesEncryptedResult.iv, aesEncryptedResult.data, aesEncryptedResult.mac, type);
}
private static byte[] decryptData(KeyBackupResponse response, RemoteAttestation remoteAttestation) throws InvalidCiphertextException {

20
libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupRequest.java
Wyświetl plik

@ -18,14 +18,18 @@ public class KeyBackupRequest {
@JsonProperty
private byte[] mac;
@JsonProperty
private String type;
public KeyBackupRequest() {
}
public KeyBackupRequest(byte[] requestId, byte[] iv, byte[] data, byte[] mac) {
this.requestId = requestId;
this.iv = iv;
this.data = data;
this.mac = mac;
public KeyBackupRequest(byte[] requestId, byte[] iv, byte[] data, byte[] mac, String type) {
this.requestId = requestId;
this.iv = iv;
this.data = data;
this.mac = mac;
this.type = type;
}
public byte[] getRequestId() {
@ -44,8 +48,12 @@ public class KeyBackupRequest {
return mac;
}
public String getType() {
return type;
}
public String toString() {
return "{ requestId: " + Hex.toString(requestId) + ", iv: " + Hex.toString(iv) + ", data: " + Hex.toString(data) + ", mac: " + Hex.toString(mac) + "}";
return "{ type:" + type + ", requestId: " + Hex.toString(requestId) + ", iv: " + Hex.toString(iv) + ", data: " + Hex.toString(data) + ", mac: " + Hex.toString(mac) + "}";
}
}