Move digest functionality to the internal OpenPGP implementation

rpmio/digest.h contains definitions that are only used by the interal
OpenPGP parser, and are not required by the future Sequoia backend.
Move those definitions into rpmio/rpmpgp_internal.h.

Fixes #2006.

(cherry picked c3e988287d2d1fbc4e83eca349e80e0c2d781a23)

12 files changed, 19 insertions, 21 deletions

diff --git a/lib/formats.c b/lib/formats.c
index b6cb58eb0..a80ff330a 100644
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -14,7 +14,7 @@
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmbase64.h>
 
-#include "rpmio/digest.h"
+#include "rpmio/rpmpgpval.h"
 #include "lib/manifest.h"
 #include "lib/misc.h"
 #include "lib/signature.h"
diff --git a/lib/rpmts.c b/lib/rpmts.c
index bec6a53e3..3de456af9 100644
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -24,7 +24,7 @@
 #include <rpm/rpmsq.h>
 #include <rpm/rpmte.h>
 
-#include "rpmio/digest.h"
+#include "rpmio/rpmpgpval.h"
 #include "lib/rpmal.h"
 #include "lib/rpmchroot.h"
 #include "lib/rpmplugins.h"
diff --git a/lib/rpmvs.c b/lib/rpmvs.c
index 9877fea49..a1425ea17 100644
--- a/lib/rpmvs.c
+++ b/lib/rpmvs.c
@@ -5,7 +5,7 @@
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmlog.h>
 #include "lib/rpmvs.h"
-#include "rpmio/digest.h"
+#include "rpmio/rpmpgpval.h"
 
 #include "debug.h"
 
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index d91dd1261..94be6581f 100644
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -18,13 +18,14 @@ AM_CPPFLAGS += -DLOCALSTATEDIR="\"$(localstatedir)\""
 usrlibdir = $(libdir)
 usrlib_LTLIBRARIES = librpmio.la
 librpmio_la_SOURCES = \
-	argv.c base64.c digest.h digest.c expression.c macro.c \
+	argv.c base64.c digest.c expression.c macro.c \
 	rpmhook.c rpmio.c rpmlog.c rpmmalloc.c rgetopt.c \
 	rpmpgp.c rpmpgpval.h rpmsq.c rpmsw.c url.c \
 	rpmio_internal.h rpmhook.h rpmvercmp.c rpmver.c \
 	rpmstring.c rpmfileutil.c rpmglob.c \
 	rpmkeyring.c rpmstrpool.c rpmmacro_internal.h \
-	rpmlua.c rpmlua.h lposix.c lposix.h rpmpgp_internal.c
+	rpmlua.c rpmlua.h lposix.c lposix.h \
+	rpmpgp_internal.c rpmpgp_internal.h
 
 if WITH_OPENSSL
 librpmio_la_SOURCES += digest_openssl.c
diff --git a/rpmio/digest.c b/rpmio/digest.c
index 1f5e1667b..1975fe6b9 100644
--- a/rpmio/digest.c
+++ b/rpmio/digest.c
@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include "rpmio/digest.h"
+#include "rpmio/rpmpgp_internal.h"
 
 #include "debug.h"
 
diff --git a/rpmio/digest_libgcrypt.c b/rpmio/digest_libgcrypt.c
index 6f5709103..7a75d2db3 100644
--- a/rpmio/digest_libgcrypt.c
+++ b/rpmio/digest_libgcrypt.c
@@ -3,7 +3,7 @@
 #include <gcrypt.h>
 
 #include <rpm/rpmcrypto.h>
-#include "rpmio/digest.h"
+#include "rpmio/rpmpgp_internal.h"
 #include "rpmio/rpmio_internal.h"
 #include "debug.h"
 
diff --git a/rpmio/digest_openssl.c b/rpmio/digest_openssl.c
index 02f34a90f..ec924f1ce 100644
--- a/rpmio/digest_openssl.c
+++ b/rpmio/digest_openssl.c
@@ -5,7 +5,7 @@
 #include <openssl/dsa.h>
 #include <rpm/rpmcrypto.h>
 
-#include "rpmio/digest.h"
+#include "rpmio/rpmpgp_internal.h"
 
 
 /* Compatibility functions for OpenSSL 1.0.2 */
diff --git a/rpmio/rpmkeyring.c b/rpmio/rpmkeyring.c
index 21113f617..db72892d9 100644
--- a/rpmio/rpmkeyring.c
+++ b/rpmio/rpmkeyring.c
@@ -9,8 +9,6 @@
 #include <rpm/rpmkeyring.h>
 #include <rpm/rpmbase64.h>
 
-#include "rpmio/digest.h"
-
 #include "debug.h"
 
 int _print_pkts = 0;
diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index 15eff36e9..90e7b6eac 100644
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -10,7 +10,6 @@
 #include <rpm/rpmstring.h>
 #include <rpm/rpmlog.h>
 
-#include "rpmio/digest.h"
 #include "rpmio/rpmpgpval.h"
 #include "rpmio/rpmio_internal.h"	/* XXX rpmioSlurp */
 
diff --git a/rpmio/rpmpgp_internal.c b/rpmio/rpmpgp_internal.c
index c4fab303b..cd42dcf71 100644
--- a/rpmio/rpmpgp_internal.c
+++ b/rpmio/rpmpgp_internal.c
@@ -11,8 +11,8 @@
 #include <rpm/rpmlog.h>
 #include <rpm/rpmbase64.h>
 
-#include "rpmio/digest.h"
 #include "rpmio/rpmpgpval.h"
+#include "rpmio/rpmpgp_internal.h"
 #include "rpmio/rpmio_internal.h"	/* XXX rpmioSlurp */
 
 #include "debug.h"
diff --git a/rpmio/digest.h b/rpmio/rpmpgp_internal.h
index 3d7c53d7f..64b50de13 100644
--- a/rpmio/digest.h
+++ b/rpmio/rpmpgp_internal.h
@@ -1,7 +1,7 @@
-#ifndef _RPMDIGEST_H
-#define _RPMDIGEST_H
+#ifndef _RPMPGP_INTERNAL_H
+#define _RPMPGP_INTERNAL_H
 
-#include <rpm/rpmpgp.h>
+#include "rpmio/rpmpgpval.h"
 
 typedef struct pgpDigAlg_s * pgpDigAlg;
 
@@ -23,7 +23,7 @@ pgpDigAlg pgpPubkeyNew(int algo, int curve);
 
 pgpDigAlg pgpSignatureNew(int algo);
 
-pgpDigAlg pgpDigAlgFree(pgpDigAlg da);
+pgpDigAlg pgpDigAlgFree(pgpDigAlg alg);
 
 /** \ingroup rpmpgp
  * Return no. of bits in a multiprecision integer.
@@ -46,5 +46,5 @@ size_t pgpMpiLen(const uint8_t *p)
 {
     return (2 + ((pgpMpiBits(p)+7)>>3));
 }
-	
-#endif /* _RPMDIGEST_H */
+
+#endif /* _RPMPGP_INTERNAL_H */
diff --git a/rpmio/rpmpgpval.h b/rpmio/rpmpgpval.h
index 0641f0803..ad8ed08e2 100644
--- a/rpmio/rpmpgpval.h
+++ b/rpmio/rpmpgpval.h
@@ -1,5 +1,5 @@
-#ifndef _RPMPGP_INTERNAL_H
-#define _RPMPGP_INTERNAL_H
+#ifndef _RPMPGPVAL_H
+#define _RPMPGPVAL_H
 
 #include <rpm/rpmpgp.h>
 
@@ -170,4 +170,4 @@ static struct pgpValTbl_s const pgpArmorKeyTbl[] = {
     { -1,			"Unknown armor key" }
 };
 
-#endif /* _RPMPGP_INTERNAL_H */
+#endif /* _RPMPGPVAL_H */