From 7ce3f5521fd939776912a4e0147083721a55956f Mon Sep 17 00:00:00 2001
From: Daniel Huigens <d.huigens@protonmail.com>
Date: Thu, 26 Apr 2018 16:50:23 +0200
Subject: [PATCH] Set default draft version to 4

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

diff --git a/src/config/config.js b/src/config/config.js
index 8950bc9e..404e7298 100644
--- a/src/config/config.js
+++ b/src/config/config.js
@@ -59,7 +59,7 @@ export default {
    * @memberof module:config
    * @property {Integer} aead_protect_version
    */
-  aead_protect_version:     0,
+  aead_protect_version:     4,
   /**
    * Default Authenticated Encryption with Additional Data (AEAD) encryption mode
    * Only has an effect when aead_protect is set to true.
diff --git a/test/general/openpgp.js b/test/general/openpgp.js
index 35dd0039..c0974afe 100644
--- a/test/general/openpgp.js
+++ b/test/general/openpgp.js
@@ -674,6 +674,7 @@ describe('OpenPGP.js public api tests', function() {
       beforeEach: function() {
         openpgp.config.use_native = true;
         openpgp.config.aead_protect = true;
+        openpgp.config.aead_protect_version = 0;
       }
     });
 
@@ -682,7 +683,6 @@ describe('OpenPGP.js public api tests', function() {
       beforeEach: function() {
         openpgp.config.use_native = false;
         openpgp.config.aead_protect = true;
-        openpgp.config.aead_protect_version = 4;
         openpgp.config.aead_mode = openpgp.enums.aead.experimental_gcm;
 
         // Monkey-patch AEAD feature flag
@@ -697,7 +697,6 @@ describe('OpenPGP.js public api tests', function() {
       beforeEach: function() {
         openpgp.config.use_native = true;
         openpgp.config.aead_protect = true;
-        openpgp.config.aead_protect_version = 4;
         openpgp.config.aead_mode = openpgp.enums.aead.experimental_gcm;
 
         // Monkey-patch AEAD feature flag
@@ -712,7 +711,6 @@ describe('OpenPGP.js public api tests', function() {
       beforeEach: function() {
         openpgp.config.use_native = false;
         openpgp.config.aead_protect = true;
-        openpgp.config.aead_protect_version = 4;
 
         // Monkey-patch AEAD feature flag
         publicKey.keys[0].users[0].selfCertifications[0].features = [7];
@@ -726,7 +724,6 @@ describe('OpenPGP.js public api tests', function() {
       beforeEach: function() {
         openpgp.config.use_native = true;
         openpgp.config.aead_protect = true;
-        openpgp.config.aead_protect_version = 4;
 
         // Monkey-patch AEAD feature flag
         publicKey.keys[0].users[0].selfCertifications[0].features = [7];
@@ -740,7 +737,6 @@ describe('OpenPGP.js public api tests', function() {
       beforeEach: function() {
         openpgp.config.use_native = true;
         openpgp.config.aead_protect = true;
-        openpgp.config.aead_protect_version = 4;
         openpgp.config.aead_chunk_size_byte = 0;
 
         // Monkey-patch AEAD feature flag
@@ -754,7 +750,6 @@ describe('OpenPGP.js public api tests', function() {
       if: true,
       beforeEach: function() {
         openpgp.config.aead_protect = true;
-        openpgp.config.aead_protect_version = 4;
         openpgp.config.aead_mode = openpgp.enums.aead.ocb;
 
         // Monkey-patch AEAD feature flag