Skip to content

Commit b52a9e6

Browse files
committed
fix up the crypto
1 parent 10b3b5a commit b52a9e6

File tree

1 file changed

+9
-3
lines changed
  • library/src/main/java/org/xmtp/android/library

1 file changed

+9
-3
lines changed

library/src/main/java/org/xmtp/android/library/Crypto.kt

+9-3
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,10 @@ class Crypto {
8787

8888
fun deriveKey(
8989
secret: ByteArray,
90+
salt: ByteArray,
9091
info: ByteArray,
9192
): ByteArray {
92-
val derivationParameters = HKDFParameters(secret, ByteArray(0), info)
93+
val derivationParameters = HKDFParameters(secret, salt, info)
9394
val digest = SHA256Digest()
9495
val hkdfGenerator = HKDFBytesGenerator(digest)
9596
hkdfGenerator.init(derivationParameters)
@@ -103,8 +104,13 @@ class Crypto {
103104
info: ByteArray,
104105
message: ByteArray,
105106
): ByteArray {
106-
val hkdfKey = deriveKey(secret, info)
107-
return calculateMac(hkdfKey, message)
107+
val derivationParameters = HKDFParameters(secret, ByteArray(0), info)
108+
val digest = SHA256Digest()
109+
val hkdfGenerator = HKDFBytesGenerator(digest)
110+
hkdfGenerator.init(derivationParameters)
111+
val hkdf = ByteArray(32)
112+
hkdfGenerator.generateBytes(hkdf, 0, hkdf.size)
113+
return calculateMac(hkdf, message)
108114
}
109115
}
110116
}

0 commit comments

Comments
 (0)