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

Jump to bottom

[v5] Remove SHA-1 defaults #1067

Merged
merged 1 commit into from Mar 26, 2020
Merged

[v5] Remove SHA-1 defaults #1067

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/key/factory.js
View file
Open in desktop
Expand Up @@ -191,10 +191,9 @@ async function wrapKeyObject(secretKeyPacket, secretSubkeyPackets, options) {
], config.aead_mode);
}
signaturePacket.preferredHashAlgorithms = createdPreferredAlgos([
// prefer fast asm.js implementations (SHA-256). SHA-1 will not be secure much longer...move to bottom of list
// prefer fast asm.js implementations (SHA-256)
enums.hash.sha256,
enums.hash.sha512,
enums.hash.sha1
enums.hash.sha512
], config.prefer_hash_algorithm);
signaturePacket.preferredCompressionAlgorithms = createdPreferredAlgos([
enums.compression.zlib,
Expand Down
6 changes: 2 additions & 4 deletions src/type/kdf_params.js
View file
Open in desktop
Expand Up @@ -27,8 +27,6 @@
* @module type/kdf_params
*/

import enums from '../enums.js';

/**
* @constructor
* @param {enums.hash} hash Hash algorithm
Expand All @@ -39,8 +37,8 @@ function KDFParams(data) {
this.hash = data[0];
this.cipher = data[1];
} else {
this.hash = enums.hash.sha1;
this.cipher = enums.symmetric.aes128;
this.hash = null;
this.cipher = null;
}
}

Expand Down
4 changes: 2 additions & 2 deletions test/general/key.js
View file
Open in desktop
Expand Up @@ -1820,7 +1820,7 @@ function versionSpecificTests() {
expect(key.users[0].selfCertifications[0].preferredAeadAlgorithms).to.eql([aead.eax, aead.ocb]);
}
const hash = openpgp.enums.hash;
expect(key.users[0].selfCertifications[0].preferredHashAlgorithms).to.eql([hash.sha256, hash.sha512, hash.sha1]);
expect(key.users[0].selfCertifications[0].preferredHashAlgorithms).to.eql([hash.sha256, hash.sha512]);
const compr = openpgp.enums.compression;
expect(key.users[0].selfCertifications[0].preferredCompressionAlgorithms).to.eql([compr.zlib, compr.zip, compr.uncompressed]);
expect(key.users[0].selfCertifications[0].features).to.eql(openpgp.config.v5_keys ? [7] : [1]);
Expand Down Expand Up @@ -1862,7 +1862,7 @@ function versionSpecificTests() {
expect(key.users[0].selfCertifications[0].preferredAeadAlgorithms).to.eql([aead.experimental_gcm, aead.eax, aead.ocb]);
}
const hash = openpgp.enums.hash;
expect(key.users[0].selfCertifications[0].preferredHashAlgorithms).to.eql([hash.sha224, hash.sha256, hash.sha512, hash.sha1]);
expect(key.users[0].selfCertifications[0].preferredHashAlgorithms).to.eql([hash.sha224, hash.sha256, hash.sha512]);
const compr = openpgp.enums.compression;
expect(key.users[0].selfCertifications[0].preferredCompressionAlgorithms).to.eql([compr.zlib, compr.zip, compr.uncompressed]);
expect(key.users[0].selfCertifications[0].features).to.eql(openpgp.config.v5_keys ? [7] : [1]);
Expand Down