From da9724e6d0fe82db4191a2d15919b365f0f210b0 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Tue, 13 Jul 2010 11:28:04 +0200 Subject: Renamed key_encod{ing,der}_t and constants, prepare for generic credential encoding --- scripts/key2keyid.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'scripts/key2keyid.c') diff --git a/scripts/key2keyid.c b/scripts/key2keyid.c index 36a81b3f1..551d031c6 100644 --- a/scripts/key2keyid.c +++ b/scripts/key2keyid.c @@ -37,15 +37,15 @@ int main(int argc, char *argv[]) printf("parsed %d bits %N private key.\n", private->get_keysize(private)*8, key_type_names, private->get_type(private)); - if (private->get_fingerprint(private, KEY_ID_PUBKEY_INFO_SHA1, &chunk)) + if (private->get_fingerprint(private, KEYID_PUBKEY_INFO_SHA1, &chunk)) { printf("subjectPublicKeyInfo keyid: %#B\n", &chunk); } - if (private->get_fingerprint(private, KEY_ID_PUBKEY_SHA1, &chunk)) + if (private->get_fingerprint(private, KEYID_PUBKEY_SHA1, &chunk)) { printf("subjectPublicKey keyid: %#B\n", &chunk); } - if (private->get_fingerprint(private, KEY_ID_PGPV3, &chunk)) + if (private->get_fingerprint(private, KEYID_PGPV3, &chunk)) { printf("PGP version 3 keyid: %#B\n", &chunk); } @@ -67,15 +67,15 @@ int main(int argc, char *argv[]) printf("parsed %d bits %N public key.\n", public->get_keysize(public)*8, key_type_names, public->get_type(public)); - if (public->get_fingerprint(public, KEY_ID_PUBKEY_INFO_SHA1, &chunk)) + if (public->get_fingerprint(public, KEYID_PUBKEY_INFO_SHA1, &chunk)) { printf("subjectPublicKeyInfo keyid: %#B\n", &chunk); } - if (public->get_fingerprint(public, KEY_ID_PUBKEY_SHA1, &chunk)) + if (public->get_fingerprint(public, KEYID_PUBKEY_SHA1, &chunk)) { printf("subjectPublicKey keyid: %#B\n", &chunk); } - if (public->get_fingerprint(public, KEY_ID_PGPV3, &chunk)) + if (public->get_fingerprint(public, KEYID_PGPV3, &chunk)) { printf("PGP version 3 keyid: %#B\n", &chunk); } -- cgit v1.2.3