Merge pull request #1236 from matrix-org/travis/unpadded-qr-codes

Use unpadded base64 for QR code secrets
matrix-org · Feb 28, 2020 · 03752ab · 03752ab
2 parents 7203542 + 4510eb6
commit 03752ab
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/crypto/olmlib.js b/src/crypto/olmlib.js
@@ -407,6 +407,15 @@ export function encodeBase64(uint8Array) {
     return Buffer.from(uint8Array).toString("base64");
 }
 
+/**
+ * Encode a typed array of uint8 as unpadded base64.
+ * @param {Uint8Array} uint8Array The data to encode.
+ * @return {string} The unpadded base64.
+ */
+export function encodeUnpaddedBase64(uint8Array) {
+    return encodeBase64(uint8Array).replace(/=+$/g, '');
+}
+
 /**
  * Decode a base64 string to a typed array of uint8.
  * @param {string} base64 The base64 to decode.

diff --git a/src/crypto/verification/request/VerificationRequest.js b/src/crypto/verification/request/VerificationRequest.js
@@ -413,7 +413,7 @@ export class VerificationRequest extends EventEmitter {
     _generateSharedSecret() {
         const secretBytes = new Uint8Array(8);
         global.crypto.getRandomValues(secretBytes);
-        this._sharedSecret = olmlib.encodeBase64(secretBytes);
+        this._sharedSecret = olmlib.encodeUnpaddedBase64(secretBytes);
     }
 
     /**