From 31e55b8049ed001a993441f3efc8ffebdf360061 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 21 Apr 2011 19:01:06 -0500 Subject: signing: let GPGME handle loading signatures from files Rather than go through all the hassle of doing this ourselves, just let GPGME handle the work by passing it a file handle. Signed-off-by: Dan McGee --- lib/libalpm/db.c | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'lib/libalpm/db.c') diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index f5e7a25f..3d593b36 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -314,27 +314,6 @@ pmdb_t *_alpm_db_new(const char *treename, int is_local) return db; } -const pmpgpsig_t *_alpm_db_pgpsig(pmdb_t *db) -{ - ALPM_LOG_FUNC; - - /* Sanity checks */ - ASSERT(db != NULL, return(NULL)); - - if(db->pgpsig.data == NULL) { - const char *dbfile; - int ret; - - dbfile = _alpm_db_path(db); - - /* TODO: do something with ret value */ - ret = _alpm_load_signature(dbfile, &(db->pgpsig)); - (void)ret; - } - - return &(db->pgpsig); -} - void _alpm_db_free(pmdb_t *db) { ALPM_LOG_FUNC; @@ -343,8 +322,6 @@ void _alpm_db_free(pmdb_t *db) _alpm_db_free_pkgcache(db); /* cleanup server list */ FREELIST(db->servers); - /* only need to free data */ - FREE(db->pgpsig.data); FREE(db->_path); FREE(db->treename); FREE(db); -- cgit v1.2.3-24-g4f1b