Rename pgpHexStr() to rpmhex(), but preserve ABI for now

Fixup internal callers to use rpmhex(), deprecate pgpHexStr().
pgpHexStr() should be dropped at next soname bump, whenever that
happens.

13 files changed, 28 insertions, 15 deletions

diff --git a/lib/formats.c b/lib/formats.c
index e484064b0..76b49a8e6 100644
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -63,7 +63,7 @@ static char * stringFormat(rpmtd td, char **emsg)
 	    break;
 	}
 	case RPM_BINARY_CLASS:
-	    val = pgpHexStr(td->data, td->count);
+	    val = rpmhex(td->data, td->count);
 	    break;
 	default:
 	    *emsg = xstrdup("(unknown type)");
@@ -345,7 +345,7 @@ static char * pgpsigFormat(rpmtd td, char **emsg)
 	*emsg = xstrdup(_("(not an OpenPGP signature)"));
     } else {
 	char dbuf[BUFSIZ];
-	char *keyid = pgpHexStr(sigp->signid, sizeof(sigp->signid));
+	char *keyid = rpmhex(sigp->signid, sizeof(sigp->signid));
 	unsigned int dateint = sigp->time;
 	time_t date = dateint;
 	struct tm _tm, * tms = localtime_r(&date, &_tm);
diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index 0d5a434e0..13c4a17f6 100644
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -578,7 +578,7 @@ char * rpmfiFDigestHex(rpmfi fi, int *algo)
     char *fdigest = NULL;
     const unsigned char *digest = rpmfiFDigest(fi, algo, &diglen);
     if (digest) {
-	fdigest = pgpHexStr(digest, diglen);
+	fdigest = rpmhex(digest, diglen);
     }
     return fdigest;
 }
diff --git a/lib/rpmts.c b/lib/rpmts.c
index 9d960a4ba..3c281104c 100644
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -417,7 +417,7 @@ struct pgpdata_s {
 static void initPgpData(pgpDigParams pubp, struct pgpdata_s *pd)
 {
     memset(pd, 0, sizeof(*pd));
-    pd->signid = pgpHexStr(pubp->signid, sizeof(pubp->signid));
+    pd->signid = rpmhex(pubp->signid, sizeof(pubp->signid));
     pd->shortid = pd->signid + 8;
     pd->userid = pubp->userid ? pubp->userid : "none";
     pd->time = pubp->time;
diff --git a/lib/rpmvs.c b/lib/rpmvs.c
index c849e1b43..e5e498b8e 100644
--- a/lib/rpmvs.c
+++ b/lib/rpmvs.c
@@ -202,7 +202,7 @@ static void rpmsinfoInit(const struct vfyinfo_s *vinfo,
 	sinfo->keyid = pgpGrab(sinfo->sig->signid+4, 4);
     } else if (sinfo->type == RPMSIG_DIGEST_TYPE) {
 	if (td->type == RPM_BIN_TYPE) {
-	    sinfo->dig = pgpHexStr(data, dlen);
+	    sinfo->dig = rpmhex(data, dlen);
 	} else {
 	    if (!validHex(data, dlen)) {
 		rasprintf(&sinfo->msg,
diff --git a/plugins/fsverity.c b/plugins/fsverity.c
index b13a7db06..f1557d078 100644
--- a/plugins/fsverity.c
+++ b/plugins/fsverity.c
@@ -93,7 +93,7 @@ static rpmRC fsverity_fsm_file_prepare(rpmPlugin plugin, rpmfi fi, int fd,
     arg.sig_ptr = (uintptr_t)signature;
     arg.sig_size = len;
 
-    buffer = pgpHexStr(signature, arg.sig_size);
+    buffer = rpmhex(signature, arg.sig_size);
     rpmlog(RPMLOG_DEBUG, "applying signature: %s\n", buffer);
     free(buffer);
 
diff --git a/python/rpmfiles-py.c b/python/rpmfiles-py.c
index 2d8c2111a..89381387d 100644
--- a/python/rpmfiles-py.c
+++ b/python/rpmfiles-py.c
@@ -144,7 +144,7 @@ static PyObject *rpmfile_digest(rpmfileObject *s)
     const unsigned char *digest = rpmfilesFDigest(s->files, s->ix,
 						  NULL, &diglen);
     if (digest) {
-	char * hex = pgpHexStr(digest, diglen);
+	char * hex = rpmhex(digest, diglen);
 	PyObject *o = utf8FromString(hex);
 	free(hex);
 	return o;
diff --git a/rpmio/digest_libgcrypt.c b/rpmio/digest_libgcrypt.c
index a77da16b5..6f5709103 100644
--- a/rpmio/digest_libgcrypt.c
+++ b/rpmio/digest_libgcrypt.c
@@ -114,7 +114,7 @@ int rpmDigestFinal(DIGEST_CTX ctx, void ** datap, size_t *lenp, int asAscii)
 	if (lenp)
 	    *lenp = 2 * digestlen + 1;
 	if (datap) {
-	    *datap = pgpHexStr((const uint8_t *)digest, digestlen);
+	    *datap = rpmhex((const uint8_t *)digest, digestlen);
 	}
     }
     gcry_md_close(ctx->h);
diff --git a/rpmio/digest_openssl.c b/rpmio/digest_openssl.c
index 9365f36ba..0cb781e57 100644
--- a/rpmio/digest_openssl.c
+++ b/rpmio/digest_openssl.c
@@ -259,7 +259,7 @@ int rpmDigestFinal(DIGEST_CTX ctx, void ** datap, size_t *lenp, int asAscii)
         if (lenp) *lenp = (2*digestlen) + 1;
         if (datap) {
             const uint8_t * s = (const uint8_t *) digest;
-            *datap = pgpHexStr(s, digestlen);
+            *datap = rpmhex(s, digestlen);
         }
     }
 
diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index 50d207002..f297a9ebe 100644
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -236,7 +236,7 @@ static void pgpPrtHex(const char *pre, const uint8_t *p, size_t plen)
     if (!_print) return;
     if (pre && *pre)
 	fprintf(stderr, "%s", pre);
-    hex = pgpHexStr(p, plen);
+    hex = rpmhex(p, plen);
     fprintf(stderr, " %s", hex);
     free(hex);
 }
@@ -1256,7 +1256,7 @@ char *pgpIdentItem(pgpDigParams digp)
     char *id = NULL;
     if (digp) {
 	
-	char *signid = pgpHexStr(digp->signid+4, sizeof(digp->signid)-4);
+	char *signid = rpmhex(digp->signid+4, sizeof(digp->signid)-4);
 	rasprintf(&id, _("V%d %s/%s %s, key ID %s"),
 			digp->version,
 			pgpValStr(pgpPubkeyTbl, digp->pubkey_algo),
diff --git a/rpmio/rpmstring.c b/rpmio/rpmstring.c
index eefd753b7..d266a17f2 100644
--- a/rpmio/rpmstring.c
+++ b/rpmio/rpmstring.c
@@ -10,7 +10,7 @@
 #include <rpm/rpmstring.h>
 #include "debug.h"
 
-char * pgpHexStr(const uint8_t *p, size_t plen)
+char *rpmhex(const uint8_t *p, size_t plen)
 {
     char *t, *str;
     str = t = xmalloc(plen * 2 + 1);
@@ -25,6 +25,10 @@ char * pgpHexStr(const uint8_t *p, size_t plen)
     return str;
 }
 
+char *pgpHexStr(const uint8_t *p, size_t plen)
+{
+    return rpmhex(p, plen);
+}
 
 int rstrcasecmp(const char * s1, const char * s2)
 {
diff --git a/rpmio/rpmstring.h b/rpmio/rpmstring.h
index 3f0477645..716fc12ef 100644
--- a/rpmio/rpmstring.h
+++ b/rpmio/rpmstring.h
@@ -193,6 +193,15 @@ unsigned int rstrhash(const char * string);
  * @param plen		no. of bytes
  * @return		hex formatted string (malloc'ed)
  */
+char * rpmhex(const uint8_t *p, size_t plen);
+
+/** \ingroup rpmstring
+ * Deprecated, do not use.
+ * @param p		bytes
+ * @param plen		no. of bytes
+ * @return		hex formatted string (malloc'ed)
+ */
+RPM_GNUC_DEPRECATED
 char * pgpHexStr(const uint8_t *p, size_t plen);
 
 #ifdef __cplusplus
diff --git a/sign/rpmsignfiles.c b/sign/rpmsignfiles.c
index 2feb4f404..25d81bd29 100644
--- a/sign/rpmsignfiles.c
+++ b/sign/rpmsignfiles.c
@@ -59,7 +59,7 @@ const char *key, char *keypass, uint32_t *siglenp)
 
     *siglenp = siglen + 1;
     /* convert file signature binary to hex */
-    fsignature = pgpHexStr(signature, siglen+1);
+    fsignature = rpmhex(signature, siglen+1);
     return fsignature;
 }
 
diff --git a/sign/rpmsignverity.c b/sign/rpmsignverity.c
index a5ae972ed..e62bf68b1 100644
--- a/sign/rpmsignverity.c
+++ b/sign/rpmsignverity.c
@@ -63,7 +63,7 @@ static char *rpmVeritySignFile(rpmfi fi, size_t *sig_size, char *key,
 	goto out;
     }
 
-    digest_hex = pgpHexStr(digest->digest, digest->digest_size);
+    digest_hex = rpmhex(digest->digest, digest->digest_size);
     digest_base64 = rpmBase64Encode(digest->digest, digest->digest_size, -1);
     rpmlog(RPMLOG_DEBUG, _("file(size %li): %s: digest(%i): %s, idx %i\n"),
 	   file_size, rpmfiFN(fi), digest->digest_size, digest_hex,
@@ -82,7 +82,7 @@ static char *rpmVeritySignFile(rpmfi fi, size_t *sig_size, char *key,
 	goto out;
     }
 
-    sig_hex = pgpHexStr(sig, *sig_size);
+    sig_hex = rpmhex(sig, *sig_size);
     sig_base64 = rpmBase64Encode(sig, *sig_size, -1);
     rpmlog(RPMLOG_DEBUG, _("%s: sig_size(%li), base64_size(%li), idx %i: signature:\n%s\n"),
 	   rpmfiFN(fi), *sig_size, strlen(sig_base64), rpmfiFX(fi), sig_hex);