Mirroristas/openpgpjs
2
0
Fork 0
mirror of https://github.com/openpgpjs/openpgpjs.git synced 2025-11-24 06:25:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump armored message line length to 64 characters

Browse Source 
For consistency with most other implementations.
This commit is contained in:
Daniel Huigens 2025-08-21 13:02:29 +02:00
parent 0a92baf8ba
commit f412841b4e
No known key found for this signature in database
GPG Key ID: CB064A128FA90686
2 changed files with 47 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/encoding/base64.js
View File

@ -44,12 +44,12 @@ export function encode(data) {
return streamTransform(data, value => { return streamTransform(data, value => {
buf = util.concatUint8Array([buf, value]); buf = util.concatUint8Array([buf, value]);
const r = []; const r = [];
const bytesPerLine = 45; // 60 chars per line * (3 bytes / 4 chars of base64). const bytesPerLine = 48; // 64 chars per line * (3 bytes / 4 chars of base64).
const lines = Math.floor(buf.length / bytesPerLine); const lines = Math.floor(buf.length / bytesPerLine);
const bytes = lines * bytesPerLine; const bytes = lines * bytesPerLine;
const encoded = encodeChunk(buf.subarray(0, bytes)); const encoded = encodeChunk(buf.subarray(0, bytes));
for (let i = 0; i < lines; i++) { for (let i = 0; i < lines; i++) {
r.push(encoded.substr(i * 60, 60)); r.push(encoded.substr(i * 64, 64));
r.push('\n'); r.push('\n');
} }
buf = buf.subarray(bytes); buf = buf.subarray(bytes);

93
test/general/armor.js
View File

@ -292,54 +292,51 @@ export default () => describe('ASCII armor', function() {
it('Do not add extraneous blank line when base64 ends on line break', async function () { it('Do not add extraneous blank line when base64 ends on line break', async function () {
const pubKey = `-----BEGIN PGP PUBLIC KEY BLOCK----- const pubKey = `-----BEGIN PGP PUBLIC KEY BLOCK-----
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
-----END PGP PUBLIC KEY BLOCK----- -----END PGP PUBLIC KEY BLOCK-----