Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Buffer with Uint8Array in js browser bundle #685

Merged
merged 1 commit into from
Dec 5, 2024
Merged

Replace Buffer with Uint8Array in js browser bundle #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions sdk/javascript/packages/core/src/browser/browserPlatform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ const exportPublicKey = async (keyId: string, storage: KeyValueStorage): Promise
}

// derived from https://github.com/litert/signatures.js
const p1363ToDER = (p1363: Buffer): Buffer => {
const p1363ToDER = (p1363: Uint8Array): Uint8Array => {

const ecdsaRecoverRS = (input: Buffer): Buffer => {
const ecdsaRecoverRS = (input: Uint8Array): Uint8Array => {
let start: number = 0
while (input[start] === 0) {
start++
Expand All @@ -127,15 +127,15 @@ const p1363ToDER = (p1363: Buffer): Buffer => {
if (start > 0) {
return input.slice(start - 1)
}
const output = Buffer.alloc(input.length + 1)
input.copy(output, 1)
const output = new Uint8Array(input.length + 1)
output[0] = 0
output.set(input, 1)
return output
}

let base = 0
let r: Buffer
let s: Buffer
let r: Uint8Array
let s: Uint8Array
const hL = p1363.length / 2
/**
* Prepend a 0x00 byte to R or S if it starts with a byte larger than 0x79.
Expand All @@ -154,7 +154,7 @@ const p1363ToDER = (p1363: Buffer): Buffer => {
if (4 + s.length + r.length > 0x7f) {
base++
}
const der = Buffer.alloc(base + 6 + s.length + r.length)
const der = new Uint8Array(base + 6 + s.length + r.length)
if (base) {
der[1] = 0x81
}
Expand All @@ -163,8 +163,9 @@ const p1363ToDER = (p1363: Buffer): Buffer => {
der[base + r.length + 4] = der[base + 2] = 0x02
der[base + r.length + 5] = s.length
der[base + 3] = r.length
r.copy(der, base + 4)
s.copy(der, base + 6 + r.length)

der.set(r, base + 4)
der.set(s, base + 6 + r.length)
return der
}

Expand All @@ -174,7 +175,7 @@ const sign = async (data: Uint8Array, keyId: string, storage: KeyValueStorage):
name: 'ECDSA',
hash: 'SHA-256'
}, privateKey, data)
return new Uint8Array(p1363ToDER(Buffer.from(signature)))
return new Uint8Array(p1363ToDER(new Uint8Array(signature)))
}

const importKey = async (keyId: string, key: Uint8Array, storage?: KeyValueStorage): Promise<void> => {
Expand Down
2 changes: 1 addition & 1 deletion sdk/javascript/packages/core/src/browser/localConfigStorage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export function createCachingFunction(storage: KeyValueStorage): (url: string, t
Authorization: `Signature ${platform.bytesToBase64(payload.signature)}`
})
if (response.statusCode == 200) {
await storage.saveBytes('cache', Buffer.concat([transmissionKey.key, response.data]))
await storage.saveBytes('cache', new Uint8Array([...transmissionKey.key, ...response.data]))
}
return response
} catch (e) {
Expand Down
Loading