From c852426bd4c2dcce88c581735863603ed4c9b556 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 07 Oct 2015 13:54:08 -0400
Subject: [PATCH] Enigma: Display all usage flags of the subkey
---
plugins/enigma/lib/enigma_driver_gnupg.php | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/plugins/enigma/lib/enigma_driver_gnupg.php b/plugins/enigma/lib/enigma_driver_gnupg.php
index c41c6c1..5ddf724 100644
--- a/plugins/enigma/lib/enigma_driver_gnupg.php
+++ b/plugins/enigma/lib/enigma_driver_gnupg.php
@@ -423,14 +423,6 @@
$ekey->name = trim($ekey->users[0]->name . ' <' . $ekey->users[0]->email . '>');
foreach ($key->getSubKeys() as $idx => $subkey) {
- $usage = 0;
- if ($subkey->canSign()) {
- $usage += enigma_key::CAN_SIGN;
- }
- if ($subkey->canEncrypt()) {
- $usage += enigma_key::CAN_ENCRYPT;
- }
-
$skey = new enigma_subkey();
$skey->id = $subkey->getId();
$skey->revoked = $subkey->isRevoked();
@@ -440,7 +432,7 @@
$skey->has_private = $subkey->hasPrivate();
$skey->algorithm = $subkey->getAlgorithm();
$skey->length = $subkey->getLength();
- $skey->usage = $usage;
+ $skey->usage = $subkey->usage();
$ekey->subkeys[$idx] = $skey;
};
--
Gitblit v1.9.1