From 926047f0b3e55467f059f90afa85282dde5db812 Mon Sep 17 00:00:00 2001
From: Daniel Huigens <d.huigens@protonmail.com>
Date: Mon, 17 Dec 2018 11:54:25 -0500
Subject: [PATCH] Default to RFC4880bis-mandated symmetric algos

---
 src/key.js          |  2 +-
 test/general/key.js | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/key.js b/src/key.js
index b43450df..a7b83c66 100644
--- a/src/key.js
+++ b/src/key.js
@@ -1690,7 +1690,7 @@ export async function getPreferredHashAlgo(key, keyPacket, date=new Date(), user
  */
 export async function getPreferredAlgo(type, keys, date=new Date(), userId={}) {
   const prefProperty = type === 'symmetric' ? 'preferredSymmetricAlgorithms' : 'preferredAeadAlgorithms';
-  const defaultAlgo = type === 'symmetric' ? config.encryption_cipher : config.aead_mode;
+  const defaultAlgo = type === 'symmetric' ? enums.symmetric.aes128 : enums.aead.eax;
   const prioMap = {};
   await Promise.all(keys.map(async function(key) {
     const primaryUser = await key.getPrimaryUser(date, userId);
diff --git a/test/general/key.js b/test/general/key.js
index a2ce51a3..9734b3aa 100644
--- a/test/general/key.js
+++ b/test/general/key.js
@@ -2147,14 +2147,14 @@ describe('Key', function() {
     expect(prefAlgo).to.equal(openpgp.enums.symmetric.aes256);
   });
 
-  it("getPreferredAlgo('symmetric') - two key - AES128", async function() {
+  it("getPreferredAlgo('symmetric') - two key - AES192", async function() {
     const keys = (await openpgp.key.readArmored(twoKeys)).keys;
     const key1 = keys[0];
     const key2 = keys[1];
     const primaryUser = await key2.getPrimaryUser();
-    primaryUser.selfCertification.preferredSymmetricAlgorithms = [6,7,3];
+    primaryUser.selfCertification.preferredSymmetricAlgorithms = [6,8,3];
     const prefAlgo = await openpgp.key.getPreferredAlgo('symmetric', [key1, key2]);
-    expect(prefAlgo).to.equal(openpgp.enums.symmetric.aes128);
+    expect(prefAlgo).to.equal(openpgp.enums.symmetric.aes192);
   });
 
   it("getPreferredAlgo('symmetric') - two key - one without pref", async function() {
@@ -2164,7 +2164,7 @@ describe('Key', function() {
     const primaryUser = await key2.getPrimaryUser();
     primaryUser.selfCertification.preferredSymmetricAlgorithms = null;
     const prefAlgo = await openpgp.key.getPreferredAlgo('symmetric', [key1, key2]);
-    expect(prefAlgo).to.equal(openpgp.config.encryption_cipher);
+    expect(prefAlgo).to.equal(openpgp.enums.symmetric.aes128);
   });
 
   it("getPreferredAlgo('aead') - one key - OCB", async function() {
@@ -2188,7 +2188,7 @@ describe('Key', function() {
     const primaryUser2 = await key2.getPrimaryUser();
     primaryUser2.selfCertification.features = [7]; // Monkey-patch AEAD feature flag
     const prefAlgo = await openpgp.key.getPreferredAlgo('aead', [key1, key2]);
-    expect(prefAlgo).to.equal(openpgp.config.aead_mode);
+    expect(prefAlgo).to.equal(openpgp.enums.aead.eax);
     const supported = await openpgp.key.isAeadSupported([key1, key2]);
     expect(supported).to.be.true;
   });
@@ -2201,7 +2201,7 @@ describe('Key', function() {
     primaryUser.selfCertification.features = [7]; // Monkey-patch AEAD feature flag
     primaryUser.selfCertification.preferredAeadAlgorithms = [2,1];
     const prefAlgo = await openpgp.key.getPreferredAlgo('aead', [key1, key2]);
-    expect(prefAlgo).to.equal(openpgp.config.aead_mode);
+    expect(prefAlgo).to.equal(openpgp.enums.aead.eax);
     const supported = await openpgp.key.isAeadSupported([key1, key2]);
     expect(supported).to.be.false;
   });