Skip to content

Refactor: replace deprecated 'binary' encoding with Buffer #678

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Refactor: replace deprecated 'binary' encoding with Buffer #678

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98d14a3
Refactor: replace deprecated 'binary' encoding with Buffer
c3retc3 Jun 4, 2025
a7936e9
Update aes_transit_crypto.ts
c3retc3 Jun 4, 2025
40edefb
Merge branch 'master' into patch-1
c3retc3 Jun 8, 2025
ff84bd1
Merge branch 'master' into patch-1
c3retc3 Jun 15, 2025
33c9e06
Merge branch 'master' into patch-1
c3retc3 Jun 19, 2025
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
13 changes: 7 additions & 6 deletions src/crypto/aes_transit_crypto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export class AESTransitCrypto implements CryptoProvider {
cipherText = b64.escape(cipherText)

const masterCipher = crypto.createCipheriv(this.ALGORITHM, masterbuffer, iv)
let encDataKey = masterCipher.update(dataKey.toString("binary"), "binary", "base64")
let encDataKey = masterCipher.update(dataKey, undefined, "base64")
encDataKey += masterCipher.final("base64")
encDataKey = b64.escape(encDataKey)

Expand Down Expand Up @@ -48,11 +48,12 @@ export class AESTransitCrypto implements CryptoProvider {
const offset = keySize + ivSize + 7
const encDataKey = b64.unescape(ciphertext.substring(7 + ivSize, offset))
const masterCipher = crypto.createDecipheriv(this.ALGORITHM, masterBuffer, iv)

// Decrypt dataKey and reassign to a Buffer to decrypt the data
let dataKey = masterCipher.update(encDataKey, "base64", "binary")
dataKey += masterCipher.final("binary")
const byteKey = Buffer.from(dataKey, "binary")

// Decrypt dataKey directly into a Buffer
const decryptedKeyChunks: Buffer[] = [];
decryptedKeyChunks.push(masterCipher.update(encDataKey, "base64"));
decryptedKeyChunks.push(masterCipher.final());
const byteKey = Buffer.concat(decryptedKeyChunks)

const cipher = crypto.createDecipheriv(this.ALGORITHM, byteKey, iv)
let cipherText = cipher.update(b64.unescape(ciphertext.substring(offset)), "base64", "utf8")
Expand Down