X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_file.c;h=ded6a9e2e0c8e9db23f245b93e02a20f67e3a369;hb=70842462a490e56a607a48b2d27807816c4d8a80;hp=0c9717a5900f9d13b202e30ed68f84b2a750d893;hpb=0c120d1895d25b59abe338862189be1b87447569;p=onak.git

diff --git a/keydb_file.c b/keydb_file.c
index 0c9717a..ded6a9e 100644
--- a/keydb_file.c
+++ b/keydb_file.c
@@ -13,8 +13,7 @@
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <sys/types.h>
@@ -144,20 +143,20 @@ static int file_store_key(struct onak_dbctx *dbctx,
 
 /**
  *	delete_key - Given a keyid delete the key from storage.
- *	@keyid: The keyid to delete.
+ *	@fp: The fingerprint of the key to delete.
  *	@intrans: If we're already in a transaction.
  *
  *	This function deletes a public key from whatever storage mechanism we
  *	are using. Returns 0 if the key existed.
  */
 static int file_delete_key(struct onak_dbctx *dbctx,
-		uint64_t keyid, bool intrans)
+		struct openpgp_fingerprint *fp, bool intrans)
 {
 	char *db_dir = (char *) dbctx->priv;
 	char keyfile[1024];
 
 	snprintf(keyfile, 1023, "%s/0x%" PRIX64, db_dir,
-			keyid & 0xFFFFFFFF);
+			fingerprint2keyid(fp) & 0xFFFFFFFF);
 
 	return unlink(keyfile);
 }
@@ -245,7 +244,6 @@ static int file_iterate_keys(struct onak_dbctx *dbctx,
  */
 #define NEED_KEYID2UID 1
 #define NEED_GETKEYSIGS 1
-#define NEED_GETFULLKEYID 1
 #define NEED_UPDATEKEYS 1
 #define NEED_GET_FP 1
 #include "keydb.c"
@@ -296,7 +294,6 @@ struct onak_dbctx *keydb_file_init(struct onak_db_config *dbcfg, bool readonly)
 	dbctx->getkeysigs		= generic_getkeysigs;
 	dbctx->cached_getkeysigs	= generic_cached_getkeysigs;
 	dbctx->keyid2uid		= generic_keyid2uid;
-	dbctx->getfullkeyid		= generic_getfullkeyid;
 	dbctx->iterate_keys		= file_iterate_keys;
 
 	return dbctx;