bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add key algo to import msg

Browse source 
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Florian Pritz 2011-10-20 20:39:28 +02:00 • committed by Dan McGee
parent 2f96067fe7
commit 2141b7112d
3 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/libalpm/alpm.h
View file

@ -228,6 +228,7 @@ typedef struct _alpm_pgpkey_t {
alpm_time_t expires; alpm_time_t expires;
unsigned int length; unsigned int length;
unsigned int revoked; unsigned int revoked;
char pubkey_algo;
} alpm_pgpkey_t; } alpm_pgpkey_t;
/** Signature result. Contains the key, status, and validity of a given /** Signature result. Contains the key, status, and validity of a given

20
lib/libalpm/signing.c
View file

@ -272,6 +272,26 @@ static int key_search(alpm_handle_t *handle, const char *fpr,
pgpkey->expires = key->subkeys->expires; pgpkey->expires = key->subkeys->expires;
pgpkey->length = key->subkeys->length; pgpkey->length = key->subkeys->length;
pgpkey->revoked = key->subkeys->revoked; pgpkey->revoked = key->subkeys->revoked;
switch (key->subkeys->pubkey_algo) {
case GPGME_PK_RSA:
case GPGME_PK_RSA_E:
case GPGME_PK_RSA_S:
pgpkey->pubkey_algo = 'R';
break;
case GPGME_PK_DSA:
pgpkey->pubkey_algo = 'D';
break;
case GPGME_PK_ELG_E:
case GPGME_PK_ELG:
case GPGME_PK_ECDSA:
case GPGME_PK_ECDH:
pgpkey->pubkey_algo = 'E';
break;
}
ret = 1; ret = 1;
error: error:

6
src/pacman/callback.c
View file

@ -350,11 +350,13 @@ void cb_question(alpm_question_t event, void *data1, void *data2,
const char *revoked = ""; const char *revoked = "";
time_t time = (time_t)key->created; time_t time = (time_t)key->created;
strftime(created, 12, "%Y-%m-%d", localtime(&time)); strftime(created, 12, "%Y-%m-%d", localtime(&time));
if (key->revoked) { if (key->revoked) {
revoked = " (revoked)"; revoked = " (revoked)";
} }
*response = yesno(_(":: Import PGP key %d/%s, \"%s\", created: %s%s?"),
key->length, key->fingerprint, key->uid, created, revoked); *response = yesno(_(":: Import PGP key %d%c/%s, \"%s\", created: %s%s?"),
key->length, key->pubkey_algo, key->fingerprint, key->uid, created, revoked);
} }
break; break;
} }