security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00
Code Activity

* keyid.c (do_fingerprint_md): Remove the rules to hash the old v3 Elgamal

Browse Source 
keys.  They are no longer needed.
This commit is contained in:
David Shaw 2003-12-10 01:59:45 +00:00
parent 08967eb985
commit 888a6c2980
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/ChangeLog
View File

@ -1,5 +1,8 @@
2003-12-09 David Shaw <dshaw@jabberwocky.com> 2003-12-09 David Shaw <dshaw@jabberwocky.com>
* keyid.c (do_fingerprint_md): Remove the rules to hash the old v3
Elgamal keys. They are no longer needed.
* keyid.c (keyid_from_sk, keyid_from_pk, fingerprint_from_pk, * keyid.c (keyid_from_sk, keyid_from_pk, fingerprint_from_pk,
fingerprint_from_sk): Enforce the v3-is-only-RSA rule. Anything fingerprint_from_sk): Enforce the v3-is-only-RSA rule. Anything
that isn't RSA gets a zero keyid and fingerprint. that isn't RSA gets a zero keyid and fingerprint.

32
g10/keyid.c
View File

@ -51,15 +51,15 @@ static MD_HANDLE
do_fingerprint_md( PKT_public_key *pk ) do_fingerprint_md( PKT_public_key *pk )
{ {
MD_HANDLE md; MD_HANDLE md;
unsigned n; unsigned n=6;
unsigned nb[PUBKEY_MAX_NPKEY]; unsigned nb[PUBKEY_MAX_NPKEY];
unsigned nn[PUBKEY_MAX_NPKEY]; unsigned nn[PUBKEY_MAX_NPKEY];
byte *pp[PUBKEY_MAX_NPKEY]; byte *pp[PUBKEY_MAX_NPKEY];
int i; int i;
int npkey = pubkey_get_npkey( pk->pubkey_algo ); int npkey = pubkey_get_npkey( pk->pubkey_algo );
md = md_open( pk->version < 4 ? DIGEST_ALGO_RMD160 : DIGEST_ALGO_SHA1, 0); md = md_open( DIGEST_ALGO_SHA1, 0);
n = pk->version < 4 ? 8 : 6;
if(npkey==0 && pk->pkey[0] && mpi_is_opaque(pk->pkey[0])) if(npkey==0 && pk->pkey[0] && mpi_is_opaque(pk->pkey[0]))
{ {
pp[0]=mpi_get_opaque(pk->pkey[0],&nn[0]); pp[0]=mpi_get_opaque(pk->pkey[0],&nn[0]);
@ -74,29 +74,16 @@ do_fingerprint_md( PKT_public_key *pk )
} }
md_putc( md, 0x99 ); /* ctb */ md_putc( md, 0x99 ); /* ctb */
/* What does it mean if n is greater than than 0xFFFF ? */
md_putc( md, n >> 8 ); /* 2 byte length header */ md_putc( md, n >> 8 ); /* 2 byte length header */
md_putc( md, n ); md_putc( md, n );
if( pk->version < 4 ) md_putc( md, 4 );
md_putc( md, 3 );
else
md_putc( md, 4 );
{ u32 a = pk->timestamp; md_putc( md, pk->timestamp >> 24 );
md_putc( md, a >> 24 ); md_putc( md, pk->timestamp >> 16 );
md_putc( md, a >> 16 ); md_putc( md, pk->timestamp >> 8 );
md_putc( md, a >> 8 ); md_putc( md, pk->timestamp );
md_putc( md, a );
}
if( pk->version < 4 ) {
u16 a;
if( pk->expiredate )
a = (u16)((pk->expiredate - pk->timestamp) / 86400L);
else
a = 0;
md_putc( md, a >> 8 );
md_putc( md, a );
}
md_putc( md, pk->pubkey_algo ); md_putc( md, pk->pubkey_algo );
if(npkey==0 && pk->pkey[0] && mpi_is_opaque(pk->pkey[0])) if(npkey==0 && pk->pkey[0] && mpi_is_opaque(pk->pkey[0]))
@ -109,6 +96,7 @@ do_fingerprint_md( PKT_public_key *pk )
md_write( md, pp[i], nn[i] ); md_write( md, pp[i], nn[i] );
m_free(pp[i]); m_free(pp[i]);
} }
md_final( md ); md_final( md );
return md; return md;