RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 17-Sep-2014 05:36:22
Branch: rpm-5_4 Handle: 2014091703361902
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/build build.c pack.c
rpm/rpmio librpmio.vers rpmbc.c rpmbc.h rpmcdsa.c rpmgc.c
rpmgc.h rpmltc.c rpmltc.h rpmnss.c rpmnss.h
rpmpgp.c rpmpgp.h rpmssl.c rpmssl.h
Log:
- rpmpgp: add pgpImplExport{Pubkey,Signature} vectors/wrappers.
Summary:
Revision Changes Path
1.3501.2.443+1 -0 rpm/CHANGES
2.145.2.3 +1 -1 rpm/build/build.c
2.324.2.13 +1 -1 rpm/build/pack.c
2.199.2.40 +0 -2 rpm/rpmio/librpmio.vers
2.35.2.9 +20 -17 rpm/rpmio/rpmbc.c
2.14.2.6 +0 -5 rpm/rpmio/rpmbc.h
1.3.2.1 +6 -0 rpm/rpmio/rpmcdsa.c
2.34.2.11 +20 -17 rpm/rpmio/rpmgc.c
2.10.2.6 +0 -5 rpm/rpmio/rpmgc.h
1.2.4.11 +20 -17 rpm/rpmio/rpmltc.c
1.2.4.6 +0 -5 rpm/rpmio/rpmltc.h
1.40.2.16 +20 -17 rpm/rpmio/rpmnss.c
1.12.2.4 +0 -5 rpm/rpmio/rpmnss.h
2.127.2.15 +1 -55 rpm/rpmio/rpmpgp.c
2.108.2.13 +36 -0 rpm/rpmio/rpmpgp.h
2.42.2.14 +20 -17 rpm/rpmio/rpmssl.c
2.14.2.7 +0 -5 rpm/rpmio/rpmssl.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.442 -r1.3501.2.443 CHANGES
--- rpm/CHANGES 17 Sep 2014 03:00:51 -0000 1.3501.2.442
+++ rpm/CHANGES 17 Sep 2014 03:36:19 -0000 1.3501.2.443
@@ -1,4 +1,5 @@
5.4.15 -> 5.4.16:
+ - jbj: rpmpgp: add pgpImplExport{Pubkey,Signature} vectors/wrappers.
- jbj: rpmpgp: switch to LibTomCrypt, default to ECDSA/SHA256 signing.
- jbj: java: bsh-2.0b5.jar in a linux jdk1.7.0_03 JVM using JNI
embedding.
- jbj: rpmdav: handle NE_REDIRECT, take #1.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/build.c
============================================================================
$ cvs diff -u -r2.145.2.2 -r2.145.2.3 build.c
--- rpm/build/build.c 5 May 2014 19:48:44 -0000 2.145.2.2
+++ rpm/build/build.c 17 Sep 2014 03:36:20 -0000 2.145.2.3
@@ -346,7 +346,7 @@
xx = pgpDigSetAlgos(spec->dig);
xx = pgpImplGenerate(spec->dig);
assert(xx == 1);
- xx = pgpExportPubkey(spec->dig);
+ xx = pgpImplExportPubkey(spec->dig);
}
if (!spec->recursing && spec->BACount) {
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/pack.c
============================================================================
$ cvs diff -u -r2.324.2.12 -r2.324.2.13 pack.c
--- rpm/build/pack.c 5 May 2014 19:48:45 -0000 2.324.2.12
+++ rpm/build/pack.c 17 Sep 2014 03:36:20 -0000 2.324.2.13
@@ -842,7 +842,7 @@
/* Sign the header SHA1. */
if (ctx)
- xx = pgpExportSignature(dig, ctx);
+ xx = pgpImplExportSignature(dig, ctx);
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/librpmio.vers
============================================================================
$ cvs diff -u -r2.199.2.39 -r2.199.2.40 librpmio.vers
--- rpm/rpmio/librpmio.vers 11 Sep 2014 18:18:32 -0000 2.199.2.39
+++ rpm/rpmio/librpmio.vers 17 Sep 2014 03:36:21 -0000 2.199.2.40
@@ -273,8 +273,6 @@
_pgp_debug;
_pgp_error_count;
_pgp_print;
- pgpExportPubkey;
- pgpExportSignature;
pgpExtractPubkeyFingerprint;
pgpFindPubkey;
pgpGetPubkey;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmbc.c
============================================================================
$ cvs diff -u -r2.35.2.8 -r2.35.2.9 rpmbc.c
--- rpm/rpmio/rpmbc.c 12 May 2014 19:54:44 -0000 2.35.2.8
+++ rpm/rpmio/rpmbc.c 17 Sep 2014 03:36:21 -0000 2.35.2.9
@@ -692,22 +692,7 @@
return (void *) bc;
}
-struct pgpImplVecs_s rpmbcImplVecs = {
- "BeeCrypt 4.2.1", /* XXX FIXME: add version string to beecrypt */
- rpmbcSetRSA,
- rpmbcSetDSA,
- rpmbcSetELG,
- rpmbcSetECDSA,
-
- rpmbcErrChk,
- rpmbcAvailableCipher, rpmbcAvailableDigest, rpmbcAvailablePubkey,
- rpmbcVerify, rpmbcSign, rpmbcGenerate,
-
- rpmbcMpiItem, rpmbcClean,
- rpmbcFree, rpmbcInit
-};
-
-int rpmbcExportPubkey(pgpDig dig)
+static int rpmbcExportPubkey(pgpDig dig)
{
uint8_t pkt[8192];
uint8_t * be = pkt;
@@ -815,7 +800,7 @@
return rc;
}
-int rpmbcExportSignature(pgpDig dig, /*@only@*/ DIGEST_CTX ctx)
+static int rpmbcExportSignature(pgpDig dig, /*@only@*/ DIGEST_CTX ctx)
{
uint8_t pkt[8192];
uint8_t * be = pkt;
@@ -992,3 +977,21 @@
return 0;
}
+
+struct pgpImplVecs_s rpmbcImplVecs = {
+ "RPM " VERSION,
+ "BeeCrypt 4.2.1", /* XXX FIXME: add version string to beecrypt */
+ rpmbcSetRSA,
+ rpmbcSetDSA,
+ rpmbcSetELG,
+ rpmbcSetECDSA,
+
+ rpmbcErrChk,
+ rpmbcAvailableCipher, rpmbcAvailableDigest, rpmbcAvailablePubkey,
+ rpmbcVerify, rpmbcSign, rpmbcGenerate,
+
+ rpmbcExportPubkey, rpmbcExportSignature,
+
+ rpmbcMpiItem, rpmbcClean,
+ rpmbcFree, rpmbcInit
+};
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmbc.h
============================================================================
$ cvs diff -u -r2.14.2.5 -r2.14.2.6 rpmbc.h
--- rpm/rpmio/rpmbc.h 12 May 2014 19:54:44 -0000 2.14.2.5
+++ rpm/rpmio/rpmbc.h 17 Sep 2014 03:36:21 -0000 2.14.2.6
@@ -77,9 +77,4 @@
/*@unchecked@*/
extern pgpImplVecs_t rpmbcImplVecs;
-int rpmbcExportPubkey(pgpDig dig)
- /*@*/;
-int rpmbcExportSignature(pgpDig dig, /*@only@*/ DIGEST_CTX ctx)
- /*@*/;
-
#endif /* H_RPMBC */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmcdsa.c
============================================================================
$ cvs diff -u -r1.3 -r1.3.2.1 rpmcdsa.c
--- rpm/rpmio/rpmcdsa.c 26 Jun 2010 05:16:55 -0000 1.3
+++ rpm/rpmio/rpmcdsa.c 17 Sep 2014 03:36:21 -0000 1.3.2.1
@@ -570,6 +570,8 @@
}
struct pgpImplVecs_s rpmcdsaImplVecs = {
+ "RPM " VERSION,
+ "RPM " VERSION, /* XXX FIXME */
rpmcdsaSetRSA,
rpmcdsaSetDSA,
rpmcdsaSetELG,
@@ -579,6 +581,10 @@
rpmcdsaAvailableCipher, rpmcdsaAvailableDigest, rpmcdsaAvailablePubkey,
rpmcdsaVerify, rpmcdsaSign, rpmcdsaGenerate,
+#define rpmcdsaExportPubkey NULL
+#define rpmcdsaExportSignature NULL
+ rpmcdsaExportPubkey, rpmcdsaExportSignature,
+
rpmcdsaMpiItem, rpmcdsaClean,
rpmcdsaFree, rpmcdsaInit
};
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmgc.c
============================================================================
$ cvs diff -u -r2.34.2.10 -r2.34.2.11 rpmgc.c
--- rpm/rpmio/rpmgc.c 9 Sep 2014 17:12:07 -0000 2.34.2.10
+++ rpm/rpmio/rpmgc.c 17 Sep 2014 03:36:21 -0000 2.34.2.11
@@ -1184,22 +1184,7 @@
return (void *) gc;
}
-struct pgpImplVecs_s rpmgcImplVecs = {
- "Gcrypt " GCRYPT_VERSION,
- rpmgcSetRSA,
- rpmgcSetDSA,
- rpmgcSetELG,
- rpmgcSetECDSA,
-
- rpmgcErrChk,
- rpmgcAvailableCipher, rpmgcAvailableDigest, rpmgcAvailablePubkey,
- rpmgcVerify, rpmgcSign, rpmgcGenerate,
-
- rpmgcMpiItem, rpmgcClean,
- rpmgcFree, rpmgcInit
-};
-
-int rpmgcExportPubkey(pgpDig dig)
+static int rpmgcExportPubkey(pgpDig dig)
{
uint8_t pkt[8192];
uint8_t * be = pkt;
@@ -1319,7 +1304,7 @@
return rc;
}
-int rpmgcExportSignature(pgpDig dig, /*@only@*/ DIGEST_CTX ctx)
+static int rpmgcExportSignature(pgpDig dig, /*@only@*/ DIGEST_CTX ctx)
{
uint8_t pkt[8192];
uint8_t * be = pkt;
@@ -1501,4 +1486,22 @@
return rc;
}
+struct pgpImplVecs_s rpmgcImplVecs = {
+ "RPM " VERSION,
+ "Gcrypt " GCRYPT_VERSION,
+ rpmgcSetRSA,
+ rpmgcSetDSA,
+ rpmgcSetELG,
+ rpmgcSetECDSA,
+
+ rpmgcErrChk,
+ rpmgcAvailableCipher, rpmgcAvailableDigest, rpmgcAvailablePubkey,
+ rpmgcVerify, rpmgcSign, rpmgcGenerate,
+
+ rpmgcExportPubkey, rpmgcExportSignature,
+
+ rpmgcMpiItem, rpmgcClean,
+ rpmgcFree, rpmgcInit
+};
+
#endif /* WITH_GCRYPT */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmgc.h
============================================================================
$ cvs diff -u -r2.10.2.5 -r2.10.2.6 rpmgc.h
--- rpm/rpmio/rpmgc.h 13 May 2014 02:10:53 -0000 2.10.2.5
+++ rpm/rpmio/rpmgc.h 17 Sep 2014 03:36:21 -0000 2.10.2.6
@@ -71,9 +71,4 @@
/*@unchecked@*/
extern pgpImplVecs_t rpmgcImplVecs;
-int rpmgcExportPubkey(pgpDig dig)
- /*@*/;
-int rpmgcExportSignature(pgpDig dig, /*@only@*/ DIGEST_CTX ctx)
- /*@*/;
-
#endif /* H_RPMGC */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmltc.c
============================================================================
$ cvs diff -u -r1.2.4.10 -r1.2.4.11 rpmltc.c
--- rpm/rpmio/rpmltc.c 17 Sep 2014 02:59:40 -0000 1.2.4.10
+++ rpm/rpmio/rpmltc.c 17 Sep 2014 03:36:21 -0000 1.2.4.11
@@ -916,22 +916,7 @@
return (void *) ltc;
}
-struct pgpImplVecs_s rpmltcImplVecs = {
- "TomCrypt " SCRYPT,
- rpmltcSetRSA,
- rpmltcSetDSA,
- rpmltcSetELG,
- rpmltcSetECDSA,
-
- rpmltcErrChk,
- rpmltcAvailableCipher, rpmltcAvailableDigest, rpmltcAvailablePubkey,
- rpmltcVerify, rpmltcSign, rpmltcGenerate,
-
- rpmltcMpiItem, rpmltcClean,
- rpmltcFree, rpmltcInit
-};
-
-int rpmltcExportPubkey(pgpDig dig)
+static int rpmltcExportPubkey(pgpDig dig)
{
uint8_t pkt[8192];
uint8_t * be = pkt;
@@ -1044,7 +1029,7 @@
return rc;
}
-int rpmltcExportSignature(pgpDig dig, /*@only@*/ DIGEST_CTX ctx)
+static int rpmltcExportSignature(pgpDig dig, /*@only@*/ DIGEST_CTX ctx)
{
uint8_t pkt[8192];
uint8_t * be = pkt;
@@ -1221,4 +1206,22 @@
return rc;
}
+struct pgpImplVecs_s rpmltcImplVecs = {
+ "RPM " VERSION,
+ "TomCrypt " SCRYPT,
+ rpmltcSetRSA,
+ rpmltcSetDSA,
+ rpmltcSetELG,
+ rpmltcSetECDSA,
+
+ rpmltcErrChk,
+ rpmltcAvailableCipher, rpmltcAvailableDigest, rpmltcAvailablePubkey,
+ rpmltcVerify, rpmltcSign, rpmltcGenerate,
+
+ rpmltcExportPubkey, rpmltcExportSignature,
+
+ rpmltcMpiItem, rpmltcClean,
+ rpmltcFree, rpmltcInit
+};
+
#endif /* WITH_TOMCRYPT */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmltc.h
============================================================================
$ cvs diff -u -r1.2.4.5 -r1.2.4.6 rpmltc.h
--- rpm/rpmio/rpmltc.h 3 May 2014 06:05:18 -0000 1.2.4.5
+++ rpm/rpmio/rpmltc.h 17 Sep 2014 03:36:21 -0000 1.2.4.6
@@ -56,9 +56,4 @@
/*@unchecked@*/
extern pgpImplVecs_t rpmltcImplVecs;
-int rpmltcExportPubkey(pgpDig dig)
- /*@*/;
-int rpmltcExportSignature(pgpDig dig, /*@only@*/ DIGEST_CTX ctx)
- /*@*/;
-
#endif /* H_RPMLTC */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmnss.c
============================================================================
$ cvs diff -u -r1.40.2.15 -r1.40.2.16 rpmnss.c
--- rpm/rpmio/rpmnss.c 19 Jul 2014 18:53:59 -0000 1.40.2.15
+++ rpm/rpmio/rpmnss.c 17 Sep 2014 03:36:21 -0000 1.40.2.16
@@ -1798,22 +1798,7 @@
return (void *) nss;
}
-struct pgpImplVecs_s rpmnssImplVecs = {
- "NSS " NSS_VERSION,
- rpmnssSetRSA,
- rpmnssSetDSA,
- rpmnssSetELG,
- rpmnssSetECDSA,
-
- rpmnssErrChk,
- rpmnssAvailableCipher, rpmnssAvailableDigest, rpmnssAvailablePubkey,
- rpmnssVerify, rpmnssSign, rpmnssGenerate,
-
- rpmnssMpiItem, rpmnssClean,
- rpmnssFree, rpmnssInit
-};
-
-int rpmnssExportPubkey(pgpDig dig)
+static int rpmnssExportPubkey(pgpDig dig)
{
uint8_t pkt[8192];
uint8_t * be = pkt;
@@ -1923,7 +1908,7 @@
return 0;
}
-int rpmnssExportSignature(pgpDig dig, /*@only@*/ DIGEST_CTX ctx)
+static int rpmnssExportSignature(pgpDig dig, /*@only@*/ DIGEST_CTX ctx)
{
uint8_t pkt[8192];
uint8_t * be = pkt;
@@ -2105,4 +2090,22 @@
return rc;
}
+struct pgpImplVecs_s rpmnssImplVecs = {
+ "RPM " VERSION,
+ "NSS " NSS_VERSION,
+ rpmnssSetRSA,
+ rpmnssSetDSA,
+ rpmnssSetELG,
+ rpmnssSetECDSA,
+
+ rpmnssErrChk,
+ rpmnssAvailableCipher, rpmnssAvailableDigest, rpmnssAvailablePubkey,
+ rpmnssVerify, rpmnssSign, rpmnssGenerate,
+
+ rpmnssExportPubkey, rpmnssExportSignature,
+
+ rpmnssMpiItem, rpmnssClean,
+ rpmnssFree, rpmnssInit
+};
+
#endif /* WITH_NSS */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmnss.h
============================================================================
$ cvs diff -u -r1.12.2.3 -r1.12.2.4 rpmnss.h
--- rpm/rpmio/rpmnss.h 3 May 2014 06:05:18 -0000 1.12.2.3
+++ rpm/rpmio/rpmnss.h 17 Sep 2014 03:36:21 -0000 1.12.2.4
@@ -69,9 +69,4 @@
/*@unchecked@*/
extern pgpImplVecs_t rpmnssImplVecs;
-int rpmnssExportPubkey(pgpDig dig)
- /*@*/;
-int rpmnssExportSignature(pgpDig dig, /*@only@*/ DIGEST_CTX ctx)
- /*@*/;
-
#endif /* H_RPMNSS */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmpgp.c
============================================================================
$ cvs diff -u -r2.127.2.14 -r2.127.2.15 rpmpgp.c
--- rpm/rpmio/rpmpgp.c 17 Sep 2014 03:00:53 -0000 2.127.2.14
+++ rpm/rpmio/rpmpgp.c 17 Sep 2014 03:36:21 -0000 2.127.2.15
@@ -1330,65 +1330,11 @@
xx = pgpDigSetAlgos(dig);
xx = pgpImplGenerate(dig);
assert(xx == 1);
- xx = pgpExportPubkey(dig);
+ xx = pgpImplExportPubkey(dig);
}
return dig;
}
-int pgpExportPubkey(pgpDig dig)
-{
- int rc = 0; /* assume failure */
-
-#if defined(WITH_BEECRYPT)
- if (pgpImplVecs == &rpmbcImplVecs)
- rc = rpmbcExportPubkey(dig);
-#endif
-#if defined(WITH_SSL)
- if (pgpImplVecs == &rpmsslImplVecs)
- rc = rpmsslExportPubkey(dig);
-#endif
-#if defined(WITH_NSS)
- if (pgpImplVecs == &rpmnssImplVecs)
- rc = rpmnssExportPubkey(dig);
-#endif
-#if defined(WITH_GCRYPT)
- if (pgpImplVecs == &rpmgcImplVecs)
- rc = rpmgcExportPubkey(dig);
-#endif
-#if defined(WITH_TOMCRYPT)
- if (pgpImplVecs == &rpmltcImplVecs)
- rc = rpmltcExportPubkey(dig);
-#endif
- return rc;
-}
-
-int pgpExportSignature(pgpDig dig, DIGEST_CTX ctx)
-{
- int rc = 0; /* assume failure */
-
-#if defined(WITH_BEECRYPT)
- if (pgpImplVecs == &rpmbcImplVecs)
- rc = rpmbcExportSignature(dig, ctx);
-#endif
-#if defined(WITH_SSL)
- if (pgpImplVecs == &rpmsslImplVecs)
- rc = rpmsslExportSignature(dig, ctx);
-#endif
-#if defined(WITH_NSS)
- if (pgpImplVecs == &rpmnssImplVecs)
- rc = rpmnssExportSignature(dig, ctx);
-#endif
-#if defined(WITH_GCRYPT)
- if (pgpImplVecs == &rpmgcImplVecs)
- rc = rpmgcExportSignature(dig, ctx);
-#endif
-#if defined(WITH_TOMCRYPT)
- if (pgpImplVecs == &rpmltcImplVecs)
- rc = rpmltcExportSignature(dig, ctx);
-#endif
- return rc;
-}
-
pgpDigParams pgpGetSignature(pgpDig dig)
{
return (dig ? &dig->signature : NULL);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmpgp.h
============================================================================
$ cvs diff -u -r2.108.2.12 -r2.108.2.13 rpmpgp.h
--- rpm/rpmio/rpmpgp.h 10 Sep 2014 20:11:20 -0000 2.108.2.12
+++ rpm/rpmio/rpmpgp.h 17 Sep 2014 03:36:21 -0000 2.108.2.13
@@ -1722,6 +1722,16 @@
/**
*/
+typedef int (*pgpImplExportPubkey_t) (pgpDig dig)
+ /*@*/;
+
+/**
+ */
+typedef int (*pgpImplExportSignature_t) (pgpDig dig, DIGEST_CTX ctx)
+ /*@*/;
+
+/**
+ */
typedef int (*pgpImplMpiItem_t) (const char * pre, pgpDig dig, int itemno,
const rpmuint8_t * p, /*@null@*/ const rpmuint8_t * pend)
/*@globals fileSystem @*/
@@ -1746,6 +1756,7 @@
/**
*/
typedef struct pgpImplVecs_s {
+ const char * _pgpRPM;
const char * _pgpNV;
pgpImplSet_t _pgpSetRSA;
pgpImplSet_t _pgpSetDSA;
@@ -1761,6 +1772,9 @@
pgpImplSign_t _pgpSign;
pgpImplGenerate_t _pgpGenerate;
+ pgpImplExportPubkey_t _pgpExportPubkey;
+ pgpImplExportSignature_t _pgpExportSignature;
+
pgpImplMpiItem_t _pgpMpiItem;
pgpImplClean_t _pgpClean;
pgpImplFree_t _pgpFree;
@@ -1889,6 +1903,28 @@
/**
*/
/*@unused@*/ static inline
+int pgpImplExportPubkey(pgpDig dig)
+ /*@*/
+{
+ return (pgpImplVecs->_pgpExportPubkey
+ ? (*pgpImplVecs->_pgpExportPubkey) (dig)
+ : 0);
+}
+
+/**
+ */
+/*@unused@*/ static inline
+int pgpImplExportSignature(pgpDig dig, DIGEST_CTX ctx)
+ /*@*/
+{
+ return (pgpImplVecs->_pgpExportSignature
+ ? (*pgpImplVecs->_pgpExportSignature) (dig, ctx)
+ : 0);
+}
+
+/**
+ */
+/*@unused@*/ static inline
int pgpImplMpiItem(const char * pre, pgpDig dig, int itemno,
const rpmuint8_t * p, /*@null@*/ const rpmuint8_t * pend)
/*@modifies dig @*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmssl.c
============================================================================
$ cvs diff -u -r2.42.2.13 -r2.42.2.14 rpmssl.c
--- rpm/rpmio/rpmssl.c 19 Jul 2014 16:50:11 -0000 2.42.2.13
+++ rpm/rpmio/rpmssl.c 17 Sep 2014 03:36:21 -0000 2.42.2.14
@@ -1016,22 +1016,7 @@
return (void *) ssl;
}
-struct pgpImplVecs_s rpmsslImplVecs = {
- OPENSSL_VERSION_TEXT,
- rpmsslSetRSA,
- rpmsslSetDSA,
- rpmsslSetELG,
- rpmsslSetECDSA,
-
- rpmsslErrChk,
- rpmsslAvailableCipher, rpmsslAvailableDigest, rpmsslAvailablePubkey,
- rpmsslVerify, rpmsslSign, rpmsslGenerate,
-
- rpmsslMpiItem, rpmsslClean,
- rpmsslFree, rpmsslInit
-};
-
-int rpmsslExportPubkey(pgpDig dig)
+static int rpmsslExportPubkey(pgpDig dig)
{
uint8_t pkt[8192];
uint8_t * be = pkt;
@@ -1141,7 +1126,7 @@
return rc;
}
-int rpmsslExportSignature(pgpDig dig, /*@only@*/ DIGEST_CTX ctx)
+static int rpmsslExportSignature(pgpDig dig, /*@only@*/ DIGEST_CTX ctx)
{
const unsigned char * q;
uint8_t pkt[8192];
@@ -1336,4 +1321,22 @@
}
+struct pgpImplVecs_s rpmsslImplVecs = {
+ "RPM " VERSION,
+ OPENSSL_VERSION_TEXT,
+ rpmsslSetRSA,
+ rpmsslSetDSA,
+ rpmsslSetELG,
+ rpmsslSetECDSA,
+
+ rpmsslErrChk,
+ rpmsslAvailableCipher, rpmsslAvailableDigest, rpmsslAvailablePubkey,
+ rpmsslVerify, rpmsslSign, rpmsslGenerate,
+
+ rpmsslExportPubkey, rpmsslExportSignature,
+
+ rpmsslMpiItem, rpmsslClean,
+ rpmsslFree, rpmsslInit
+};
+
#endif /* WITH_SSL */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmssl.h
============================================================================
$ cvs diff -u -r2.14.2.6 -r2.14.2.7 rpmssl.h
--- rpm/rpmio/rpmssl.h 8 May 2014 01:52:04 -0000 2.14.2.6
+++ rpm/rpmio/rpmssl.h 17 Sep 2014 03:36:21 -0000 2.14.2.7
@@ -80,9 +80,4 @@
/*@unchecked@*/
extern pgpImplVecs_t rpmsslImplVecs;
-int rpmsslExportPubkey(pgpDig dig)
- /*@*/;
-int rpmsslExportSignature(pgpDig dig, /*@only@*/ DIGEST_CTX ctx)
- /*@*/;
-
#endif /* H_RPMSSL */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
