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

Merge branch 'hotfix-2.2.39' into develop

pull/304/merge
iglocska 2014-09-08 13:24:26 +02:00
parent 982727819b 2bb806d780
commit c11b388f32
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Model/User.php
View File

@ -393,7 +393,6 @@ class User extends AppModel {
$gpg->addEncryptKey($key['fingerprint']); // use the key that was given in the import
try {
$enc = $gpg->encrypt('test', true);
$verified = $gpg->verify($enc);
} catch (Exception $e){
$results[$user['User']['id']][0] = true;
}

8
app/View/Users/verify_g_p_g.ctp
View File

@ -2,9 +2,11 @@
<h3>GPG key validation</h3>
<ul>
<?php foreach ($users as $k => $user) {
echo $k . ' (' . $user[1] . '):<br />';
if ($user[0]) {
echo '-> PGP key invalid.<br />';
echo $k . ' (' . $user[1] . '):';
if (isset($user[0])) {
echo '-> <span style="color:red;">Invalid.</span><br />';
} else {
echo '-> <span style="color:green;">OK</span><br />';
}
echo '------------------------------------------------------------------------------<br />';
}