mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fix CDS lookup

Browse source
This commit is contained in:
Fedor Indutny 2021-07-15 16:17:22 -07:00 • committed by GitHub
parent 6607bc0bb5
commit 0fe68b57b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

36
ts/textsecure/WebAPI.ts
View file

@ -2441,30 +2441,24 @@ export function initialize({
const SGX_CONSTANTS = getSgxConstants(); const SGX_CONSTANTS = getSgxConstants();
const quote = Buffer.from(quoteArrayBuffer); const quote = Buffer.from(quoteArrayBuffer);
let off = 0; const quoteVersion = quote.readInt16LE(0) & 0xffff;
const quoteVersion = quote.readInt32LE(off) & 0xffff;
off += 4;
if (quoteVersion < 0 || quoteVersion > 2) { if (quoteVersion < 0 || quoteVersion > 2) {
throw new Error(`Unknown version ${quoteVersion}`); throw new Error(`Unknown version ${quoteVersion}`);
} }
const miscSelect = quote.slice(off, off + 64); const miscSelect = quote.slice(64, 64 + 4);
off += 64;
if (!miscSelect.every(byte => byte === 0)) { if (!miscSelect.every(byte => byte === 0)) {
throw new Error('Quote miscSelect invalid!'); throw new Error('Quote miscSelect invalid!');
} }
const reserved1 = quote.slice(off, off + 28); const reserved1 = quote.slice(68, 68 + 28);
off += 28;
if (!reserved1.every(byte => byte === 0)) { if (!reserved1.every(byte => byte === 0)) {
throw new Error('Quote reserved1 invalid!'); throw new Error('Quote reserved1 invalid!');
} }
const flags = Long.fromBytesLE( const flags = Long.fromBytesLE(
Array.from(quote.slice(off, off + 8).values()) Array.from(quote.slice(96, 96 + 8).values())
); );
off += 8;
if ( if (
flags.and(SGX_CONSTANTS.SGX_FLAGS_RESERVED).notEquals(0) || flags.and(SGX_CONSTANTS.SGX_FLAGS_RESERVED).notEquals(0) ||
flags.and(SGX_CONSTANTS.SGX_FLAGS_INITTED).equals(0) || flags.and(SGX_CONSTANTS.SGX_FLAGS_INITTED).equals(0) ||
@ -2474,28 +2468,24 @@ export function initialize({
} }
const xfrm = Long.fromBytesLE( const xfrm = Long.fromBytesLE(
Array.from(quote.slice(off, off + 8).values()) Array.from(quote.slice(104, 104 + 8).values())
); );
off += 8;
if (xfrm.and(SGX_CONSTANTS.SGX_XFRM_RESERVED).notEquals(0)) { if (xfrm.and(SGX_CONSTANTS.SGX_XFRM_RESERVED).notEquals(0)) {
throw new Error(`Quote xfrm invalid ${xfrm}`); throw new Error(`Quote xfrm invalid ${xfrm}`);
} }
const mrenclave = quote.slice(off, off + 32); const mrenclave = quote.slice(112, 112 + 32);
off += 32;
const enclaveIdBytes = Bytes.fromHex(directoryEnclaveId); const enclaveIdBytes = Bytes.fromHex(directoryEnclaveId);
if (mrenclave.compare(enclaveIdBytes) !== 0) { if (mrenclave.compare(enclaveIdBytes) !== 0) {
throw new Error('Quote mrenclave invalid!'); throw new Error('Quote mrenclave invalid!');
} }
const reserved2 = quote.slice(off, off + 32); const reserved2 = quote.slice(144, 144 + 32);
off += 32;
if (!reserved2.every(byte => byte === 0)) { if (!reserved2.every(byte => byte === 0)) {
throw new Error('Quote reserved2 invalid!'); throw new Error('Quote reserved2 invalid!');
} }
const reportData = quote.slice(off, off + 64); const reportData = quote.slice(368, 368 + 64);
off += 64;
const serverStaticPublicBytes = new Uint8Array(serverStaticPublic); const serverStaticPublicBytes = new Uint8Array(serverStaticPublic);
if ( if (
!reportData.every((byte, index) => { !reportData.every((byte, index) => {
@ -2508,26 +2498,22 @@ export function initialize({
throw new Error('Quote report_data invalid!'); throw new Error('Quote report_data invalid!');
} }
const reserved3 = quote.slice(off, off + 96); const reserved3 = quote.slice(208, 208 + 96);
off += 96;
if (!reserved3.every(byte => byte === 0)) { if (!reserved3.every(byte => byte === 0)) {
throw new Error('Quote reserved3 invalid!'); throw new Error('Quote reserved3 invalid!');
} }
const reserved4 = quote.slice(off, off + 60); const reserved4 = quote.slice(308, 308 + 60);
off += 60;
if (!reserved4.every(byte => byte === 0)) { if (!reserved4.every(byte => byte === 0)) {
throw new Error('Quote reserved4 invalid!'); throw new Error('Quote reserved4 invalid!');
} }
const signatureLength = quote.readInt32LE(432) >>> 0; const signatureLength = quote.readInt32LE(432) >>> 0;
off += 4;
if (signatureLength !== quote.byteLength - 436) { if (signatureLength !== quote.byteLength - 436) {
throw new Error(`Bad signatureLength ${signatureLength}`); throw new Error(`Bad signatureLength ${signatureLength}`);
} }
// const signature = quote.slice(off, signatureLength); // const signature = quote.slice(436, 436 + signatureLength);
// off += signatureLength
} }
function validateAttestationSignatureBody( function validateAttestationSignatureBody(