Mirroristas/openpgpjs
2
0
Fork 0
mirror of https://github.com/openpgpjs/openpgpjs.git synced 2025-06-10 16:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests: update expected algorithm preferences

Browse Source
This commit is contained in:
Daniel Huigens 2022-12-06 14:33:42 +01:00 committed by larabr
parent 2419e6b4c5
commit f21e327e69
1 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
test/general/key.js
View File

@ -2240,32 +2240,36 @@ VFBLG8uc9IiaKann/DYBAJcZNZHRSfpDoV2pUA5EAEi2MdjxkRysFQnYPRAu
function versionSpecificTests() { function versionSpecificTests() {
it('Preferences of generated key', function() { it('Preferences of generated key', function() {
const testPref = function(key) { const testPref = function(key) {
const selfSignature = openpgp.config.v6Keys ? key.directSignatures[0] : key.users[0].selfCertifications[0];
// key flags // key flags
const keyFlags = openpgp.enums.keyFlags; const keyFlags = openpgp.enums.keyFlags;
expect(key.users[0].selfCertifications[0].keyFlags[0] & keyFlags.certifyKeys).to.equal(keyFlags.certifyKeys); expect(selfSignature.keyFlags[0] & keyFlags.certifyKeys).to.equal(keyFlags.certifyKeys);
expect(key.users[0].selfCertifications[0].keyFlags[0] & keyFlags.signData).to.equal(keyFlags.signData); expect(selfSignature.keyFlags[0] & keyFlags.signData).to.equal(keyFlags.signData);
expect(key.subkeys[0].bindingSignatures[0].keyFlags[0] & keyFlags.encryptCommunication).to.equal(keyFlags.encryptCommunication); expect(key.subkeys[0].bindingSignatures[0].keyFlags[0] & keyFlags.encryptCommunication).to.equal(keyFlags.encryptCommunication);
expect(key.subkeys[0].bindingSignatures[0].keyFlags[0] & keyFlags.encryptStorage).to.equal(keyFlags.encryptStorage); expect(key.subkeys[0].bindingSignatures[0].keyFlags[0] & keyFlags.encryptStorage).to.equal(keyFlags.encryptStorage);
const sym = openpgp.enums.symmetric; const sym = openpgp.enums.symmetric;
expect(key.users[0].selfCertifications[0].preferredSymmetricAlgorithms).to.eql([sym.aes256, sym.aes128, sym.aes192]); expect(selfSignature.preferredSymmetricAlgorithms).to.eql([sym.aes256, sym.aes128]);
if (openpgp.config.aeadProtect) { if (openpgp.config.aeadProtect) {
const aead = openpgp.enums.aead; const aead = openpgp.enums.aead;
expect(key.users[0].selfCertifications[0].preferredAEADAlgorithms).to.eql([aead.eax, aead.ocb]); expect(selfSignature.preferredCipherSuites).to.eql([
[sym.aes256, aead.gcm],
[sym.aes128, aead.gcm],
[sym.aes256, aead.eax],
[sym.aes128, aead.eax],
[sym.aes256, aead.ocb],
[sym.aes128, aead.ocb]
]);
} }
const hash = openpgp.enums.hash; const hash = openpgp.enums.hash;
expect(key.users[0].selfCertifications[0].preferredHashAlgorithms).to.eql([hash.sha256, hash.sha512]); expect(selfSignature.preferredHashAlgorithms).to.eql([hash.sha256, hash.sha512]);
const compr = openpgp.enums.compression; const compr = openpgp.enums.compression;
expect(key.users[0].selfCertifications[0].preferredCompressionAlgorithms).to.eql([compr.uncompressed, compr.zlib, compr.zip]); expect(selfSignature.preferredCompressionAlgorithms).to.eql([compr.uncompressed]);
let expectedFeatures; let expectedFeatures = 0x01; // SEIPDv1
if (openpgp.config.v6Keys) { if (openpgp.config.aeadProtect) {
expectedFeatures = [7]; // v5 + aead + mdc expectedFeatures |= 0x08; // SEIPDv2
} else if (openpgp.config.aeadProtect) {
expectedFeatures = [3]; // aead + mdc
} else {
expectedFeatures = [1]; // mdc
} }
expect(key.users[0].selfCertifications[0].features).to.eql(expectedFeatures); expect(selfSignature.features).to.eql([expectedFeatures]);
}; };
const opt = { userIDs: { name: 'test', email: 'a@b.com' }, passphrase: 'hello', format: 'object' }; const opt = { userIDs: { name: 'test', email: 'a@b.com' }, passphrase: 'hello', format: 'object' };
return openpgp.generateKey(opt).then(async function({ privateKey, publicKey }) { return openpgp.generateKey(opt).then(async function({ privateKey, publicKey }) {
@ -2281,36 +2285,46 @@ function versionSpecificTests() {
const preferredAEADAlgorithmVal = openpgp.config.preferredAEADAlgorithm; const preferredAEADAlgorithmVal = openpgp.config.preferredAEADAlgorithm;
openpgp.config.preferredSymmetricAlgorithm = openpgp.enums.symmetric.aes192; openpgp.config.preferredSymmetricAlgorithm = openpgp.enums.symmetric.aes192;
openpgp.config.preferredHashAlgorithm = openpgp.enums.hash.sha224; openpgp.config.preferredHashAlgorithm = openpgp.enums.hash.sha224;
openpgp.config.preferredCompressionAlgorithm = openpgp.enums.compression.zip; openpgp.config.preferredCompressionAlgorithm = openpgp.enums.compression.zlib;
openpgp.config.preferredAEADAlgorithm = openpgp.enums.aead.experimentalGCM; openpgp.config.preferredAEADAlgorithm = openpgp.enums.aead.experimentalGCM;
const testPref = function(key) { const testPref = function(key) {
const selfSignature = openpgp.config.v6Keys ? key.directSignatures[0] : key.users[0].selfCertifications[0];
// key flags // key flags
const keyFlags = openpgp.enums.keyFlags; const keyFlags = openpgp.enums.keyFlags;
expect(key.users[0].selfCertifications[0].keyFlags[0] & keyFlags.certifyKeys).to.equal(keyFlags.certifyKeys); expect(selfSignature.keyFlags[0] & keyFlags.certifyKeys).to.equal(keyFlags.certifyKeys);
expect(key.users[0].selfCertifications[0].keyFlags[0] & keyFlags.signData).to.equal(keyFlags.signData); expect(selfSignature.keyFlags[0] & keyFlags.signData).to.equal(keyFlags.signData);
expect(key.subkeys[0].bindingSignatures[0].keyFlags[0] & keyFlags.encryptCommunication).to.equal(keyFlags.encryptCommunication); expect(key.subkeys[0].bindingSignatures[0].keyFlags[0] & keyFlags.encryptCommunication).to.equal(keyFlags.encryptCommunication);
expect(key.subkeys[0].bindingSignatures[0].keyFlags[0] & keyFlags.encryptStorage).to.equal(keyFlags.encryptStorage); expect(key.subkeys[0].bindingSignatures[0].keyFlags[0] & keyFlags.encryptStorage).to.equal(keyFlags.encryptStorage);
const sym = openpgp.enums.symmetric; const sym = openpgp.enums.symmetric;
expect(key.users[0].selfCertifications[0].preferredSymmetricAlgorithms).to.eql([sym.aes192, sym.aes256, sym.aes128]); expect(selfSignature.preferredSymmetricAlgorithms).to.eql([sym.aes192, sym.aes256, sym.aes128]);
if (openpgp.config.aeadProtect) { if (openpgp.config.aeadProtect) {
const aead = openpgp.enums.aead; const aead = openpgp.enums.aead;
expect(key.users[0].selfCertifications[0].preferredAEADAlgorithms).to.eql([aead.experimentalGCM, aead.eax, aead.ocb]); expect(selfSignature.preferredCipherSuites).to.eql([
[sym.aes192, aead.experimentalGCM],
[sym.aes256, aead.experimentalGCM],
[sym.aes128, aead.experimentalGCM],
[sym.aes192, aead.gcm],
[sym.aes256, aead.gcm],
[sym.aes128, aead.gcm],
[sym.aes192, aead.eax],
[sym.aes256, aead.eax],
[sym.aes128, aead.eax],
[sym.aes192, aead.ocb],
[sym.aes256, aead.ocb],
[sym.aes128, aead.ocb]
]);
} }
const hash = openpgp.enums.hash; const hash = openpgp.enums.hash;
expect(key.users[0].selfCertifications[0].preferredHashAlgorithms).to.eql([hash.sha224, hash.sha256, hash.sha512]); expect(selfSignature.preferredHashAlgorithms).to.eql([hash.sha224, hash.sha256, hash.sha512]);
const compr = openpgp.enums.compression; const compr = openpgp.enums.compression;
expect(key.users[0].selfCertifications[0].preferredCompressionAlgorithms).to.eql([compr.zip, compr.zlib, compr.uncompressed]); expect(selfSignature.preferredCompressionAlgorithms).to.eql([compr.zlib, compr.uncompressed]);
let expectedFeatures; let expectedFeatures = 0x01; // SEIPDv1
if (openpgp.config.v6Keys) { if (openpgp.config.aeadProtect) {
expectedFeatures = [7]; // v5 + aead + mdc expectedFeatures |= 0x08; // SEIPDv2
} else if (openpgp.config.aeadProtect) {
expectedFeatures = [3]; // aead + mdc
} else {
expectedFeatures = [1]; // mdc
} }
expect(key.users[0].selfCertifications[0].features).to.eql(expectedFeatures); expect(selfSignature.features).to.eql([expectedFeatures]);
}; };
const opt = { userIDs: { name: 'test', email: 'a@b.com' }, passphrase: 'hello', format: 'object' }; const opt = { userIDs: { name: 'test', email: 'a@b.com' }, passphrase: 'hello', format: 'object' };
try { try {