Commit b52a9e6 1 parent 10b3b5a commit b52a9e6 Copy full SHA for 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 Original file line number Diff line number Diff line change @@ -87,9 +87,10 @@ class Crypto {
87
87
88
88
fun deriveKey (
89
89
secret : ByteArray ,
90
+ salt : ByteArray ,
90
91
info : ByteArray ,
91
92
): ByteArray {
92
- val derivationParameters = HKDFParameters (secret, ByteArray ( 0 ) , info)
93
+ val derivationParameters = HKDFParameters (secret, salt , info)
93
94
val digest = SHA256Digest ()
94
95
val hkdfGenerator = HKDFBytesGenerator (digest)
95
96
hkdfGenerator.init (derivationParameters)
@@ -103,8 +104,13 @@ class Crypto {
103
104
info : ByteArray ,
104
105
message : ByteArray ,
105
106
): 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)
108
114
}
109
115
}
110
116
}
You can’t perform that action at this time.
0 commit comments