eliott/libsignal
1
0
Fork 0
mirror of https://github.com/signalapp/libsignal.git synced 2026-05-10 17:12:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement IdentityKeyPair Deserialize

Browse Source
This commit is contained in:
Sebastian
2020-12-22 16:58:42 +01:00
parent d1b8d4a6d4
commit b9cfddb97a
5 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/java/src/main/java/org/signal/internal/Native.java
View File

@@ -96,6 +96,7 @@ public final class Native {
public static native byte[] HKDF_DeriveSecrets(int version, byte[] inputKeyMaterial, byte[] salt, byte[] info, int outputLength);
public static native long[] IdentityKeyPair_Deserialize(byte[] data);
public static native byte[] IdentityKeyPair_Serialize(long publicKeyHandle, long privateKeyHandle);
public static native void NumericFingerprintGenerator_Destroy(long handle);

4
java/java/src/main/java/org/whispersystems/libsignal/IdentityKey.java
View File

@@ -32,6 +32,10 @@ public class IdentityKey {
this.publicKey = Curve.decodePoint(bytes, 0);
}
public IdentityKey(long nativeHandle) {
this.publicKey = new ECPublicKey(nativeHandle);
}
public ECPublicKey getPublicKey() {
return publicKey;
}

11
java/java/src/main/java/org/whispersystems/libsignal/IdentityKeyPair.java
View File

@@ -23,6 +23,15 @@ public class IdentityKeyPair {
this.privateKey = privateKey;
}
public IdentityKeyPair(byte[] serialized) {
long[] tuple = Native.IdentityKeyPair_Deserialize(serialized);
long publicKeyHandle = tuple[0];
long privateKeyHandle = tuple[1];
this.publicKey = new IdentityKey(publicKeyHandle);
this.privateKey = new ECPrivateKey(privateKeyHandle);
}
public IdentityKey getPublicKey() {
return publicKey;
}
@@ -31,7 +40,7 @@ public class IdentityKeyPair {
return privateKey;
}
byte[] serialize() {
public byte[] serialize() {
return Native.IdentityKeyPair_Serialize(this.publicKey.nativeHandle(), this.privateKey.nativeHandle());
}
}