From c3edd8946b0a65917f9863f9c4499a69c7c021c1 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Wed, 12 Apr 2017 14:42:23 +0300 Subject: Remove pgpExtractPubkeyFingerprint() The sole user within rpm was removed over six years ago, never seen a single user outside rpm, and even then it's just a wrapper around rpmBase64Decode() and pgpPubkeyFingerprint() with a bizarre return code. Bye bye... --- rpmio/rpmpgp.c | 16 ---------------- rpmio/rpmpgp.h | 8 -------- 2 files changed, 24 deletions(-) diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c index 5a2158036..0cd55dd77 100644 --- a/rpmio/rpmpgp.c +++ b/rpmio/rpmpgp.c @@ -833,22 +833,6 @@ int pgpPubkeyFingerprint(const uint8_t * pkt, size_t pktlen, pgpKeyID_t keyid) return getFingerprint(p.body, p.blen, keyid); } -int pgpExtractPubkeyFingerprint(const char * b64pkt, pgpKeyID_t keyid) -{ - uint8_t * pkt; - size_t pktlen; - int rc = -1; /* assume failure */ - - if (rpmBase64Decode(b64pkt, (void **)&pkt, &pktlen) == 0) { - if (pgpPubkeyFingerprint(pkt, pktlen, keyid) == 0) { - /* if there ever was a bizarre return code for success... */ - rc = 8; - } - free(pkt); - } - return rc; -} - static int pgpPrtPkt(struct pgpPkt *p, pgpDigParams _digp) { int rc = 0; diff --git a/rpmio/rpmpgp.h b/rpmio/rpmpgp.h index b444ec940..04e5d6606 100644 --- a/rpmio/rpmpgp.h +++ b/rpmio/rpmpgp.h @@ -977,14 +977,6 @@ char * pgpHexStr(const uint8_t *p, size_t plen); int pgpPubkeyFingerprint(const uint8_t * pkt, size_t pktlen, pgpKeyID_t keyid); -/** \ingroup rpmpgp -* Extract OpenPGP public key fingerprint from base64 encoded packet. -* @param b64pkt base64 encoded openpgp packet -* @retval keyid public key fingerprint -* @return 8 (no. of bytes) on success, < 0 on error -*/ -int pgpExtractPubkeyFingerprint(const char * b64pkt, pgpKeyID_t keyid); - /** \ingroup rpmpgp * Parse a OpenPGP packet(s). * @param pkts OpenPGP packet(s) -- cgit v1.2.1