Skip to content

Commit d36f42d

Browse files
authored
Merge pull request #251
Bump the dev-dependencies group with 8 updates
2 parents 664fe02 + 83c8f59 commit d36f42d

File tree

4 files changed

+187
-169
lines changed

4 files changed

+187
-169
lines changed

lib/crypto/argon2.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export interface Argon2Options {
99
password: string,
1010
salt: Uint8Array<ArrayBuffer>,
1111
/** see https://www.rfc-editor.org/rfc/rfc9106.html#name-parameter-choice */
12-
params: Argon2Params
12+
params?: Argon2Params
1313
}
1414

1515
// We manually reload the module if no memory-heavy (128MB+) argon2 computation has been requested in a while,

lib/message/processMIME.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ const verifySignature = async (
4141
if (parts.length < 3) {
4242
return { subdata: data, verificationStatus: VERIFICATION_STATUS.NOT_SIGNED, signatures: [] };
4343
}
44-
const { attachments: [sigAttachment] = [] } = await parseMail(parts[2].trim());
45-
const { contentType: sigAttachmentContentType = '', content: sigAttachmentContent = new Uint8Array() } = sigAttachment ?? {};
44+
const { attachments: [sigAttachment] } = await parseMail(parts[2].trim());
45+
const { contentType: sigAttachmentContentType = '', content: sigAttachmentContent = new Uint8Array() } = (
46+
sigAttachment as Attachment | undefined /** explicit typing needed due to TS inference limitation with array destructuring */
47+
) ?? {};
4648
if (sigAttachmentContentType.toLowerCase() !== 'application/pgp-signature') {
4749
return { subdata: data, verificationStatus: VERIFICATION_STATUS.NOT_SIGNED, signatures: [] };
4850
}
@@ -93,7 +95,7 @@ const parse = async (
9395
signatures: OpenPGPSignature[] = []
9496
): Promise<ProcessMIMEResult> => {
9597
// cf. https://github.com/autocrypt/memoryhole subject can be in the MIME headers
96-
const { attachments: parsedAttachments = [], body: { text = '', html = '' }, subject: mimeSubject = '' } = await parseMail(mailContent);
98+
const { attachments: parsedAttachments, body: { text, html }, subject: mimeSubject = '' } = await parseMail(mailContent);
9799

98100
// normalise attachments and look for encrypted subject
99101
let encryptedSubjectHeader;

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@
3535
"openpgp": "npm:@protontech/openpgp@~6.2.2"
3636
},
3737
"devDependencies": {
38-
"@eslint/js": "^9.39.1",
38+
"@eslint/js": "^9.39.2",
3939
"@protontech/eslint-plugin-enforce-uint8array-arraybuffer": "^2.0.0",
4040
"@stylistic/eslint-plugin": "^5.6.1",
4141
"@types/bn.js": "^5.2.0",
4242
"@types/chai": "^5.2.2",
4343
"@types/chai-as-promised": "^8.0.2",
4444
"@types/elliptic": "^6.4.18",
4545
"@types/mocha": "^9.1.1",
46-
"@types/sinon": "^17.0.4",
46+
"@types/sinon": "^21.0.0",
4747
"@types/webpack-env": "^1.18.8",
48-
"@typescript-eslint/eslint-plugin": "^8.48.0",
48+
"@typescript-eslint/eslint-plugin": "^8.50.1",
4949
"bn.js": "^5.2.2",
50-
"chai": "^6.2.1",
50+
"chai": "^6.2.2",
5151
"chai-as-promised": "^8.0.2",
5252
"elliptic": "^6.6.1",
53-
"eslint": "^9.39.1",
53+
"eslint": "^9.39.2",
5454
"eslint-import-resolver-typescript": "^4.4.4",
5555
"eslint-plugin-chai-friendly": "^1.1.0",
5656
"eslint-plugin-import": "^2.32.0",
@@ -63,12 +63,12 @@
6363
"karma-webpack": "^5.0.1",
6464
"mocha": "^11.7.5",
6565
"playwright": "^1.57.0",
66-
"sinon": "^21.0.0",
66+
"sinon": "^21.0.1",
6767
"ts-loader": "^9.5.4",
6868
"typescript": "^5.9.3",
69-
"typescript-eslint": "^8.48.0",
69+
"typescript-eslint": "^8.50.1",
7070
"web-streams-polyfill": "^3.3.3",
71-
"webpack": "^5.103.0",
71+
"webpack": "^5.104.1",
7272
"webpack-cli": "^6.0.1"
7373
},
7474
"packageManager": "yarn@4.10.2",

0 commit comments

Comments
 (0)