diff options
| author | Werner Koch <[email protected]> | 2003-06-23 15:16:12 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2003-06-23 15:16:12 +0000 |
| commit | b7bd5e8088ae0318ca5c82daa60881ac3f7e6e54 (patch) | |
| tree | 313ae8c00545843ded59e4b6797f516de8997150 /g10/keyid.c | |
| parent | Finished the bulk of changes for gnupg 1.9. This included switching (diff) | |
| download | gnupg-b7bd5e8088ae0318ca5c82daa60881ac3f7e6e54.tar.gz gnupg-b7bd5e8088ae0318ca5c82daa60881ac3f7e6e54.zip | |
Fixes to the libgcrypt switch. Basically works now.
Diffstat (limited to 'g10/keyid.c')
| -rw-r--r-- | g10/keyid.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/g10/keyid.c b/g10/keyid.c index 78b637481..49a316db5 100644 --- a/g10/keyid.c +++ b/g10/keyid.c @@ -54,15 +54,15 @@ static gcry_md_hd_t do_fingerprint_md( PKT_public_key *pk ) { gcry_md_hd_t md; - unsigned n; - unsigned nb[PUBKEY_MAX_NPKEY]; - unsigned nn[PUBKEY_MAX_NPKEY]; + unsigned int n; + unsigned int nn[PUBKEY_MAX_NPKEY]; byte *pp[PUBKEY_MAX_NPKEY]; int i; int npkey = pubkey_get_npkey( pk->pubkey_algo ); gcry_md_open (&md, pk->version < 4 ? DIGEST_ALGO_RMD160 : DIGEST_ALGO_SHA1, 0); + gcry_md_start_debug (md,"keyid"); n = pk->version < 4 ? 8 : 6; for(i=0; i < npkey; i++ ) { size_t nbytes; @@ -74,7 +74,7 @@ do_fingerprint_md( PKT_public_key *pk ) if (gcry_mpi_print ( GCRYMPI_FMT_PGP, pp[i], &nbytes, pk->pkey[i] )) BUG (); nn[i] = nbytes; - n += 2 + nn[i]; + n += nn[i]; } gcry_md_putc ( md, 0x99 ); /* ctb */ @@ -103,8 +103,6 @@ do_fingerprint_md( PKT_public_key *pk ) } gcry_md_putc ( md, pk->pubkey_algo ); for(i=0; i < npkey; i++ ) { - gcry_md_putc ( md, nb[i]>>8); - gcry_md_putc ( md, nb[i] ); gcry_md_write( md, pp[i], nn[i] ); xfree (pp[i]); } |