Signal, messages-recv: Fix previous commit, fix log

src/Signal/Group/sender-key-distribution-message.ts

@@ -4,8 +4,8 @@ import { CiphertextMessage } from './ciphertext-message'
 interface SenderKeyDistributionMessageStructure {
 	id: number
 	iteration: number
-	chainKey: Uint8Array
-	signingKey: Uint8Array
+	chainKey: string | Uint8Array
+	signingKey: string | Uint8Array
 }
 
 export class SenderKeyDistributionMessage extends CiphertextMessage {
@@ -34,8 +34,14 @@ export class SenderKeyDistributionMessage extends CiphertextMessage {
 				this.serialized = serialized
 				this.id = distributionMessage.id
 				this.iteration = distributionMessage.iteration
-				this.chainKey = distributionMessage.chainKey
-				this.signatureKey = distributionMessage.signingKey
+				this.chainKey =
+					typeof distributionMessage.chainKey === 'string'
+						? Buffer.from(distributionMessage.chainKey, 'base64')
+						: distributionMessage.chainKey
+				this.signatureKey =
+					typeof distributionMessage.signingKey === 'string'
+						? Buffer.from(distributionMessage.signingKey, 'base64')
+						: distributionMessage.signingKey
 			} catch (e) {
 				throw new Error(String(e))
 			}

src/Signal/Group/sender-key-message.ts

@@ -5,7 +5,7 @@ import { CiphertextMessage } from './ciphertext-message'
 interface SenderKeyMessageStructure {
 	id: number
 	iteration: number
-	ciphertext: Buffer
+	ciphertext: string | Buffer
 }
 
 export class SenderKeyMessage extends CiphertextMessage {
@@ -36,7 +36,9 @@ export class SenderKeyMessage extends CiphertextMessage {
 			this.messageVersion = (version & 0xff) >> 4
 			this.keyId = senderKeyMessage.id
 			this.iteration = senderKeyMessage.iteration
-			this.ciphertext = senderKeyMessage.ciphertext
+			this.ciphertext = typeof senderKeyMessage.ciphertext === 'string'
+				? Buffer.from(senderKeyMessage.ciphertext, 'base64')
+				: senderKeyMessage.ciphertext
 			this.signature = signature
 		} else {
 			const version = (((this.CURRENT_VERSION << 4) | this.CURRENT_VERSION) & 0xff) % 256