From 8b46a117ab543374f161c16d911e48fb987c9e8a Mon Sep 17 00:00:00 2001
From: Tankred Hase <mail@tankredhase.de>
Date: Thu, 24 Mar 2016 10:38:00 +0800
Subject: [PATCH] Prefer aes128 over aes192 (no WebCrypto support)

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

diff --git a/src/key.js b/src/key.js
index abd08d2f..dd261f8d 100644
--- a/src/key.js
+++ b/src/key.js
@@ -987,8 +987,8 @@ export function generate(options) {
       signaturePacket.keyFlags = [enums.keyFlags.certify_keys | enums.keyFlags.sign_data];
       signaturePacket.preferredSymmetricAlgorithms = [];
       signaturePacket.preferredSymmetricAlgorithms.push(enums.symmetric.aes256);
-      signaturePacket.preferredSymmetricAlgorithms.push(enums.symmetric.aes192);
       signaturePacket.preferredSymmetricAlgorithms.push(enums.symmetric.aes128);
+      signaturePacket.preferredSymmetricAlgorithms.push(enums.symmetric.aes192);
       signaturePacket.preferredSymmetricAlgorithms.push(enums.symmetric.cast5);
       signaturePacket.preferredSymmetricAlgorithms.push(enums.symmetric.tripledes);
       signaturePacket.preferredHashAlgorithms = [];
diff --git a/test/general/key.js b/test/general/key.js
index f90de200..4344cfb8 100644
--- a/test/general/key.js
+++ b/test/general/key.js
@@ -599,13 +599,13 @@ var pgp_desktop_priv =
     expect(prefAlgo).to.equal(openpgp.enums.symmetric.aes256);
   });
 
-  it('getPreferredSymAlgo() - two key - AES192', function() {
+  it('getPreferredSymAlgo() - two key - AES128', function() {
     var keys = openpgp.key.readArmored(twoKeys).keys;
     var key1 = keys[0];
     var key2 = keys[1];
-    key2.getPrimaryUser().selfCertificate.preferredSymmetricAlgorithms = [6,8,3];
+    key2.getPrimaryUser().selfCertificate.preferredSymmetricAlgorithms = [6,7,3];
     var prefAlgo = openpgp.key.getPreferredSymAlgo([key1, key2]);
-    expect(prefAlgo).to.equal(openpgp.enums.symmetric.aes192);
+    expect(prefAlgo).to.equal(openpgp.enums.symmetric.aes128);
   });
 
   it('getPreferredSymAlgo() - two key - one without pref', function() {
@@ -626,7 +626,7 @@ var pgp_desktop_priv =
       expect(key.subKeys[0].bindingSignature.keyFlags[0] & keyFlags.encrypt_communication).to.equal(keyFlags.encrypt_communication);
       expect(key.subKeys[0].bindingSignature.keyFlags[0] & keyFlags.encrypt_storage).to.equal(keyFlags.encrypt_storage);
       var sym = openpgp.enums.symmetric;
-      expect(key.users[0].selfCertifications[0].preferredSymmetricAlgorithms).to.eql([sym.aes256, sym.aes192, sym.aes128, sym.cast5, sym.tripledes]);
+      expect(key.users[0].selfCertifications[0].preferredSymmetricAlgorithms).to.eql([sym.aes256, sym.aes128, sym.aes192, sym.cast5, sym.tripledes]);
       var hash = openpgp.enums.hash;
       expect(key.users[0].selfCertifications[0].preferredHashAlgorithms).to.eql([hash.sha256, hash.sha1, hash.sha512]);
       var compr = openpgp.enums.compression;