1 files changed, 33 insertions, 18 deletions

diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
index 3ec957de..cfe0f5e8 100644
--- a/lib/libalpm/signing.c
+++ b/lib/libalpm/signing.c
@@ -17,8 +17,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -284,11 +282,34 @@ static int key_search(alpm_handle_t *handle, const char *fpr,
 	pgpkey->email = key->uids->email;
 	pgpkey->created = key->subkeys->timestamp;
 	pgpkey->expires = key->subkeys->expires;
-	gpgme_release(ctx);
-	return 1;
+	pgpkey->length = key->subkeys->length;
+	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;
 
 error:
-	_alpm_log(handle, ALPM_LOG_DEBUG, "gpg error: %s\n", gpgme_strerror(err));
+	if(ret != 1) {
+		_alpm_log(handle, ALPM_LOG_DEBUG, "gpg error: %s\n", gpgme_strerror(err));
+	}
 	gpgme_release(ctx);
 	return ret;
 }
@@ -409,8 +430,13 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path,
 
 	if(!base64_sig) {
 		sigpath = _alpm_sigpath(handle, path);
-		/* this will just help debugging */
-		_alpm_access(handle, NULL, sigpath, R_OK);
+		if(_alpm_access(handle, NULL, sigpath, R_OK) != 0
+				|| (sigfile = fopen(sigpath, "rb")) == NULL) {
+			_alpm_log(handle, ALPM_LOG_DEBUG, "sig path %s could not be opened\n",
+					sigpath);
+			handle->pm_errno = ALPM_ERR_SIG_MISSING;
+			goto error;
+		}
 	}
 
 	/* does the file we are verifying exist? */
@@ -420,17 +446,6 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path,
 		goto error;
 	}
 
-	/* does the sig file exist (if we didn't get the data directly)? */
-	if(!base64_sig) {
-		sigfile = fopen(sigpath, "rb");
-		if(sigfile == NULL) {
-			_alpm_log(handle, ALPM_LOG_DEBUG, "sig path %s could not be opened\n",
-					sigpath);
-			handle->pm_errno = ALPM_ERR_SIG_MISSING;
-			goto error;
-		}
-	}
-
 	if(init_gpgme(handle)) {
 		/* pm_errno was set in gpgme_init() */
 		goto error;