mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 20:38:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4128 from matrix-org/travis/dont-prefix-length

Browse source 
Don't prefix QR codes with the length of the static marker string
This commit is contained in:
Travis Ralston 2020-02-26 12:07:24 -07:00 committed by GitHub
commit 49ec79515c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/elements/crypto/VerificationQRCode.js
View file

@ -130,9 +130,9 @@ export default class VerificationQRCode extends React.PureComponent {
tmpBuf.writeInt8(i, 0);
buf = Buffer.concat([buf, tmpBuf]);
};
const appendStr = (s: string, enc: string) => {
const appendStr = (s: string, enc: string, withLengthPrefix = true) => {
const tmpBuf = Buffer.from(s, enc);
appendInt(tmpBuf.byteLength);
if (withLengthPrefix) appendInt(tmpBuf.byteLength);
buf = Buffer.concat([buf, tmpBuf]);
};
const appendEncBase64 = (b64: string) => {
@ -142,7 +142,7 @@ export default class VerificationQRCode extends React.PureComponent {
};
// Actually build the buffer for the QR code
appendStr(this.props.prefix, "ascii");
appendStr(this.props.prefix, "ascii", false);
appendByte(this.props.version);
appendByte(this.props.mode);
appendStr(this.props.transactionId, "utf-8");