Skip to content

Commit 17a12a2

Browse files
committed
remove unneeded crypto code
1 parent c2f4f5b commit 17a12a2

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

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

-14
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,5 @@ class Crypto {
9898
hkdfGenerator.generateBytes(hkdf, 0, hkdf.size)
9999
return hkdf
100100
}
101-
102-
fun generateHmacSignature(
103-
secret: ByteArray,
104-
info: ByteArray,
105-
message: ByteArray,
106-
): ByteArray {
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)
114-
}
115101
}
116102
}

library/src/main/java/org/xmtp/android/library/messages/MessageV2.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,10 @@ class MessageV2Builder(val senderHmac: ByteArray? = null, val shouldPush: Boolea
156156
val info = "$thirtyDayPeriodsSinceEpoch-${client.address}"
157157
val infoEncoded = info.toByteStringUtf8().toByteArray()
158158
val senderHmacGenerated =
159-
Crypto.generateHmacSignature(keyMaterial, infoEncoded, headerBytes)
159+
Crypto.calculateMac(
160+
Crypto.deriveKey(keyMaterial, ByteArray(0), infoEncoded),
161+
headerBytes
162+
)
160163

161164
return buildFromCipherText(
162165
headerBytes,

0 commit comments

Comments
 (0)