security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

Minor code cleanups.

Browse Source 
* keyid.c (hash_public_key): Remove shadowing NBITS.

	* misc.c (pubkey_nbits): Replace GCRY_PK_ by PUBKEY_ALGO_.
	(get_signature_count): Remove warning.
This commit is contained in:
Werner Koch 2011-03-03 12:57:31 +01:00
parent ea41f5b4c1
commit aeb324273a
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,5 +1,10 @@
2011-03-03 Werner Koch <wk@g10code.com> 2011-03-03 Werner Koch <wk@g10code.com>
* keyid.c (hash_public_key): Remove shadowing NBITS.
* misc.c (pubkey_nbits): Replace GCRY_PK_ by PUBKEY_ALGO_.
(get_signature_count): Remove warning.
* armor.c (armor_filter): Don't take a copy of radbuf while * armor.c (armor_filter): Don't take a copy of radbuf while
writing the checksum. This works around a faulty gcc 4.4 warning. writing the checksum. This works around a faulty gcc 4.4 warning.

1
g10/keyid.c
View File

@ -99,7 +99,6 @@ hash_public_key (gcry_md_hd_t md, PKT_public_key *pk)
{ {
if (gcry_mpi_get_flag (pk->pkey[i], GCRYMPI_FLAG_OPAQUE)) if (gcry_mpi_get_flag (pk->pkey[i], GCRYMPI_FLAG_OPAQUE))
{ {
size_t nbits;
const void *p; const void *p;
p = gcry_mpi_get_opaque (pk->pkey[i], &nbits); p = gcry_mpi_get_opaque (pk->pkey[i], &nbits);

12
g10/misc.c
View File

@ -569,7 +569,8 @@ get_signature_count (PKT_public_key *pk)
{ {
#ifdef ENABLE_CARD_SUPPORT #ifdef ENABLE_CARD_SUPPORT
struct agent_card_info_s info; struct agent_card_info_s info;
#warning fixme: We should check that the correct card has been inserted
(void)pk;
if (!agent_scd_getattr ("SIG-COUNTER",&info)) if (!agent_scd_getattr ("SIG-COUNTER",&info))
return info.sig_counter; return info.sig_counter;
else else
@ -1453,20 +1454,17 @@ pubkey_nbits( int algo, gcry_mpi_t *key )
int rc, nbits; int rc, nbits;
gcry_sexp_t sexp; gcry_sexp_t sexp;
#warning FIXME: We are mixing OpenPGP And CGrypt Ids if( algo == PUBKEY_ALGO_DSA ) {
assert( algo != GCRY_PK_ECDSA && algo != GCRY_PK_ECDH );
if( algo == GCRY_PK_DSA ) {
rc = gcry_sexp_build ( &sexp, NULL, rc = gcry_sexp_build ( &sexp, NULL,
"(public-key(dsa(p%m)(q%m)(g%m)(y%m)))", "(public-key(dsa(p%m)(q%m)(g%m)(y%m)))",
key[0], key[1], key[2], key[3] ); key[0], key[1], key[2], key[3] );
} }
else if( algo == GCRY_PK_ELG || algo == GCRY_PK_ELG_E ) { else if( algo == PUBKEY_ALGO_ELGAMAL || algo == PUBKEY_ALGO_ELGAMAL_E ) {
rc = gcry_sexp_build ( &sexp, NULL, rc = gcry_sexp_build ( &sexp, NULL,
"(public-key(elg(p%m)(g%m)(y%m)))", "(public-key(elg(p%m)(g%m)(y%m)))",
key[0], key[1], key[2] ); key[0], key[1], key[2] );
} }
else if( algo == GCRY_PK_RSA ) { else if( is_RSA (algo) ) {
rc = gcry_sexp_build ( &sexp, NULL, rc = gcry_sexp_build ( &sexp, NULL,
"(public-key(rsa(n%m)(e%m)))", "(public-key(rsa(n%m)(e%m)))",
key[0], key[1] ); key[0], key[1] );