Add support for beecrypt-4.0.0.

CVS patchset: 7367
CVS date: 2004/07/31 17:48:11

diff --git a/configure.ac b/configure.ac
index 8e9d27a..989c16a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -413,6 +413,9 @@ WITH_BEECRYPT_LIB=
 AC_CHECK_HEADER([beecrypt/beecrypt.h], [
        AC_CHECK_LIB(beecrypt, mpfprintln, [
            AC_DEFINE(HAVE_LIBBEECRYPT, 1, [Define to 1 if you have the `beecrypt' library (-lbeecrypt).])
+           AC_CHECK_HEADER([beecrypt/api.h], [
+               AC_DEFINE(HAVE_BEECRYPT_API_H, 1, [Define to 1 if you have the <beecrypt/api.h> header file.])
+               ])
            WITH_BEECRYPT_INCLUDE="-I/usr/include/beecrypt"
            WITH_BEECRYPT_LIB="-lbeecrypt"
        ])

diff --git a/lib/signature.c b/lib/signature.c
index 968fcb9..ba5fb06 100644 (file)
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -1226,7 +1226,12 @@ verifyPGPSignature(rpmts ts, /*@out@*/ char * t,
        goto exit;
 
     (void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_SIGNATURE), 0);
-    if (rsavrfy(&dig->rsa_pk, &dig->rsahm, &dig->c))
+#if HAVE_BEECRYPT_API_H
+    xx = rsavrfy(&dig->rsa_pk.n, &dig->rsa_pk.e, &dig->rsahm, &dig->c);
+#else
+    xx = rsavrfy(&dig->rsa_pk, &dig->rsahm, &dig->c);
+#endif
+    if (xx)
        res = RPMRC_OK;
     else
        res = RPMRC_FAIL;

diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h
index faf858d..e4c7be6 100644 (file)
--- a/rpmio/rpmio_internal.h
+++ b/rpmio/rpmio_internal.h
@@ -9,7 +9,12 @@
 #include <rpmio.h>
 #include <rpmurl.h>
 
+#if HAVE_BEECRYPT_API_H
+#include <api.h>
+#else
 #include <beecrypt.api.h>
+#endif
+
 #include <rpmpgp.h>
 #include <rpmsw.h>