Enigma: Varius fixes and cleanup in code for attaching pubkeys

Aleksander Machniak

2016-04-02 96c3d84cddb861956cfbc719d694eb972343f1c3

 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;
        };