diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-03-25 20:18:00 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-03-25 20:18:36 +0100 |
| commit | 93dee00c4ece2ff287ef6c6e60d8a8d8c057dfbf (patch) | |
| tree | 7ff917b45c112bdf54c053f310009eb41bafbb4e /lib/openpgp | |
| parent | 6342869bf7307d41e38cbb89f61f00b06b59dc33 (diff) | |
| download | gnutls-93dee00c4ece2ff287ef6c6e60d8a8d8c057dfbf.tar.gz | |
Fix size of gnutls_openpgp_keyid_t by using the GNUTLS_OPENPGP_KEYID_SIZE definition.
Reported by Andreas Metzler.
Diffstat (limited to 'lib/openpgp')
| -rw-r--r-- | lib/openpgp/gnutls_openpgp.c | 6 | ||||
| -rw-r--r-- | lib/openpgp/pgp.c | 4 | ||||
| -rw-r--r-- | lib/openpgp/privkey.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/openpgp/gnutls_openpgp.c b/lib/openpgp/gnutls_openpgp.c index ba7cd2740a..5917447e90 100644 --- a/lib/openpgp/gnutls_openpgp.c +++ b/lib/openpgp/gnutls_openpgp.c @@ -321,7 +321,7 @@ gnutls_certificate_set_openpgp_key_file (gnutls_certificate_credentials_t res, static int get_keyid (gnutls_openpgp_keyid_t keyid, const char *str) { - size_t keyid_size = sizeof (keyid); + size_t keyid_size = GNUTLS_OPENPGP_KEYID_SIZE; if (strlen (str) != 16) { @@ -744,7 +744,7 @@ _gnutls_openpgp_crt_to_gcert (gnutls_cert * gcert, gnutls_openpgp_crt_t cert) _gnutls_debug_log ("Importing Openpgp cert and using openpgp sub key: %s\n", - _gnutls_bin2hex (keyid, sizeof (keyid), err_buf, sizeof (err_buf), + _gnutls_bin2hex (keyid, GNUTLS_OPENPGP_KEYID_SIZE, err_buf, sizeof (err_buf), NULL)); KEYID_IMPORT (kid32, keyid); @@ -762,7 +762,7 @@ _gnutls_openpgp_crt_to_gcert (gnutls_cert * gcert, gnutls_openpgp_crt_t cert) gnutls_openpgp_crt_get_subkey_usage (cert, idx, &gcert->key_usage); gcert->use_subkey = 1; - memcpy (gcert->subkey_id, keyid, sizeof (keyid)); + memcpy (gcert->subkey_id, keyid, GNUTLS_OPENPGP_KEYID_SIZE); ret = _gnutls_openpgp_crt_get_mpis (cert, kid32, gcert->params, diff --git a/lib/openpgp/pgp.c b/lib/openpgp/pgp.c index 229b69d317..77a931d8af 100644 --- a/lib/openpgp/pgp.c +++ b/lib/openpgp/pgp.c @@ -1568,7 +1568,7 @@ gnutls_openpgp_crt_get_preferred_key_id (gnutls_openpgp_crt_t key, return GNUTLS_E_INVALID_REQUEST; } - memcpy (keyid, key->preferred_keyid, sizeof (gnutls_openpgp_keyid_t)); + memcpy (keyid, key->preferred_keyid, GNUTLS_OPENPGP_KEYID_SIZE); return 0; } @@ -1606,7 +1606,7 @@ gnutls_openpgp_crt_set_preferred_key_id (gnutls_openpgp_crt_t key, } key->preferred_set = 1; - memcpy (key->preferred_keyid, keyid, sizeof (gnutls_openpgp_keyid_t)); + memcpy (key->preferred_keyid, keyid, GNUTLS_OPENPGP_KEYID_SIZE); return 0; } diff --git a/lib/openpgp/privkey.c b/lib/openpgp/privkey.c index 4b26a8c1e9..7fef5adfb0 100644 --- a/lib/openpgp/privkey.c +++ b/lib/openpgp/privkey.c @@ -1186,7 +1186,7 @@ gnutls_openpgp_privkey_get_preferred_key_id (gnutls_openpgp_privkey_t key, return GNUTLS_E_INVALID_REQUEST; } - memcpy (keyid, key->preferred_keyid, sizeof (gnutls_openpgp_keyid_t)); + memcpy (keyid, key->preferred_keyid, GNUTLS_OPENPGP_KEYID_SIZE); return 0; } @@ -1224,7 +1224,7 @@ gnutls_openpgp_privkey_set_preferred_key_id (gnutls_openpgp_privkey_t key, } key->preferred_set = 1; - memcpy (key->preferred_keyid, keyid, sizeof (gnutls_openpgp_keyid_t)); + memcpy (key->preferred_keyid, keyid, GNUTLS_OPENPGP_KEYID_SIZE); return 0; } |