mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
Always process validity value returned by gpgme
Don't force 'never'; you should be checking both the status and validity anyway. Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
be72e10015
commit
5a07b75b22
@ -360,27 +360,22 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path,
|
||||
break;
|
||||
}
|
||||
|
||||
if(status == ALPM_SIGSTATUS_VALID
|
||||
|| status == ALPM_SIGSTATUS_KEY_EXPIRED) {
|
||||
switch(gpgsig->validity) {
|
||||
case GPGME_VALIDITY_ULTIMATE:
|
||||
case GPGME_VALIDITY_FULL:
|
||||
validity = ALPM_SIGVALIDITY_FULL;
|
||||
break;
|
||||
case GPGME_VALIDITY_MARGINAL:
|
||||
validity = ALPM_SIGVALIDITY_MARGINAL;
|
||||
break;
|
||||
case GPGME_VALIDITY_NEVER:
|
||||
validity = ALPM_SIGVALIDITY_NEVER;
|
||||
break;
|
||||
case GPGME_VALIDITY_UNKNOWN:
|
||||
case GPGME_VALIDITY_UNDEFINED:
|
||||
default:
|
||||
validity = ALPM_SIGVALIDITY_UNKNOWN;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
validity = ALPM_SIGVALIDITY_NEVER;
|
||||
switch(gpgsig->validity) {
|
||||
case GPGME_VALIDITY_ULTIMATE:
|
||||
case GPGME_VALIDITY_FULL:
|
||||
validity = ALPM_SIGVALIDITY_FULL;
|
||||
break;
|
||||
case GPGME_VALIDITY_MARGINAL:
|
||||
validity = ALPM_SIGVALIDITY_MARGINAL;
|
||||
break;
|
||||
case GPGME_VALIDITY_NEVER:
|
||||
validity = ALPM_SIGVALIDITY_NEVER;
|
||||
break;
|
||||
case GPGME_VALIDITY_UNKNOWN:
|
||||
case GPGME_VALIDITY_UNDEFINED:
|
||||
default:
|
||||
validity = ALPM_SIGVALIDITY_UNKNOWN;
|
||||
break;
|
||||
}
|
||||
|
||||
result->status[sigcount] = status;
|
||||
|
Loading…
Reference in New Issue
Block a user