From 65225262f6bb524b93feb49178509cada3390ee3 Mon Sep 17 00:00:00 2001
From: Kyle Francis <franck6@rpi.edu>
Date: Sat, 02 Apr 2016 18:33:17 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into compose_focus

---
 plugins/enigma/config.inc.php.dist |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/plugins/enigma/config.inc.php.dist b/plugins/enigma/config.inc.php.dist
index b58ce8b..2cce5ee 100644
--- a/plugins/enigma/config.inc.php.dist
+++ b/plugins/enigma/config.inc.php.dist
@@ -13,8 +13,35 @@
 // Must be writeable by PHP process
 $config['enigma_pgp_homedir'] = null;
 
+// Enables signatures verification feature.
+$config['enigma_signatures'] = true;
+
+// Enables messages decryption feature.
+$config['enigma_decryption'] = true;
+
+// Enables messages encryption and signing feature.
+$config['enigma_encryption'] = true;
+
 // Enable signing all messages by default
 $config['enigma_sign_all'] = false;
 
 // Enable encrypting all messages by default
 $config['enigma_encrypt_all'] = false;
+
+// Enable attaching a public key to all messages by default
+$config['enigma_attach_pubkey'] = false;
+
+// Default for how long to store private key passwords (in minutes).
+// When set to 0 passwords will be stored for the whole session.
+$config['enigma_password_time'] = 5;
+
+// Enables server-side keys generation which would be used
+// if user browser does not support web-crypto features.
+//
+// WARNING: Key generation requires true random numbers, and as such can be
+// slow. If the operating system runs out of entropy, key generation will
+// block until more entropy is available.
+//
+// To solve that a hardware entropy generator or
+// an entropy gathering daemon may be installed (e.g. randomsound).
+$config['enigma_keygen_server'] = false;

--
Gitblit v1.9.1