summaryrefslogtreecommitdiff
path: root/rpmio/rpmpgp.c
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2009-04-09 13:05:00 +0300
committerPanu Matilainen <pmatilai@redhat.com>2009-04-09 13:05:00 +0300
commit7a8aecbc8651cab2bd945db8ffd749f9a165bdf1 (patch)
tree474ca26488afa8314c598a50bf992f3b860aab25 /rpmio/rpmpgp.c
parent37a35d07211b612429fef6614888f5fa099dd27b (diff)
downloadlibrpm-tizen-7a8aecbc8651cab2bd945db8ffd749f9a165bdf1.tar.gz
librpm-tizen-7a8aecbc8651cab2bd945db8ffd749f9a165bdf1.tar.bz2
librpm-tizen-7a8aecbc8651cab2bd945db8ffd749f9a165bdf1.zip
Fix PGP v4 fingerprint calculation (rhbz#493777)
- patch from openSUSE / Michael Schroeder
Diffstat (limited to 'rpmio/rpmpgp.c')
-rw-r--r--rpmio/rpmpgp.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index 2fec32f0f..e671552ef 100644
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -1087,6 +1087,7 @@ int pgpPubkeyFingerprint(const uint8_t * pkt, size_t pktlen, pgpKeyID_t keyid)
case 4:
{ pgpPktKeyV4 v = (pgpPktKeyV4) (h);
uint8_t * d = NULL;
+ uint8_t in[3];
size_t dlen;
int i;
@@ -1103,7 +1104,12 @@ int pgpPubkeyFingerprint(const uint8_t * pkt, size_t pktlen, pgpKeyID_t keyid)
}
ctx = rpmDigestInit(PGPHASHALGO_SHA1, RPMDIGEST_NONE);
- (void) rpmDigestUpdate(ctx, pkt, (se-pkt));
+ i = se - h;
+ in[0] = 0x99;
+ in[1] = i >> 8;
+ in[2] = i;
+ (void) rpmDigestUpdate(ctx, in, 3);
+ (void) rpmDigestUpdate(ctx, h, i);
(void) rpmDigestFinal(ctx, (void **)&d, &dlen, 0);
if (d) {