diff options
| author | Nikos <nmav@crystal.(none)> | 2008-03-29 12:02:47 +0200 |
|---|---|---|
| committer | Nikos <nmav@crystal.(none)> | 2008-03-29 12:02:47 +0200 |
| commit | 38df2b42fd5bf934115c9d78d366109c97ab1cc7 (patch) | |
| tree | bbf0884d829c357675926fcf26ca99243a67778d /lib/openpgp/pgp.c | |
| parent | 0b37eef0f6b6626d5e4b5936bbc6f012416ef61a (diff) | |
| parent | 42cbcc16110d8ad3fba27b57426fa4c435b54537 (diff) | |
| download | gnutls-38df2b42fd5bf934115c9d78d366109c97ab1cc7.tar.gz | |
Merge branch 'master' of ssh://nmav@git.sv.gnu.org/srv/git/gnutls
Diffstat (limited to 'lib/openpgp/pgp.c')
| -rw-r--r-- | lib/openpgp/pgp.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/openpgp/pgp.c b/lib/openpgp/pgp.c index 5e57712f85..8520d3ce6b 100644 --- a/lib/openpgp/pgp.c +++ b/lib/openpgp/pgp.c @@ -529,7 +529,7 @@ gnutls_openpgp_crt_check_hostname (gnutls_openpgp_crt_t key, { char dnsname[MAX_CN]; size_t dnsnamesize; - int ret; + int ret = 0; int i; /* Check through all included names. */ @@ -665,10 +665,8 @@ static cdk_packet_t _get_public_subkey(gnutls_openpgp_crt_t key, unsigned int in cdk_packet_t _gnutls_openpgp_find_key( cdk_kbnode_t knode, uint32_t keyid[2], unsigned int priv) { - cdk_pkt_pubkey_t ret; cdk_kbnode_t p, ctx; cdk_packet_t pkt; - int subkeys; uint32_t local_keyid[2]; ctx = NULL; @@ -704,10 +702,9 @@ cdk_packet_t _gnutls_openpgp_find_key( cdk_kbnode_t knode, uint32_t keyid[2], int _gnutls_openpgp_find_subkey_idx( cdk_kbnode_t knode, uint32_t keyid[2], unsigned int priv) { - cdk_pkt_pubkey_t ret; cdk_kbnode_t p, ctx; cdk_packet_t pkt; - int subkeys, i=0; + int i=0; uint32_t local_keyid[2]; ctx = NULL; @@ -918,7 +915,6 @@ int gnutls_openpgp_crt_get_subkey_idx (gnutls_openpgp_crt_t key, const gnutls_openpgp_keyid_t keyid) { - cdk_packet_t pkt; int ret; uint32_t kid[2]; @@ -980,7 +976,7 @@ int _gnutls_read_pgp_mpi( cdk_packet_t pkt, unsigned int priv, size_t idx, mpi_t size_t buf_size = 512; opaque * buf = gnutls_malloc( buf_size); int err; -int max_pub_params; +int max_pub_params = 0; if (priv !=0) max_pub_params = cdk_pk_get_npkey(pkt->pkt.secret_key->pk->pubkey_algo); @@ -1053,7 +1049,7 @@ int _gnutls_openpgp_crt_get_mpis (gnutls_openpgp_crt_t cert, uint32_t *keyid /* [2] */, mpi_t * params, int *params_size) { - int result, i, idx; + int result, i; int pk_algorithm, local_params; cdk_packet_t pkt; |