diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-04-17 13:15:33 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-04-17 13:15:33 +0200 |
commit | b2f2a137003e8f0915fd7e04d333b208866e19e2 (patch) | |
tree | 9a6708417b8e05c78bd2cc8537c1a5516ff27054 | |
parent | 054ea64c2f69c5a5486db55919077f64d0990390 (diff) | |
download | gnutls-b2f2a137003e8f0915fd7e04d333b208866e19e2.tar.gz |
Several cleanups and fixes regarding the openpgp_keyid_t.
-rw-r--r-- | lib/auth_cert.c | 3 | ||||
-rw-r--r-- | lib/auth_cert.h | 3 | ||||
-rw-r--r-- | lib/gnutls_cert.h | 2 | ||||
-rw-r--r-- | lib/gnutls_privkey.c | 4 | ||||
-rw-r--r-- | lib/gnutls_pubkey.c | 3 | ||||
-rw-r--r-- | lib/openpgp/gnutls_openpgp.c | 4 | ||||
-rw-r--r-- | lib/openpgp/openpgp_int.h | 2 | ||||
-rw-r--r-- | lib/openpgp/pgp.c | 8 | ||||
-rw-r--r-- | lib/openpgp/pgpverify.c | 2 | ||||
-rw-r--r-- | lib/openpgp/privkey.c | 12 |
10 files changed, 20 insertions, 23 deletions
diff --git a/lib/auth_cert.c b/lib/auth_cert.c index 2ddbf46da0..40de22ff8b 100644 --- a/lib/auth_cert.c +++ b/lib/auth_cert.c @@ -117,7 +117,6 @@ _gnutls_copy_certificate_auth_info (cert_auth_info_t info, info->ncerts = ncerts; info->cert_type = cert[0].cert_type; - info->sign_algo = cert[0].sign_algo; #ifdef ENABLE_OPENPGP if (cert[0].cert_type == GNUTLS_CRT_OPENPGP) @@ -1170,7 +1169,7 @@ _gnutls_proc_openpgp_server_certificate (gnutls_session_t session, gnutls_cert *peer_certificate_list = NULL; int peer_certificate_list_size = 0; gnutls_datum_t tmp, akey = { NULL, 0 }; - gnutls_openpgp_keyid_t subkey_id; + uint8_t subkey_id[GNUTLS_OPENPGP_KEYID_SIZE]; unsigned int subkey_id_set = 0; cred = (gnutls_certificate_credentials_t) diff --git a/lib/auth_cert.h b/lib/auth_cert.h index 95ca2e06d0..0eb0093a18 100644 --- a/lib/auth_cert.h +++ b/lib/auth_cert.h @@ -123,10 +123,9 @@ typedef struct cert_auth_info_st unsigned int ncerts; /* holds the size of the list above */ gnutls_certificate_type_t cert_type; - gnutls_sign_algorithm_t sign_algo; #ifdef ENABLE_OPENPGP int use_subkey; - gnutls_openpgp_keyid_t subkey_id; + uint8_t subkey_id[GNUTLS_OPENPGP_KEYID_SIZE]; #endif } *cert_auth_info_t; diff --git a/lib/gnutls_cert.h b/lib/gnutls_cert.h index a989b4333e..a4ae1bc88f 100644 --- a/lib/gnutls_cert.h +++ b/lib/gnutls_cert.h @@ -65,7 +65,7 @@ typedef struct gnutls_cert #ifdef ENABLE_OPENPGP int use_subkey; - gnutls_openpgp_keyid_t subkey_id; + uint8_t subkey_id[GNUTLS_OPENPGP_KEYID_SIZE]; #endif } gnutls_cert; diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c index 1996016c44..df604a3f46 100644 --- a/lib/gnutls_privkey.c +++ b/lib/gnutls_privkey.c @@ -188,7 +188,7 @@ _gnutls_privkey_get_public_mpis (gnutls_privkey_t key, bigint_t tmp_params[MAX_PRIV_PARAMS_SIZE]; int tmp_params_size = MAX_PRIV_PARAMS_SIZE; uint32_t kid[2], i; - gnutls_openpgp_keyid_t keyid; + uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE]; ret = gnutls_openpgp_privkey_get_preferred_key_id (key->key.openpgp, @@ -390,7 +390,7 @@ gnutls_privkey_import_openpgp (gnutls_privkey_t pkey, unsigned int flags) { int ret, idx; -gnutls_openpgp_keyid_t keyid; +uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE]; ret = check_if_clean(pkey); if (ret < 0) diff --git a/lib/gnutls_pubkey.c b/lib/gnutls_pubkey.c index 1775a62298..a8fc97581f 100644 --- a/lib/gnutls_pubkey.c +++ b/lib/gnutls_pubkey.c @@ -348,12 +348,11 @@ gnutls_pubkey_import_openpgp (gnutls_pubkey_t key, int ret, idx; uint32_t kid32[2]; uint32_t *k; - gnutls_openpgp_keyid_t keyid; + uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE]; ret = gnutls_openpgp_crt_get_preferred_key_id (crt, keyid); if (ret == GNUTLS_E_OPENPGP_PREFERRED_KEY_ERROR) { - key->pk_algorithm = gnutls_openpgp_crt_get_pk_algorithm(crt, NULL); key->pk_algorithm = gnutls_openpgp_crt_get_pk_algorithm (crt, &key->bits); ret = gnutls_openpgp_crt_get_key_usage (crt, &key->key_usage); diff --git a/lib/openpgp/gnutls_openpgp.c b/lib/openpgp/gnutls_openpgp.c index 5917447e90..8175a9dda0 100644 --- a/lib/openpgp/gnutls_openpgp.c +++ b/lib/openpgp/gnutls_openpgp.c @@ -369,7 +369,7 @@ gnutls_certificate_set_openpgp_key_mem2 (gnutls_certificate_credentials_t res, gnutls_openpgp_privkey_t pkey; gnutls_openpgp_crt_t crt; int ret; - gnutls_openpgp_keyid_t keyid; + uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE]; ret = gnutls_openpgp_privkey_init (&pkey); if (ret < 0) @@ -725,7 +725,7 @@ int _gnutls_openpgp_crt_to_gcert (gnutls_cert * gcert, gnutls_openpgp_crt_t cert) { int ret; - gnutls_openpgp_keyid_t keyid; + uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE]; char err_buf[33]; memset (gcert, 0, sizeof (gnutls_cert)); diff --git a/lib/openpgp/openpgp_int.h b/lib/openpgp/openpgp_int.h index bf0a970352..82a4db6d95 100644 --- a/lib/openpgp/openpgp_int.h +++ b/lib/openpgp/openpgp_int.h @@ -18,7 +18,7 @@ typedef struct gnutls_openpgp_crt_int { cdk_kbnode_t knode; - gnutls_openpgp_keyid_t preferred_keyid; + uint8_t preferred_keyid[GNUTLS_OPENPGP_KEYID_SIZE]; int preferred_set; } gnutls_openpgp_crt_int; diff --git a/lib/openpgp/pgp.c b/lib/openpgp/pgp.c index 77a931d8af..9549c418b4 100644 --- a/lib/openpgp/pgp.c +++ b/lib/openpgp/pgp.c @@ -1426,7 +1426,7 @@ int gnutls_openpgp_crt_get_pk_rsa_raw (gnutls_openpgp_crt_t crt, gnutls_datum_t * m, gnutls_datum_t * e) { - gnutls_openpgp_keyid_t keyid; + uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE]; int ret; ret = gnutls_openpgp_crt_get_key_id (crt, keyid); @@ -1460,7 +1460,7 @@ gnutls_openpgp_crt_get_pk_dsa_raw (gnutls_openpgp_crt_t crt, gnutls_datum_t * p, gnutls_datum_t * q, gnutls_datum_t * g, gnutls_datum_t * y) { - gnutls_openpgp_keyid_t keyid; + uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE]; int ret; ret = gnutls_openpgp_crt_get_key_id (crt, keyid); @@ -1494,7 +1494,7 @@ gnutls_openpgp_crt_get_subkey_pk_rsa_raw (gnutls_openpgp_crt_t crt, gnutls_datum_t * m, gnutls_datum_t * e) { - gnutls_openpgp_keyid_t keyid; + uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE]; int ret; ret = gnutls_openpgp_crt_get_subkey_id (crt, idx, keyid); @@ -1532,7 +1532,7 @@ gnutls_openpgp_crt_get_subkey_pk_dsa_raw (gnutls_openpgp_crt_t crt, gnutls_datum_t * g, gnutls_datum_t * y) { - gnutls_openpgp_keyid_t keyid; + uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE]; int ret; ret = gnutls_openpgp_crt_get_subkey_id (crt, idx, keyid); diff --git a/lib/openpgp/pgpverify.c b/lib/openpgp/pgpverify.c index bdb2ea3c4f..2850a170a2 100644 --- a/lib/openpgp/pgpverify.c +++ b/lib/openpgp/pgpverify.c @@ -61,7 +61,7 @@ gnutls_openpgp_crt_verify_ring (gnutls_openpgp_crt_t key, gnutls_openpgp_keyring_t keyring, unsigned int flags, unsigned int *verify) { - gnutls_openpgp_keyid_t id; + uint8_t id[GNUTLS_OPENPGP_KEYID_SIZE]; cdk_error_t rc; int status; diff --git a/lib/openpgp/privkey.c b/lib/openpgp/privkey.c index 7fef5adfb0..0040922f86 100644 --- a/lib/openpgp/privkey.c +++ b/lib/openpgp/privkey.c @@ -1032,7 +1032,7 @@ gnutls_openpgp_privkey_export_rsa_raw (gnutls_openpgp_privkey_t pkey, gnutls_datum_t * d, gnutls_datum_t * p, gnutls_datum_t * q, gnutls_datum_t * u) { - gnutls_openpgp_keyid_t keyid; + uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE]; int ret; ret = gnutls_openpgp_privkey_get_key_id (pkey, keyid); @@ -1068,7 +1068,7 @@ gnutls_openpgp_privkey_export_dsa_raw (gnutls_openpgp_privkey_t pkey, gnutls_datum_t * g, gnutls_datum_t * y, gnutls_datum_t * x) { - gnutls_openpgp_keyid_t keyid; + uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE]; int ret; ret = gnutls_openpgp_privkey_get_key_id (pkey, keyid); @@ -1110,7 +1110,7 @@ gnutls_openpgp_privkey_export_subkey_rsa_raw (gnutls_openpgp_privkey_t pkey, gnutls_datum_t * q, gnutls_datum_t * u) { - gnutls_openpgp_keyid_t keyid; + uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE]; int ret; ret = gnutls_openpgp_privkey_get_subkey_id (pkey, idx, keyid); @@ -1150,7 +1150,7 @@ gnutls_openpgp_privkey_export_subkey_dsa_raw (gnutls_openpgp_privkey_t pkey, gnutls_datum_t * y, gnutls_datum_t * x) { - gnutls_openpgp_keyid_t keyid; + uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE]; int ret; ret = gnutls_openpgp_privkey_get_subkey_id (pkey, idx, keyid); @@ -1253,7 +1253,7 @@ gnutls_openpgp_privkey_sign_hash (gnutls_openpgp_privkey_t key, bigint_t params[MAX_PRIV_PARAMS_SIZE]; int params_size = MAX_PRIV_PARAMS_SIZE; int pk_algorithm; - gnutls_openpgp_keyid_t keyid; + uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE]; if (key == NULL) { @@ -1328,7 +1328,7 @@ _gnutls_openpgp_privkey_decrypt_data (gnutls_openpgp_privkey_t key, bigint_t params[MAX_PRIV_PARAMS_SIZE]; int params_size = MAX_PRIV_PARAMS_SIZE; int pk_algorithm; - gnutls_openpgp_keyid_t keyid; + uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE]; if (key == NULL) { |