Add config option for size of new Mailvelope keys

CHANGELOG

@@ -71,6 +71,7 @@ RELEASE 1.4.4
 - Security: Fix CSRF bypass that could be used to log out an authenticated user [CVE-2020-12626] (#7302)
 - Mailvelope: Fix size of iframe for PGP-inlined mail (#7348)
 - Mailvelope: Add config option to use Main Keyring (#7348)
+- Mailvelope: Add config option to set the size for new keys (#7348)
 
 RELEASE 1.4.3
 -------------

config/defaults.inc.php

@@ -858,6 +858,10 @@ $config['keyservers'] = array('keys.openpgp.org');
 // a per-site keyring. This is set to false for backwards compatibility.
 $config['mailvelope_main_keyring'] = false;
 
+// Mailvelope RSA bit size for newly generated keys, either 2048 or 4096.
+// It maybe desirable to use 2048 for sites with many mobile users.
+$config['mailvelope_keysize'] = 4096;
+
 // ----------------------------------
 // ADDRESSBOOK SETTINGS
 // ----------------------------------

program/js/app.js

@@ -4268,7 +4268,7 @@ function rcube_webmail()
   {
     var cid = new Date().getTime();
     var user_id = {email: identity_email, fullName: $(ref.gui_objects.editform).find('.ff_name').val().trim()};
-    var options = {userIds: [user_id], keySize: 4096};
+    var options = {userIds: [user_id], keySize: this.env.mailvelope_keysize};
 
     $('<div>').attr('id', 'mailvelope-keygen-container-' + cid)
       .css({height: '245px', marginBottom: '10px'})

program/steps/settings/edit_identity.inc

@@ -34,6 +34,7 @@ if (($_GET['_iid'] || $_POST['_iid']) && $RCMAIL->action=='edit-identity') {
         return;
     }
     $OUTPUT->set_env('mailvelope_main_keyring', $RCMAIL->config->get('mailvelope_main_keyring'));
+    $OUTPUT->set_env('mailvelope_keysize', $RCMAIL->config->get('mailvelope_keysize'));
 }
 // add-identity
 else {