[pacman-dev] Fix error during keyring checking

Message ID 20200731165442.34336-1-anatol.pomozov@gmail.com
State New
Headers show
  • [pacman-dev] Fix error during keyring checking
Related show

Commit Message

Anatol Pomozov July 31, 2020, 4:54 p.m. UTC
With current master version the 'keyring checking' step produces an error:
  debug: returning error 6 from alpm_pkg_get_sig (../lib/libalpm/package.c: 274) : wrong or NULL argument passed

The package signature is still checked later at the integrity verification step though.

This commit fixes keyring checking and now the debug log looks like this:
  debug: found cached pkg: /var/cache/pacman/pkg/ruby-2.7.1-2-x86_64.pkg.tar.zst
  debug: found detached signature /var/cache/pacman/pkg/ruby-2.7.1-2-x86_64.pkg.tar.zst.sig with size 566
  debug: found signature key: 786C63F330D7CB92
  debug: looking up key 786C63F330D7CB92 locally
  debug: key lookup success, key exists

Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>
 lib/libalpm/package.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)


diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c
index 0885b27b..a4356518 100644
--- a/lib/libalpm/package.c
+++ b/lib/libalpm/package.c
@@ -270,9 +270,7 @@  const char SYMEXPORT *alpm_pkg_get_base64_sig(alpm_pkg_t *pkg)
 int SYMEXPORT alpm_pkg_get_sig(alpm_pkg_t *pkg, unsigned char **sig, size_t *sig_len)
-	if(pkg != NULL) {
-		RET_ERR(pkg->handle, ALPM_ERR_WRONG_ARGS, -1);
-	}
+	ASSERT(pkg != NULL, return -1);
 	if(pkg->base64_sig) {
 		int ret = alpm_decode_signature(pkg->base64_sig, sig, sig_len);