diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 7 | ||||
| -rw-r--r-- | g10/keyid.c | 2 | ||||
| -rw-r--r-- | g10/sig-check.c | 77 | ||||
| -rw-r--r-- | g10/sign.c | 4 |
4 files changed, 10 insertions, 80 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 6285f73ee..74d021271 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,10 @@ +2003-12-17 David Shaw <[email protected]> + + * sig-check.c (cmp_help, do_check), sign.c (do_sign): Remove old + unused code. + + * keyid.c (keyid_from_sk): Make sure lowbits is initialized. + 2003-12-12 David Shaw <[email protected]> * sig-check.c (do_check): Move the signing algo and hash checks diff --git a/g10/keyid.c b/g10/keyid.c index 3648e0579..0e2924c39 100644 --- a/g10/keyid.c +++ b/g10/keyid.c @@ -177,7 +177,7 @@ keyid_from_sk( PKT_secret_key *sk, u32 *keyid ) md_close(md); } else - keyid[0]=keyid[1]=0; + keyid[0]=keyid[1]=lowbits=0; } return lowbits; diff --git a/g10/sig-check.c b/g10/sig-check.c index a1287101d..3270c682b 100644 --- a/g10/sig-check.c +++ b/g10/sig-check.c @@ -132,80 +132,6 @@ signature_check2( PKT_signature *sig, MD_HANDLE digest, u32 *r_expiredate, } -/**************** - * This function gets called by pubkey_verify() if the algorithm needs it. - */ -static int -cmp_help( void *opaque, MPI result ) -{ -#if 0 /* we do not use this anymore */ - int rc=0, i, j, c, old_enc; - byte *dp; - const byte *asn; - size_t mdlen, asnlen; - struct cmp_help_context_s *ctx = opaque; - PKT_signature *sig = ctx->sig; - MD_HANDLE digest = ctx->md; - - old_enc = 0; - for(i=j=0; (c=mpi_getbyte(result, i)) != -1; i++ ) { - if( !j ) { - if( !i && c != 1 ) - break; - else if( i && c == 0xff ) - ; /* skip the padding */ - else if( i && !c ) - j++; - else - break; - } - else if( ++j == 18 && c != 1 ) - break; - else if( j == 19 && c == 0 ) { - old_enc++; - break; - } - } - if( old_enc ) { - log_error("old encoding scheme is not supported\n"); - return G10ERR_GENERAL; - } - - if( (rc=check_digest_algo(sig->digest_algo)) ) - return rc; /* unsupported algo */ - asn = md_asn_oid( sig->digest_algo, &asnlen, &mdlen ); - - for(i=mdlen,j=asnlen-1; (c=mpi_getbyte(result, i)) != -1 && j >= 0; - i++, j-- ) - if( asn[j] != c ) - break; - if( j != -1 || mpi_getbyte(result, i) ) - return G10ERR_BAD_PUBKEY; /* ASN is wrong */ - for(i++; (c=mpi_getbyte(result, i)) != -1; i++ ) - if( c != 0xff ) - break; - i++; - if( c != sig->digest_algo || mpi_getbyte(result, i) ) { - /* Padding or leading bytes in signature is wrong */ - return G10ERR_BAD_PUBKEY; - } - if( mpi_getbyte(result, mdlen-1) != sig->digest_start[0] - || mpi_getbyte(result, mdlen-2) != sig->digest_start[1] ) { - /* Wrong key used to check the signature */ - return G10ERR_BAD_PUBKEY; - } - - dp = md_read( digest, sig->digest_algo ); - for(i=mdlen-1; i >= 0; i--, dp++ ) { - if( mpi_getbyte( result, i ) != *dp ) - return G10ERR_BAD_SIGN; - } - return 0; -#else - return -1; -#endif -} - static int do_check_messages( PKT_public_key *pk, PKT_signature *sig, int *r_expired, int *r_revoked ) @@ -330,8 +256,7 @@ do_check( PKT_public_key *pk, PKT_signature *sig, MD_HANDLE digest, return G10ERR_GENERAL; ctx.sig = sig; ctx.md = digest; - rc = pubkey_verify( pk->pubkey_algo, result, sig->data, pk->pkey, - cmp_help, &ctx ); + rc = pubkey_verify( pk->pubkey_algo, result, sig->data, pk->pkey ); mpi_free( result ); if( !rc && sig->flags.unknown_critical ) { diff --git a/g10/sign.c b/g10/sign.c index 340b5774a..5260ce3ba 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -357,8 +357,7 @@ do_sign( PKT_secret_key *sk, PKT_signature *sig, rc = G10ERR_GENERAL; else rc = pubkey_verify (pk->pubkey_algo, frame, - sig->data, pk->pkey, - NULL, NULL ); + sig->data, pk->pkey ); mpi_free (frame); } if (rc) @@ -382,7 +381,6 @@ do_sign( PKT_secret_key *sk, PKT_signature *sig, } - int complete_sig( PKT_signature *sig, PKT_secret_key *sk, MD_HANDLE md ) { |