From 6a607c7567baab3e5c03c0b268f2ef7e4a555920 Mon Sep 17 00:00:00 2001 From: Daniel Huigens Date: Tue, 9 Jun 2020 18:43:34 +0200 Subject: [PATCH] Rename SymEncryptedAEADProtectedDataPacket to AEADEncryptedDataPacket --- src/enums.js | 2 +- src/message.js | 8 ++++---- ...ad_protected_data.js => aead_encrypted_data.js} | 6 +++--- src/packet/all_packets.js | 6 +++--- src/packet/packet.js | 2 +- test/general/openpgp.js | 12 ++++++------ test/general/packet.js | 14 +++++++------- 7 files changed, 25 insertions(+), 25 deletions(-) rename src/packet/{sym_encrypted_aead_protected_data.js => aead_encrypted_data.js} (98%) diff --git a/src/enums.js b/src/enums.js index 48b8a76a..530a8383 100644 --- a/src/enums.js +++ b/src/enums.js @@ -206,7 +206,7 @@ export default { userAttribute: 17, symEncryptedIntegrityProtectedData: 18, modificationDetectionCode: 19, - symEncryptedAEADProtectedData: 20 // see IETF draft: https://tools.ietf.org/html/draft-ford-openpgp-format-00#section-2.1 + AEADEncryptedData: 20 // see IETF draft: https://tools.ietf.org/html/draft-ford-openpgp-format-00#section-2.1 }, /** Data types in the literal packet diff --git a/src/message.js b/src/message.js index d727a1d8..cfd9df61 100644 --- a/src/message.js +++ b/src/message.js @@ -40,7 +40,7 @@ import { PacketList, LiteralDataPacket, CompressedDataPacket, - SymEncryptedAEADProtectedDataPacket, + AEADEncryptedDataPacket, SymEncryptedIntegrityProtectedDataPacket, SymmetricallyEncryptedDataPacket, PublicKeyEncryptedSessionKeyPacket, @@ -115,7 +115,7 @@ export class Message { const symEncryptedPacketlist = this.packets.filterByTag( enums.packet.symmetricallyEncryptedData, enums.packet.symEncryptedIntegrityProtectedData, - enums.packet.symEncryptedAEADProtectedData + enums.packet.AEADEncryptedData ); if (symEncryptedPacketlist.length === 0) { @@ -333,7 +333,7 @@ export class Message { let symEncryptedPacket; if (aeadAlgorithm) { - symEncryptedPacket = new SymEncryptedAEADProtectedDataPacket(); + symEncryptedPacket = new AEADEncryptedDataPacket(); symEncryptedPacket.aeadAlgorithm = aeadAlgorithm; } else if (config.integrityProtect) { symEncryptedPacket = new SymEncryptedIntegrityProtectedDataPacket(); @@ -780,7 +780,7 @@ export async function read(input, fromStream = util.isStream(input)) { await packetlist.read(input, { LiteralDataPacket, CompressedDataPacket, - SymEncryptedAEADProtectedDataPacket, + AEADEncryptedDataPacket, SymEncryptedIntegrityProtectedDataPacket, SymmetricallyEncryptedDataPacket, PublicKeyEncryptedSessionKeyPacket, diff --git a/src/packet/sym_encrypted_aead_protected_data.js b/src/packet/aead_encrypted_data.js similarity index 98% rename from src/packet/sym_encrypted_aead_protected_data.js rename to src/packet/aead_encrypted_data.js index 8fff667e..51f0ae64 100644 --- a/src/packet/sym_encrypted_aead_protected_data.js +++ b/src/packet/aead_encrypted_data.js @@ -46,9 +46,9 @@ const VERSION = 1; // A one-octet version number of the data packet. * AEAD Protected Data Packet * @memberof module:packet */ -class SymEncryptedAEADProtectedDataPacket { +class AEADEncryptedDataPacket { constructor() { - this.tag = enums.packet.symEncryptedAEADProtectedData; + this.tag = enums.packet.AEADEncryptedData; this.version = VERSION; this.cipherAlgo = null; this.aeadAlgorithm = 'eax'; @@ -199,4 +199,4 @@ class SymEncryptedAEADProtectedDataPacket { } } -export default SymEncryptedAEADProtectedDataPacket; +export default AEADEncryptedDataPacket; diff --git a/src/packet/all_packets.js b/src/packet/all_packets.js index 26043264..1cfacb87 100644 --- a/src/packet/all_packets.js +++ b/src/packet/all_packets.js @@ -13,9 +13,9 @@ export { default as SymEncryptedIntegrityProtectedDataPacket } from './sym_encrypted_integrity_protected_data.js'; export { - /** @see SymEncryptedAEADProtectedDataPacket */ - default as SymEncryptedAEADProtectedDataPacket -} from './sym_encrypted_aead_protected_data.js'; + /** @see AEADEncryptedDataPacket */ + default as AEADEncryptedDataPacket +} from './aead_encrypted_data.js'; export { /** @see PublicKeyEncryptedSessionKeyPacket */ default as PublicKeyEncryptedSessionKeyPacket diff --git a/src/packet/packet.js b/src/packet/packet.js index 9ad2383d..45c329bc 100644 --- a/src/packet/packet.js +++ b/src/packet/packet.js @@ -109,7 +109,7 @@ export default { enums.packet.compressedData, enums.packet.symmetricallyEncryptedData, enums.packet.symEncryptedIntegrityProtectedData, - enums.packet.symEncryptedAEADProtectedData + enums.packet.AEADEncryptedData ].includes(tag_type); }, diff --git a/test/general/openpgp.js b/test/general/openpgp.js index 0a622254..e71a6b8f 100644 --- a/test/general/openpgp.js +++ b/test/general/openpgp.js @@ -1080,7 +1080,7 @@ module.exports = () => describe('OpenPGP.js public api tests', function() { return openpgp.encrypt(encOpt).then(async function (encrypted) { expect(encrypted).to.match(/^-----BEGIN PGP MESSAGE/); decOpt.message = await openpgp.message.readArmored(encrypted); - expect(!!decOpt.message.packets.findPacket(openpgp.enums.packet.symEncryptedAEADProtectedData)).to.equal(false); + expect(!!decOpt.message.packets.findPacket(openpgp.enums.packet.AEADEncryptedData)).to.equal(false); return openpgp.decrypt(decOpt); }).then(function (decrypted) { expect(decrypted.data).to.equal(plaintext); @@ -1103,7 +1103,7 @@ module.exports = () => describe('OpenPGP.js public api tests', function() { return openpgp.encrypt(encOpt).then(async function (encrypted) { expect(encrypted).to.match(/^-----BEGIN PGP MESSAGE/); decOpt.message = await openpgp.message.readArmored(encrypted); - expect(!!decOpt.message.packets.findPacket(openpgp.enums.packet.symEncryptedAEADProtectedData)).to.equal(false); + expect(!!decOpt.message.packets.findPacket(openpgp.enums.packet.AEADEncryptedData)).to.equal(false); return openpgp.decrypt(decOpt); }).then(function (decrypted) { expect(decrypted.data).to.equal(plaintext); @@ -1122,7 +1122,7 @@ module.exports = () => describe('OpenPGP.js public api tests', function() { }; return openpgp.encrypt(encOpt).then(async function (encrypted) { decOpt.message = await openpgp.message.readArmored(encrypted); - expect(!!decOpt.message.packets.findPacket(openpgp.enums.packet.symEncryptedAEADProtectedData)).to.equal(openpgp.config.aeadProtect); + expect(!!decOpt.message.packets.findPacket(openpgp.enums.packet.AEADEncryptedData)).to.equal(openpgp.config.aeadProtect); return openpgp.decrypt(decOpt); }).then(async function (decrypted) { expect(decrypted.data).to.equal(plaintext); @@ -1145,7 +1145,7 @@ module.exports = () => describe('OpenPGP.js public api tests', function() { }; return openpgp.encrypt(encOpt).then(async function (encrypted) { decOpt.message = await openpgp.message.readArmored(encrypted); - expect(!!decOpt.message.packets.findPacket(openpgp.enums.packet.symEncryptedAEADProtectedData)).to.equal(false); + expect(!!decOpt.message.packets.findPacket(openpgp.enums.packet.AEADEncryptedData)).to.equal(false); return openpgp.decrypt(decOpt); }).then(async function (decrypted) { expect(decrypted.data).to.equal(plaintext); @@ -1176,7 +1176,7 @@ module.exports = () => describe('OpenPGP.js public api tests', function() { }; return openpgp.encrypt(encOpt).then(async function (encrypted) { decOpt.message = await openpgp.message.readArmored(encrypted); - expect(!!decOpt.message.packets.findPacket(openpgp.enums.packet.symEncryptedAEADProtectedData)).to.equal(openpgp.config.aeadProtect); + expect(!!decOpt.message.packets.findPacket(openpgp.enums.packet.AEADEncryptedData)).to.equal(openpgp.config.aeadProtect); return openpgp.decrypt(decOpt); }).then(async function (decrypted) { expect(decrypted.data).to.equal(plaintext); @@ -1205,7 +1205,7 @@ module.exports = () => describe('OpenPGP.js public api tests', function() { detached: true }); const message = await openpgp.message.readArmored(encrypted); - expect(!!message.packets.findPacket(openpgp.enums.packet.symEncryptedAEADProtectedData)).to.equal(openpgp.config.aeadProtect); + expect(!!message.packets.findPacket(openpgp.enums.packet.AEADEncryptedData)).to.equal(openpgp.config.aeadProtect); const decrypted = await openpgp.decrypt({ message, signature: await openpgp.signature.readArmored(signed), diff --git a/test/general/packet.js b/test/general/packet.js index 929fb4c3..647048b9 100644 --- a/test/general/packet.js +++ b/test/general/packet.js @@ -133,7 +133,7 @@ module.exports = () => describe("Packet", function() { const algo = 'aes256'; const testText = input.createSomeMessage(); const literal = new openpgp.LiteralDataPacket(); - const enc = new openpgp.SymEncryptedAEADProtectedDataPacket(); + const enc = new openpgp.AEADEncryptedDataPacket(); const msg = new openpgp.PacketList(); msg.push(enc); @@ -159,7 +159,7 @@ module.exports = () => describe("Packet", function() { const algo = 'aes256'; const literal = new openpgp.LiteralDataPacket(); - const enc = new openpgp.SymEncryptedAEADProtectedDataPacket(); + const enc = new openpgp.AEADEncryptedDataPacket(); const msg = new openpgp.PacketList(); msg.push(enc); @@ -214,7 +214,7 @@ module.exports = () => describe("Packet", function() { const algo = 'aes256'; const literal = new openpgp.LiteralDataPacket(); - const enc = new openpgp.SymEncryptedAEADProtectedDataPacket(); + const enc = new openpgp.AEADEncryptedDataPacket(); const msg = new openpgp.PacketList(); enc.aeadAlgorithm = 'experimentalGcm'; @@ -260,7 +260,7 @@ module.exports = () => describe("Packet", function() { const algo = 'aes128'; const literal = new openpgp.LiteralDataPacket(0); - const enc = new openpgp.SymEncryptedAEADProtectedDataPacket(); + const enc = new openpgp.AEADEncryptedDataPacket(); const msg = new openpgp.PacketList(); msg.push(enc); @@ -497,7 +497,7 @@ module.exports = () => describe("Packet", function() { const literal = new openpgp.LiteralDataPacket(); const key_enc = new openpgp.SymEncryptedSessionKeyPacket(); - const enc = new openpgp.SymEncryptedAEADProtectedDataPacket(); + const enc = new openpgp.AEADEncryptedDataPacket(); const msg = new openpgp.PacketList(); msg.push(key_enc); @@ -565,7 +565,7 @@ module.exports = () => describe("Packet", function() { const literal = new openpgp.LiteralDataPacket(0); const key_enc = new openpgp.SymEncryptedSessionKeyPacket(); - const enc = new openpgp.SymEncryptedAEADProtectedDataPacket(); + const enc = new openpgp.AEADEncryptedDataPacket(); const msg = new openpgp.PacketList(); msg.push(key_enc); @@ -640,7 +640,7 @@ module.exports = () => describe("Packet", function() { const literal = new openpgp.LiteralDataPacket(0); const key_enc = new openpgp.SymEncryptedSessionKeyPacket(); - const enc = new openpgp.SymEncryptedAEADProtectedDataPacket(); + const enc = new openpgp.AEADEncryptedDataPacket(); const msg = new openpgp.PacketList(); enc.aeadAlgorithm = key_enc.aeadAlgorithm = 'ocb';