webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 18:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor generateSignedPreKeyRecord

Browse source
This commit is contained in:
AsamK 2023-10-12 21:15:13 +02:00
parent a66dd0dc79
commit 527e1aefc9
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
View file

@ -148,7 +148,7 @@ public class PreKeyHelper {
final var accountData = account.getAccountData(serviceIdType); final var accountData = account.getAccountData(serviceIdType);
final var signedPreKeyId = accountData.getPreKeyMetadata().getNextSignedPreKeyId(); final var signedPreKeyId = accountData.getPreKeyMetadata().getNextSignedPreKeyId();
var record = KeyUtils.generateSignedPreKeyRecord(signedPreKeyId, identityKeyPair); var record = KeyUtils.generateSignedPreKeyRecord(signedPreKeyId, identityKeyPair.getPrivateKey());
account.addSignedPreKey(serviceIdType, record); account.addSignedPreKey(serviceIdType, record);
return record; return record;

2
lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
View file

@ -267,7 +267,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
final var preKeyMetadata = accountData.getPreKeyMetadata(); final var preKeyMetadata = accountData.getPreKeyMetadata();
final var nextSignedPreKeyId = preKeyMetadata.getNextSignedPreKeyId(); final var nextSignedPreKeyId = preKeyMetadata.getNextSignedPreKeyId();
final var signedPreKey = KeyUtils.generateSignedPreKeyRecord(nextSignedPreKeyId, keyPair); final var signedPreKey = KeyUtils.generateSignedPreKeyRecord(nextSignedPreKeyId, keyPair.getPrivateKey());
final var privateKey = keyPair.getPrivateKey(); final var privateKey = keyPair.getPrivateKey();
final var kyberPreKeyIdOffset = preKeyMetadata.getNextKyberPreKeyId(); final var kyberPreKeyIdOffset = preKeyMetadata.getNextKyberPreKeyId();

4
lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
View file

@ -61,12 +61,12 @@ public class KeyUtils {
} }
public static SignedPreKeyRecord generateSignedPreKeyRecord( public static SignedPreKeyRecord generateSignedPreKeyRecord(
final int signedPreKeyId, final IdentityKeyPair identityKeyPair final int signedPreKeyId, final ECPrivateKey privateKey
) { ) {
var keyPair = Curve.generateKeyPair(); var keyPair = Curve.generateKeyPair();
byte[] signature; byte[] signature;
try { try {
signature = Curve.calculateSignature(identityKeyPair.getPrivateKey(), keyPair.getPublicKey().serialize()); signature = Curve.calculateSignature(privateKey, keyPair.getPublicKey().serialize());
} catch (InvalidKeyException e) { } catch (InvalidKeyException e) {
throw new AssertionError(e); throw new AssertionError(e);
} }