x509 plugin supports encoding of CA basicConstraint extension

[strongswan.git] / scripts / key2keyid.c

diff --git a/scripts/key2keyid.c b/scripts/key2keyid.c
index 201670e..cc3e0b1 100644 (file)
--- a/scripts/key2keyid.c
+++ b/scripts/key2keyid.c
@@ -15,9 +15,9 @@ int main(int argc, char *argv[])
        chunk_t chunk;
        char buf[8096];
        int read;
        chunk_t chunk;
        char buf[8096];
        int read;

-       
+

        library_init(NULL);
        library_init(NULL);

-       lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, "gmp pubkey sha1");
+       lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, PLUGINS);

        atexit(library_deinit);
 
        read = fread(buf, 1, sizeof(buf), stdin);
        atexit(library_deinit);
 
        read = fread(buf, 1, sizeof(buf), stdin);


@@ -26,32 +26,40 @@ int main(int argc, char *argv[])
                fprintf(stderr, "reading key failed.\n");
                return -1;
        }
                fprintf(stderr, "reading key failed.\n");
                return -1;
        }

-       
+

        chunk = chunk_create(buf, read);
        chunk = chunk_create(buf, read);

-       
+

        private = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_RSA,
        private = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_RSA,

-                                                                BUILD_BLOB_ASN1_DER, chunk_clone(chunk),
+                                                                BUILD_BLOB_PEM, chunk_clone(chunk),

                                                                 BUILD_END);
        if (private)
        {
                printf("parsed %d bits %N private key.\n",
                           private->get_keysize(private)*8,
                           key_type_names, private->get_type(private));
                                                                 BUILD_END);
        if (private)
        {
                printf("parsed %d bits %N private key.\n",
                           private->get_keysize(private)*8,
                           key_type_names, private->get_type(private));

-               printf("%N is:\t %D\n", id_type_names, ID_PUBKEY_INFO_SHA1,
-                          private->get_id(private, ID_PUBKEY_INFO_SHA1));
-               printf("%N is:\t %D\n", id_type_names, ID_PUBKEY_SHA1,
-                          private->get_id(private, ID_PUBKEY_SHA1));
+               if (private->get_fingerprint(private, KEY_ID_PUBKEY_INFO_SHA1, &chunk))
+               {
+                       printf("subjectPublicKeyInfo keyid: %#B\n", &chunk);
+               }
+               if (private->get_fingerprint(private, KEY_ID_PUBKEY_SHA1, &chunk))
+               {
+                       printf("subjectPublicKey keyid:     %#B\n", &chunk);
+               }
+               if (private->get_fingerprint(private, KEY_ID_PGPV3, &chunk))
+               {
+                       printf("PGP verison 3 keyid:        %#B\n", &chunk);
+               }

                private->destroy(private);
                return 0;
        }
                private->destroy(private);
                return 0;
        }

-       
+

        public = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ANY,
        public = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ANY,

-                                                               BUILD_BLOB_ASN1_DER, chunk_clone(chunk),
+                                                               BUILD_BLOB_PEM, chunk_clone(chunk),

                                                                BUILD_END);
        if (!public)
        {
                public = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_RSA,
                                                                BUILD_END);
        if (!public)
        {
                public = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_RSA,

-                                                                       BUILD_BLOB_ASN1_DER, chunk_clone(chunk),
+                                                                       BUILD_BLOB_PEM, chunk_clone(chunk),

                                                                        BUILD_END);
        }
        if (public)
                                                                        BUILD_END);
        }
        if (public)


@@ -59,14 +67,22 @@ 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));
                printf("parsed %d bits %N public key.\n",
                           public->get_keysize(public)*8,
                           key_type_names, public->get_type(public));

-               printf("%N is:\t %D\n", id_type_names, ID_PUBKEY_INFO_SHA1,
-                          public->get_id(public, ID_PUBKEY_INFO_SHA1));
-               printf("%N is:\t %D\n", id_type_names, ID_PUBKEY_SHA1,
-                          public->get_id(public, ID_PUBKEY_SHA1));
+               if (public->get_fingerprint(public, KEY_ID_PUBKEY_INFO_SHA1, &chunk))
+               {
+                       printf("subjectPublicKeyInfo keyid: %#B\n", &chunk);
+               }
+               if (public->get_fingerprint(public, KEY_ID_PUBKEY_SHA1, &chunk))
+               {
+                       printf("subjectPublicKey keyid:     %#B\n", &chunk);
+               }
+               if (public->get_fingerprint(public, KEY_ID_PGPV3, &chunk))
+               {
+                       printf("PGP verison 3 keyid:        %#B\n", &chunk);
+               }

                public->destroy(public);
                return 0;
        }
                public->destroy(public);
                return 0;
        }

-       
+

        fprintf(stderr, "unable to parse input key.\n");
        return -1;
 }
        fprintf(stderr, "unable to parse input key.\n");
        return -1;
 }