hidden setting for max alg version

Author: ttyridal

ext/data/config.js

@@ -28,6 +28,7 @@ function string_is_plain_ascii(s) {
  var stored_sites={},
      username="",
      key_id,
+     alg_max_version,
      alg_min_version = 1;
 
 function save_sites_to_backend() {
@@ -125,10 +126,12 @@ window.addEventListener('masterpassword-configload', function(e){
     stored_sites = e.detail.sites;
     username = e.detail.username;
     key_id = e.detail.key_id;
+    alg_max_version = e.detail.max_alg_version;
 
     if (!string_is_plain_ascii(username)) {
-        alg_min_version = 3;
-        $('#ver3note').show();
+        alg_min_version = Math.min(3, alg_max_version);
+        if (alg_min_version > 2)
+            $('#ver3note').show();
     }
 
     $.each(stored_sites, function(domain,v){
@@ -242,7 +245,7 @@ $(document).on('drop', function(e){
 });
 
 $('body').on('click','.export_mpsites',function(){
-    start_data_download(make_mpsites(stored_sites, alg_min_version), 'firefox.mpsites');
+    start_data_download(make_mpsites(stored_sites, alg_min_version, alg_max_version), 'firefox.mpsites');
 });
 
 function pad_left(len, s, chr) {
@@ -268,7 +271,7 @@ function pad_left(len, s, chr) {
     }
 }
 
-function make_mpsites(stored_sites, alg_min_version) {
+function make_mpsites(stored_sites, alg_min_version, alg_version) {
     var a=[ '# Master Password site export\n',
         '#     Export of site names and stored passwords (unless device-private) encrypted with the master key.\n',
         '#\n',
@@ -280,7 +283,7 @@ function make_mpsites(stored_sites, alg_min_version) {
         '# Avatar: 0\n',
         '# Key ID: '+key_id+'\n',
         '# Version: 2.2\n',
-        '# Algorithm: 3\n',
+        '# Algorithm: '+alg_version+'\n',
         '# Default Type: 17\n',
         '# Passwords: PROTECTED\n',
         '##\n',

ext/data/main_popup.js

@@ -63,7 +63,7 @@ function recalculate(hide_after_copy, retry) {
     var key_id_mismatch = false;
 
     if (!mpw_session) {
-        mpw_session = mpw( session_store.username, session_store.masterkey );
+        mpw_session = mpw( session_store.username, session_store.masterkey, session_store.max_alg_version );
 
         $('#verify_pass_fld').html("Verify: " + mpw_session.sitepassword(".", 0, "nx"));
         var key_id = mpw_session.key_id();

ext/lib/main.js

@@ -23,6 +23,7 @@ var panels = require("sdk/panel");
 var tabs = require("sdk/tabs");
 var { Hotkey } = require("sdk/hotkeys");
 var prefs = require("sdk/simple-prefs").prefs;
+var global_prefs  = require("sdk/preferences/service");
 var windows = require("sdk/windows");
 var isPrivate = require("sdk/private-browsing").isPrivate;
 var pagemod = require("sdk/page-mod");
@@ -69,6 +70,7 @@ var session_store = {
     'masterkey': null,
     'sites': ss.storage.sites || {},
     'defaulttype': prefs.defaulttype,
+    'max_alg_version': global_prefs.get('extensions.' + self.id + '.max_alg_version', 3),
     'key_id': undefined
 };
 
@@ -126,8 +128,9 @@ var pm_config_handler = pagemod.PageMod({
             worker.port.emit('configload', {
                 sites:session_store.sites,
                 username:session_store.username,
-                key_id:session_store.key_id}
-            );
+                key_id:session_store.key_id,
+                max_alg_version:session_store.max_alg_version
+            });
         });
         worker.port.on('configstore', function(d) {
             session_store.sites = d;