Merge branch 'utils-split'

[people/ms/strongswan.git] / scripts / key2keyid.c

diff --git a/scripts/key2keyid.c b/scripts/key2keyid.c
index cc3e0b18b442d252ae5555043c748575b6bac829..e9a4ee692bd4bb6009bd0c32fd65da56da17d7b9 100644 (file)
--- a/scripts/key2keyid.c
+++ b/scripts/key2keyid.c
@@ -1,7 +1,21 @@
+/*
+ * Copyright (C) 2008-2009 Martin Willi
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
 
 #include <stdio.h>
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/keys/private_key.h>
 #include <credentials/keys/public_key.h>
 
@@ -16,8 +30,8 @@ int main(int argc, char *argv[])
        char buf[8096];
        int read;
 
-       library_init(NULL);
-       lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, PLUGINS);
+       library_init(NULL, "key2keyid");
+       lib->plugins->load(lib->plugins, PLUGINS);
        atexit(library_deinit);
 
        read = fread(buf, 1, sizeof(buf), stdin);
@@ -35,19 +49,19 @@ int main(int argc, char *argv[])
        if (private)
        {
                printf("parsed %d bits %N private key.\n",
-                          private->get_keysize(private)*8,
+                          private->get_keysize(private),
                           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 verison 3 keyid:        %#B\n", &chunk);
+                       printf("PGP version 3 keyid:        %#B\n", &chunk);
                }
                private->destroy(private);
                return 0;
@@ -65,19 +79,19 @@ int main(int argc, char *argv[])
        if (public)
        {
                printf("parsed %d bits %N public key.\n",
-                          public->get_keysize(public)*8,
+                          public->get_keysize(public),
                           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 verison 3 keyid:        %#B\n", &chunk);
+                       printf("PGP version 3 keyid:        %#B\n", &chunk);
                }
                public->destroy(public);
                return 0;