rebase fix

This commit is contained in:
Valere 2020-08-31 16:25:40 +02:00
parent dd09c4a72d
commit bf4f869524

View File

@ -89,7 +89,7 @@ internal object MXEncryptedAttachments {
key = EncryptedFileKey( key = EncryptedFileKey(
alg = "A256CTR", alg = "A256CTR",
ext = true, ext = true,
key_ops = listOf("encrypt", "decrypt"), keyOps = listOf("encrypt", "decrypt"),
kty = "oct", kty = "oct",
k = base64ToBase64Url(Base64.encodeToString(key, Base64.DEFAULT)) k = base64ToBase64Url(Base64.encodeToString(key, Base64.DEFAULT))
), ),
@ -210,7 +210,7 @@ internal object MXEncryptedAttachments {
key = EncryptedFileKey( key = EncryptedFileKey(
alg = "A256CTR", alg = "A256CTR",
ext = true, ext = true,
key_ops = listOf("encrypt", "decrypt"), keyOps = listOf("encrypt", "decrypt"),
kty = "oct", kty = "oct",
k = base64ToBase64Url(Base64.encodeToString(key, Base64.DEFAULT)) k = base64ToBase64Url(Base64.encodeToString(key, Base64.DEFAULT))
), ),