mirror/libsignal
0
0
Fork 0
mirror of https://github.com/signalapp/libsignal.git synced 2024-09-20 03:52:17 +02:00
Code

Remove unused error FingerprintIdentifierMismatch

Browse Source 
Fingerprint checks are done with a boolean-returning method; the error
is never thrown. Android and iOS aren't using the exception / error
case either.
This commit is contained in:
Jordan Rose 2021-11-22 12:40:02 -08:00
parent 7ad935c2d9
commit 5a67a4bf0a
7 changed files with 3 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
java/java/src/main/java/org/whispersystems/libsignal/fingerprint/FingerprintIdentifierMismatchException.java
View File

@ -1,39 +0,0 @@
/**
* Copyright (C) 2016 Open Whisper Systems
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.fingerprint;
public class FingerprintIdentifierMismatchException extends Exception {
private final String localIdentifier;
private final String remoteIdentifier;
private final String scannedLocalIdentifier;
private final String scannedRemoteIdentifier;
public FingerprintIdentifierMismatchException(String localIdentifier, String remoteIdentifier,
String scannedLocalIdentifier, String scannedRemoteIdentifier)
{
this.localIdentifier = localIdentifier;
this.remoteIdentifier = remoteIdentifier;
this.scannedLocalIdentifier = scannedLocalIdentifier;
this.scannedRemoteIdentifier = scannedRemoteIdentifier;
}
public String getScannedRemoteIdentifier() {
return scannedRemoteIdentifier;
}
public String getScannedLocalIdentifier() {
return scannedLocalIdentifier;
}
public String getRemoteIdentifier() {
return remoteIdentifier;
}
public String getLocalIdentifier() {
return localIdentifier;
}
}

4
java/tests/src/test/java/org/whispersystems/libsignal/fingerprint/NumericFingerprintGeneratorTest.java
View File

@ -69,7 +69,7 @@ public class NumericFingerprintGeneratorTest extends TestCase {
assertTrue(Arrays.equals(bobFingerprint.getScannableFingerprint().getSerialized(), BOB_SCANNABLE_FINGERPRINT_V2));
}
public void testMatchingFingerprints() throws FingerprintVersionMismatchException, FingerprintIdentifierMismatchException, FingerprintParsingException {
public void testMatchingFingerprints() throws FingerprintVersionMismatchException, FingerprintParsingException {
ECKeyPair aliceKeyPair = Curve.generateKeyPair();
ECKeyPair bobKeyPair = Curve.generateKeyPair();
@ -94,7 +94,7 @@ public class NumericFingerprintGeneratorTest extends TestCase {
assertEquals(aliceFingerprint.getDisplayableFingerprint().getDisplayText().length(), 60);
}
public void testMismatchingFingerprints() throws FingerprintVersionMismatchException, FingerprintIdentifierMismatchException, FingerprintParsingException {
public void testMismatchingFingerprints() throws FingerprintVersionMismatchException, FingerprintParsingException {
ECKeyPair aliceKeyPair = Curve.generateKeyPair();
ECKeyPair bobKeyPair = Curve.generateKeyPair();
ECKeyPair mitmKeyPair = Curve.generateKeyPair();

5
rust/bridge/ffi/src/util.rs
View File

@ -37,7 +37,6 @@ pub enum SignalErrorCode {
InvalidKey = 40,
InvalidSignature = 41,
FingerprintIdentifierMismatch = 50,
FingerprintVersionMismatch = 51,
FingerprintParsingError = 52,
@ -117,10 +116,6 @@ impl From<&SignalFfiError> for SignalErrorCode {
SignalErrorCode::InvalidRegistrationId
}
SignalFfiError::Signal(SignalProtocolError::FingerprintIdentifierMismatch) => {
SignalErrorCode::FingerprintIdentifierMismatch
}
SignalFfiError::Signal(SignalProtocolError::FingerprintParsingError) => {
SignalErrorCode::FingerprintParsingError
}

3
rust/bridge/shared/src/jni/mod.rs
View File

@ -258,8 +258,7 @@ fn throw_error(env: &JNIEnv, error: SignalJniError) {
jni_class_name!(org.whispersystems.libsignal.LegacyMessageException)
}
SignalJniError::Signal(SignalProtocolError::FingerprintIdentifierMismatch)
| SignalJniError::Signal(SignalProtocolError::FingerprintParsingError) => {
SignalJniError::Signal(SignalProtocolError::FingerprintParsingError) => {
jni_class_name!(
org.whispersystems
.libsignal

2
rust/protocol/src/error.rs
View File

@ -38,8 +38,6 @@ pub enum SignalProtocolError {
/// unrecognized message version <{0}>
UnrecognizedMessageVersion(u32),
/// fingerprint identifiers do not match
FingerprintIdentifierMismatch,
/// fingerprint version number mismatch them {0} us {1}
FingerprintVersionMismatch(u32, u32),
/// fingerprint parsing error

3
swift/Sources/SignalClient/Error.swift
View File

@ -25,7 +25,6 @@ public enum SignalError: Error {
case invalidMessage(String)
case invalidKey(String)
case invalidSignature(String)
case fingerprintIdentifierMismatch(String)
case fingerprintVersionMismatch(String)
case fingerprintParsingError(String)
case sealedSenderSelfSend(String)
@ -86,8 +85,6 @@ internal func checkError(_ error: SignalFfiErrorRef?) throws {
throw SignalError.invalidKey(errStr)
case SignalErrorCode_InvalidSignature:
throw SignalError.invalidSignature(errStr)
case SignalErrorCode_FingerprintIdentifierMismatch:
throw SignalError.fingerprintIdentifierMismatch(errStr)
case SignalErrorCode_FingerprintVersionMismatch:
throw SignalError.fingerprintVersionMismatch(errStr)
case SignalErrorCode_UntrustedIdentity:

1
swift/Sources/SignalFfi/signal_ffi.h
View File

@ -138,7 +138,6 @@ typedef enum {
SignalErrorCode_SealedSenderSelfSend = 31,
SignalErrorCode_InvalidKey = 40,
SignalErrorCode_InvalidSignature = 41,
SignalErrorCode_FingerprintIdentifierMismatch = 50,
SignalErrorCode_FingerprintVersionMismatch = 51,
SignalErrorCode_FingerprintParsingError = 52,
SignalErrorCode_UntrustedIdentity = 60,