From 4a8ad3103cabdbcaf0b413b5724542c4db6a21fc Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Thu, 18 May 2023 17:22:00 -0400
Subject: [PATCH] Actually write pre-keys as byte arrays

---
 .../java/org/whispersystems/textsecuregcm/storage/Keys.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Keys.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Keys.java
index 131c326de..f9c0242b1 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Keys.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Keys.java
@@ -374,13 +374,13 @@ public class Keys extends AbstractDynamoDbStore {
       return Map.of(
           KEY_ACCOUNT_UUID, getPartitionKey(accountUuid),
           KEY_DEVICE_ID_KEY_ID, getSortKey(deviceId, spk.getKeyId()),
-          KEY_PUBLIC_KEY, AttributeValues.fromString(spk.getPublicKey()),
-          KEY_SIGNATURE, AttributeValues.fromString(spk.getSignature()));
+          KEY_PUBLIC_KEY, AttributeValues.fromByteArray(Base64.getDecoder().decode(spk.getPublicKey())),
+          KEY_SIGNATURE, AttributeValues.fromByteArray(Base64.getDecoder().decode(spk.getSignature())));
     }
     return Map.of(
         KEY_ACCOUNT_UUID, getPartitionKey(accountUuid),
         KEY_DEVICE_ID_KEY_ID, getSortKey(deviceId, preKey.getKeyId()),
-        KEY_PUBLIC_KEY, AttributeValues.fromString(preKey.getPublicKey()));
+        KEY_PUBLIC_KEY, AttributeValues.fromByteArray(Base64.getDecoder().decode(preKey.getPublicKey())));
   }
 
   private PreKey getPreKeyFromItem(Map<String, AttributeValue> item) {