From bd0551b22076b82a6d49e9f7a2b2e0c90a1b2326 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 05 Feb 2016 07:25:27 -0500
Subject: [PATCH] Secure also downloads of addressbook exports, managesieve script exports and Enigma keys exports
---
plugins/enigma/lib/enigma_driver.php | 64 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/plugins/enigma/lib/enigma_driver.php b/plugins/enigma/lib/enigma_driver.php
index a9a3e47..7fa3342 100644
--- a/plugins/enigma/lib/enigma_driver.php
+++ b/plugins/enigma/lib/enigma_driver.php
@@ -1,20 +1,14 @@
<?php
-/*
+
+/**
+-------------------------------------------------------------------------+
| Abstract driver for the Enigma Plugin |
| |
- | This program is free software; you can redistribute it and/or modify |
- | it under the terms of the GNU General Public License version 2 |
- | as published by the Free Software Foundation. |
+ | Copyright (C) 2010-2015 The Roundcube Dev Team |
| |
- | This program is distributed in the hope that it will be useful, |
- | but WITHOUT ANY WARRANTY; without even the implied warranty of |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
- | GNU General Public License for more details. |
- | |
- | You should have received a copy of the GNU General Public License along |
- | with this program; if not, write to the Free Software Foundation, Inc., |
- | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-------------------------------------------------------------------------+
| Author: Aleksander Machniak <alec@alec.pl> |
@@ -39,18 +33,33 @@
/**
* Encryption.
+ *
+ * @param string Message body
+ * @param array List of key-password mapping
+ *
+ * @return mixed Encrypted message or enigma_error on failure
*/
abstract function encrypt($text, $keys);
/**
- * Decryption..
+ * Decryption.
+ *
+ * @param string Encrypted message
+ * @param array List of key-password mapping
*/
- abstract function decrypt($text, $key, $passwd);
+ abstract function decrypt($text, $keys = array());
/**
* Signing.
+ *
+ * @param string Message body
+ * @param string Key ID
+ * @param string Key password
+ * @param int Signing mode (enigma_engine::SIGN_*)
+ *
+ * @return mixed True on success or enigma_error on failure
*/
- abstract function sign($text, $key, $passwd);
+ abstract function sign($text, $key, $passwd, $mode = null);
/**
* Signature verification.
@@ -70,7 +79,16 @@
*
* @return mixed Import status array or enigma_error
*/
- abstract function import($content, $isfile=false);
+ abstract function import($content, $isfile = false);
+
+ /**
+ * Key/Cert export.
+ *
+ * @param string Key ID
+ *
+ * @return mixed Key content or enigma_error
+ */
+ abstract function export($key);
/**
* Keys listing.
@@ -79,8 +97,8 @@
*
* @return mixed Array of enigma_key objects or enigma_error
*/
- abstract function list_keys($pattern='');
-
+ abstract function list_keys($pattern = '');
+
/**
* Single key information.
*
@@ -93,14 +111,18 @@
/**
* Key pair generation.
*
- * @param array Key/User data
+ * @param array Key/User data (name, email, password, size)
*
* @return mixed Key (enigma_key) object or enigma_error
*/
abstract function gen_key($data);
-
+
/**
* Key deletion.
+ *
+ * @param string Key ID
+ *
+ * @return mixed True on success or enigma_error
*/
- abstract function del_key($keyid);
+ abstract function delete_key($keyid);
}
--
Gitblit v1.9.1