Eliminate broken pgpLen() from the API

- pgpLen() only works for new format packets, and even for those
  its unsafe and cannot be fixed without breaking the API. Start
  by taking it behind the barn for further, err, operations. Rpm has
  no users outside rpmpgp.c now and anybody else using it will be
  better off not doing so.

2 files changed, 21 insertions, 21 deletions

diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index 9f925156f..fd05c2e69 100644
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -400,6 +400,27 @@ static SECKEYPublicKey *pgpNewPublicKey(KeyType type)
 }
 
 /** \ingroup rpmpgp
+ * Return length of an OpenPGP packet.
+ * @param s		pointer to packet
+ * @retval *lenp	no. of bytes in packet
+ * @return		no. of bytes in length prefix
+ */
+static inline
+size_t pgpLen(const uint8_t *s, size_t * lenp)
+{
+    if (*s < 192) {
+	(*lenp) = *s++;
+	return 1;
+    } else if (*s < 255) {
+	(*lenp) = ((((unsigned)s[0]) - 192) << 8) + s[1] + 192;
+	return 2;
+    } else {
+	(*lenp) = pgpGrab(s+1, (size_t) 4);
+	return 5;
+    }
+}
+
+/** \ingroup rpmpgp
  * Is buffer at beginning of an OpenPGP packet?
  * @param p		buffer
  * @return		1 if an OpenPGP packet, 0 otherwise
diff --git a/rpmio/rpmpgp.h b/rpmio/rpmpgp.h
index 6d484f3fb..00f960639 100644
--- a/rpmio/rpmpgp.h
+++ b/rpmio/rpmpgp.h
@@ -961,27 +961,6 @@ unsigned int pgpGrab(const uint8_t *s, size_t nbytes)
 }
 
 /** \ingroup rpmpgp
- * Return length of an OpenPGP packet.
- * @param s		pointer to packet
- * @retval *lenp	no. of bytes in packet
- * @return		no. of bytes in length prefix
- */
-static inline
-size_t pgpLen(const uint8_t *s, size_t * lenp)
-{
-    if (*s < 192) {
-	(*lenp) = *s++;
-	return 1;
-    } else if (*s < 255) {
-	(*lenp) = ((((unsigned)s[0]) - 192) << 8) + s[1] + 192;
-	return 2;
-    } else {
-	(*lenp) = pgpGrab(s+1, (size_t) 4);
-	return 5;
-    }
-}
-
-/** \ingroup rpmpgp
  * Return hex formatted representation of bytes.
  * @param p		bytes
  * @param plen		no. of bytes