MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'hotfix-2.3.27'

pull/435/head v2.3.27
iglocska 2014-11-14 13:14:21 +01:00
parent 0097ba1943 aa492066d8
commit aac37b1b9d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.json
View File

@ -1 +1 @@
{"major":2, "minor":3, "hotfix":26}
{"major":2, "minor":3, "hotfix":27}

4
app/Controller/ServersController.php
View File

@ -377,7 +377,7 @@ class ServersController extends AppController {
try {
require_once 'Crypt/GPG.php';
$gpg = new Crypt_GPG(array('homedir' => Configure::read('GnuPG.homedir')));
$key = $gpg->addEncryptKey(Configure::read('GnuPG.email'));
$key = $gpg->addSignKey(Configure::read('GnuPG.email'), Configure::read('GnuPG.password'));
} catch (Exception $e) {
$gpgStatus = 2;
$continue = false;
@ -385,7 +385,7 @@ class ServersController extends AppController {
if ($continue) {
try {
$gpgStatus = 0;
$enc = $gpg->encrypt('test', true);
$signed = $gpg->sign('test', Crypt_GPG::SIGN_MODE_CLEAR);
} catch (Exception $e){
$gpgStatus = 3;
}