 7b67cbffb6
			
		
	
	7b67cbffb6
	
	
	
		
			
			Clean up. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15823 ec53bebd-3082-4978-b11e-865c3cabbd6b
		
			
				
	
	
		
			640 lines
		
	
	
		
			14 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			640 lines
		
	
	
		
			14 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Copyright (c) 2004 - 2005 Kungliga Tekniska Högskolan
 | |
|  * (Royal Institute of Technology, Stockholm, Sweden). 
 | |
|  * All rights reserved. 
 | |
|  *
 | |
|  * Redistribution and use in source and binary forms, with or without 
 | |
|  * modification, are permitted provided that the following conditions 
 | |
|  * are met: 
 | |
|  *
 | |
|  * 1. Redistributions of source code must retain the above copyright 
 | |
|  *    notice, this list of conditions and the following disclaimer. 
 | |
|  *
 | |
|  * 2. Redistributions in binary form must reproduce the above copyright 
 | |
|  *    notice, this list of conditions and the following disclaimer in the 
 | |
|  *    documentation and/or other materials provided with the distribution. 
 | |
|  *
 | |
|  * 3. Neither the name of the Institute nor the names of its contributors 
 | |
|  *    may be used to endorse or promote products derived from this software 
 | |
|  *    without specific prior written permission. 
 | |
|  *
 | |
|  * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND 
 | |
|  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
 | |
|  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
 | |
|  * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE 
 | |
|  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
 | |
|  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
 | |
|  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
 | |
|  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
 | |
|  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
 | |
|  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
 | |
|  * SUCH DAMAGE. 
 | |
|  */
 | |
| 
 | |
| #include "hx_locl.h"
 | |
| RCSID("$Id$");
 | |
| 
 | |
| #include <hxtool-commands.h>
 | |
| #include <sl.h>
 | |
| 
 | |
| static int version_flag;
 | |
| static int help_flag;
 | |
| 
 | |
| struct getargs args[] = {
 | |
|     { "version", 0, arg_flag, &version_flag },
 | |
|     { "help", 0, arg_flag, &help_flag }
 | |
| };
 | |
| int num_args = sizeof(args) / sizeof(args[0]);
 | |
| 
 | |
| static void
 | |
| usage(int code)
 | |
| {
 | |
|     arg_printusage(args, num_args, NULL, "command");
 | |
|     exit(code);
 | |
| }
 | |
| 
 | |
| int
 | |
| cms_verify_sd(struct cms_verify_sd_options *opt, int argc, char **argv)
 | |
| {
 | |
|     hx509_verify_ctx ctx = NULL;
 | |
|     heim_oid type;
 | |
|     heim_octet_string c, co;
 | |
|     hx509_certs store;
 | |
|     hx509_certs signers = NULL;
 | |
|     hx509_certs anchors = NULL;
 | |
|     hx509_lock lock;
 | |
|     int ret, i;
 | |
| 
 | |
|     size_t sz;
 | |
|     void *p;
 | |
| 
 | |
|     hx509_lock_init(&lock);
 | |
|     hx509_lock_add_password(lock, "foobar");
 | |
| 
 | |
|     ret = _hx509_map_file(argv[0], &p, &sz);
 | |
|     if (ret)
 | |
| 	err(1, "map_file: %s: %d", argv[0], ret);
 | |
| 
 | |
|     ret = hx509_verify_init_ctx(&ctx);
 | |
| 
 | |
|     ret = hx509_certs_init("MEMORY:cms-anchors", 0, NULL, &anchors);
 | |
| 
 | |
|     for (i = 0; i < opt->anchors_strings.num_strings; i++) {
 | |
| 	ret = hx509_certs_append(anchors, lock, 
 | |
| 				 opt->anchors_strings.strings[i]);
 | |
| 	if (ret)
 | |
| 	    errx(1, "hx509_certs_append: anchor: %s: %d", 
 | |
| 		 opt->anchors_strings.strings[i], ret);
 | |
|     }
 | |
| 
 | |
|     ret = hx509_certs_init("MEMORY:cert-store", 0, NULL, &store);
 | |
| 
 | |
|     for (i = 0; i < opt->certificate_strings.num_strings; i++) {
 | |
| 	ret = hx509_certs_append(store, lock, 
 | |
| 				 opt->certificate_strings.strings[i]);
 | |
| 	if (ret)
 | |
| 	    errx(1, "hx509_certs_append: store: %s %d",
 | |
| 		 opt->certificate_strings.strings[i], ret);
 | |
|     }
 | |
| 
 | |
|     if (opt->content_info_flag) {
 | |
| 	ContentInfo ci;
 | |
| 	size_t size;
 | |
| 
 | |
| 	ret = decode_ContentInfo(p, sz, &ci, &size);
 | |
| 	if (ret)
 | |
| 	    errx(1, "decode_ContentInfo: %d", ret);
 | |
| 
 | |
| 	if (heim_oid_cmp(&ci.contentType, oid_id_pkcs7_signedData()) != 0)
 | |
| 	    errx(1, "Content is not SignedData");
 | |
| 
 | |
| 	if (ci.content == NULL)
 | |
| 	    errx(1, "ContentInfo missing content");
 | |
| 	ret = copy_octet_string(ci.content, &co);
 | |
| 	if (ret)
 | |
| 	    errx(1, "copy_octet_string: %d", ret);
 | |
| 
 | |
| 	free_ContentInfo(&ci);
 | |
| 
 | |
|     } else {
 | |
| 	co.data = p;
 | |
| 	co.length = sz;
 | |
|     }
 | |
| 
 | |
|     hx509_verify_attach_anchors(ctx, anchors);
 | |
| 
 | |
|     ret = hx509_cms_verify_signed(ctx, co.data, co.length,
 | |
| 				  store, &type, &c, &signers);
 | |
|     if (co.data != p)
 | |
| 	free_octet_string(&co);
 | |
|     if (ret)
 | |
| 	errx(1, "hx509_cms_verify_signed: %d", ret);
 | |
| 
 | |
|     printf("signers:\n");
 | |
|     hx509_certs_iter(signers, hx509_ci_print_names, stdout);
 | |
| 
 | |
|     hx509_verify_destroy_ctx(ctx);
 | |
| 
 | |
|     hx509_certs_free(&anchors);
 | |
|     hx509_certs_free(&signers);
 | |
| 
 | |
|     hx509_lock_free(lock);
 | |
| 
 | |
|     ret = _hx509_write_file(argv[1], c.data, c.length);
 | |
|     if (ret)
 | |
| 	errx(1, "hx509_write_file: %d", ret);
 | |
| 
 | |
|     free_octet_string(&c);
 | |
|     _hx509_unmap_file(p, sz);
 | |
| 
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| int
 | |
| cms_create_sd(struct cms_create_sd_options *opt, int argc, char **argv)
 | |
| {
 | |
|     const heim_oid *contentType;
 | |
|     heim_octet_string o;
 | |
|     hx509_query q;
 | |
|     hx509_lock lock;
 | |
|     hx509_certs store;
 | |
|     hx509_cert cert;
 | |
|     size_t sz;
 | |
|     void *p;
 | |
|     int ret, i;
 | |
| 
 | |
|     contentType = oid_id_pkcs7_data();
 | |
| 
 | |
|     if (argc < 2)
 | |
| 	errx(1, "argc < 2");
 | |
| 
 | |
|     hx509_lock_init(&lock);
 | |
|     hx509_lock_add_password(lock, "foobar");
 | |
| 
 | |
|     ret = hx509_certs_init("MEMORY:cert-store", 0, NULL, &store);
 | |
| 
 | |
|     for (i = 0; i < opt->certificate_strings.num_strings; i++) {
 | |
| 	ret = hx509_certs_append(store, lock, 
 | |
| 				 opt->certificate_strings.strings[i]);
 | |
| 	if (ret)
 | |
| 	    errx(1, "hx509_certs_append: store: %s: %d", 
 | |
| 		 opt->certificate_strings.strings[i], ret);
 | |
|     }
 | |
| 
 | |
|     _hx509_query_clear(&q);
 | |
|     q.match |= HX509_QUERY_PRIVATE_KEY;
 | |
|     q.match |= HX509_QUERY_KU_DIGITALSIGNATURE;
 | |
| 
 | |
|     if (opt->signer_string) {
 | |
| 	q.match |= HX509_QUERY_MATCH_FRIENDLY_NAME;
 | |
| 	q.friendlyname = opt->signer_string;
 | |
|     }
 | |
| 
 | |
|     ret = _hx509_certs_find(store, &q, &cert);
 | |
|     if (ret)
 | |
| 	errx(1, "hx509_certs_find: %d", ret);
 | |
| 
 | |
|     ret = _hx509_map_file(argv[0], &p, &sz);
 | |
|     if (ret)
 | |
| 	err(1, "map_file: %s: %d", argv[0], ret);
 | |
| 
 | |
|     ret = hx509_cms_create_signed_1(contentType,
 | |
| 				    p,
 | |
| 				    sz, 
 | |
| 				    NULL,
 | |
| 				    cert,
 | |
| 				    &o);
 | |
|     if (ret)
 | |
| 	errx(1, "hx509_cms_create_signed: %d", ret);
 | |
| 
 | |
|     _hx509_unmap_file(p, sz);
 | |
|     hx509_lock_free(lock);
 | |
| 
 | |
|     if (opt->content_info_flag) {
 | |
| 	ContentInfo ci;
 | |
| 	size_t size;
 | |
| 
 | |
| 	ret = hx509_cms_wrap_ContentInfo(oid_id_pkcs7_signedData(),
 | |
| 					 &o,
 | |
| 					 &ci);
 | |
| 	if (ret)
 | |
| 	    errx(1, "hx509_cms_wrap_ContentInfo: %d", ret);
 | |
| 
 | |
| 	free_octet_string(&o);
 | |
| 
 | |
| 	ASN1_MALLOC_ENCODE(ContentInfo, o.data, o.length, &ci, 
 | |
| 			   &size, ret);
 | |
| 	if (ret)
 | |
| 	    errx(1, "encode ContentInfo");
 | |
| 	if (o.length != size)
 | |
| 	    abort();
 | |
| 
 | |
| 	free_ContentInfo(&ci);
 | |
| 
 | |
|     }
 | |
| 
 | |
|     ret = _hx509_write_file(argv[1], o.data, o.length);
 | |
|     if (ret)
 | |
| 	errx(1, "hx509_write_file: %d", ret);
 | |
| 
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| int
 | |
| cms_unenvelope(struct cms_unenvelope_options *opt, int argc, char **argv)
 | |
| {
 | |
|     heim_oid contentType = { 0, NULL };
 | |
|     heim_octet_string o, co;
 | |
|     hx509_certs certs;
 | |
|     size_t sz;
 | |
|     void *p;
 | |
|     int ret, i;
 | |
|     hx509_lock lock;
 | |
| 
 | |
|     hx509_lock_init(&lock);
 | |
|     hx509_lock_add_password(lock, "foobar");
 | |
| 
 | |
|     ret = _hx509_map_file(argv[0], &p, &sz);
 | |
|     if (ret)
 | |
| 	err(1, "map_file: %s: %d", argv[0], ret);
 | |
| 
 | |
|     if (opt->content_info_flag) {
 | |
| 	ContentInfo ci;
 | |
| 	size_t size;
 | |
| 
 | |
| 	ret = decode_ContentInfo(p, sz, &ci, &size);
 | |
| 	if (ret)
 | |
| 	    errx(1, "decode_ContentInfo: %d", ret);
 | |
| 
 | |
| 	if (heim_oid_cmp(&ci.contentType, oid_id_pkcs7_envelopedData()) != 0)
 | |
| 	    errx(1, "Content is not SignedData");
 | |
| 
 | |
| 	if (ci.content == NULL)
 | |
| 	    errx(1, "ContentInfo missing content");
 | |
| 	ret = copy_octet_string(ci.content, &co);
 | |
| 	if (ret)
 | |
| 	    errx(1, "copy_octet_string: %d", ret);
 | |
| 
 | |
| 	free_ContentInfo(&ci);
 | |
| 
 | |
|     } else {
 | |
| 	co.data = p;
 | |
| 	co.length = sz;
 | |
|     }
 | |
| 
 | |
|     ret = hx509_certs_init("MEMORY:cert-store", 0, NULL, &certs);
 | |
|     if (ret)
 | |
| 	errx(1, "hx509_certs_init: MEMORY: %d", ret);
 | |
| 
 | |
|     for (i = 0; i < opt->certificate_strings.num_strings; i++) {
 | |
| 	ret = hx509_certs_append(certs, lock, 
 | |
| 				 opt->certificate_strings.strings[i]);
 | |
| 	if (ret)
 | |
| 	    errx(1, "hx509_certs_append: %s: %d",
 | |
| 		 opt->certificate_strings.strings[i], ret);
 | |
|     }
 | |
| 
 | |
|     ret = hx509_cms_unenvelope(certs, co.data, co.length, &contentType, &o);
 | |
|     if (co.data != p)
 | |
| 	free_octet_string(&co);
 | |
|     if (ret)
 | |
| 	errx(1, "hx509_cms_unenvelope: %d", ret);
 | |
| 
 | |
|     _hx509_unmap_file(p, sz);
 | |
|     hx509_lock_free(lock);
 | |
| 
 | |
|     ret = _hx509_write_file(argv[1], o.data, o.length);
 | |
|     if (ret)
 | |
| 	errx(1, "hx509_write_file: %d", ret);
 | |
| 
 | |
|     free_octet_string(&o);
 | |
| 
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| int
 | |
| cms_create_enveloped(struct cms_envelope_options *opt, int argc, char **argv)
 | |
| {
 | |
|     heim_octet_string o;
 | |
|     heim_oid contentType = { 0, NULL };
 | |
|     hx509_query q;
 | |
|     hx509_certs certs;
 | |
|     hx509_cert cert;
 | |
|     int ret, i;
 | |
|     size_t sz;
 | |
|     void *p;
 | |
|     hx509_lock lock;
 | |
| 
 | |
|     hx509_lock_init(&lock);
 | |
|     hx509_lock_add_password(lock, "foobar");
 | |
| 
 | |
|     ret = _hx509_map_file(argv[0], &p, &sz);
 | |
|     if (ret)
 | |
| 	err(1, "map_file: %s: %d", argv[0], ret);
 | |
| 
 | |
|     ret = hx509_certs_init("MEMORY:cert-store", 0, NULL, &certs);
 | |
| 
 | |
|     for (i = 0; i < opt->certificate_strings.num_strings; i++) {
 | |
| 	ret = hx509_certs_append(certs, lock, 
 | |
| 				 opt->certificate_strings.strings[i]);
 | |
| 	if (ret)
 | |
| 	    errx(1, "hx509_certs_append: certs: %s: %d", 
 | |
| 		 opt->certificate_strings.strings[i], ret);
 | |
|     }
 | |
| 
 | |
|     _hx509_query_clear(&q);
 | |
|     q.match |= HX509_QUERY_KU_ENCIPHERMENT;
 | |
|     ret = _hx509_certs_find(certs, &q, &cert);
 | |
|     if (ret)
 | |
| 	errx(1, "hx509_certs_find: %d", ret);
 | |
| 
 | |
|     ret = hx509_cms_envelope_1(cert, p, sz, NULL, &contentType, &o);
 | |
|     if (ret)
 | |
| 	errx(1, "hx509_cms_unenvelope: %d", ret);
 | |
| 
 | |
|     _hx509_unmap_file(p, sz);
 | |
| 
 | |
|     if (opt->content_info_flag) {
 | |
| 	ContentInfo ci;
 | |
| 	size_t size;
 | |
| 
 | |
| 	ret = hx509_cms_wrap_ContentInfo(oid_id_pkcs7_envelopedData(),
 | |
| 					 &o,
 | |
| 					 &ci);
 | |
| 	if (ret)
 | |
| 	    errx(1, "hx509_cms_wrap_ContentInfo: %d", ret);
 | |
| 
 | |
| 	free_octet_string(&o);
 | |
| 
 | |
| 	ASN1_MALLOC_ENCODE(ContentInfo, o.data, o.length, &ci, 
 | |
| 			   &size, ret);
 | |
| 	if (ret)
 | |
| 	    errx(1, "encode ContentInfo");
 | |
| 	if (o.length != size)
 | |
| 	    abort();
 | |
| 
 | |
| 	free_ContentInfo(&ci);
 | |
| 
 | |
|     }
 | |
| 
 | |
|     hx509_lock_free(lock);
 | |
| 
 | |
|     ret = _hx509_write_file(argv[1], o.data, o.length);
 | |
|     if (ret)
 | |
| 	errx(1, "hx509_write_file: %d", ret);
 | |
| 
 | |
|     free_octet_string(&o);
 | |
| 
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static int
 | |
| validate_print_f(void *ctx, hx509_cert c)
 | |
| {
 | |
|     hx509_validate_cert(ctx, c);
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static int
 | |
| validate_print(int argc, char **argv, int flags)
 | |
| {
 | |
|     hx509_validate_ctx ctx;
 | |
|     hx509_certs certs;
 | |
|     hx509_lock lock;
 | |
| 
 | |
|     hx509_lock_init(&lock);
 | |
|     hx509_lock_add_password(lock, "foobar");
 | |
| 
 | |
|     hx509_validate_ctx_init(&ctx);
 | |
|     hx509_validate_ctx_set_print(ctx, hx509_print_stdout, stdout);
 | |
|     hx509_validate_ctx_add_flags(ctx, flags);
 | |
| 
 | |
|     while(argc--) {
 | |
| 	int ret;
 | |
| 	ret = hx509_certs_init(argv[0], 0, lock, &certs);
 | |
| 	if (ret)
 | |
| 	    errx(1, "hx509_certs_init");
 | |
| 	hx509_certs_iter(certs, validate_print_f, ctx);
 | |
| 	hx509_certs_free(&certs);
 | |
| 	argv++;
 | |
|     }
 | |
|     hx509_validate_ctx_free(ctx);
 | |
| 
 | |
|     hx509_lock_free(lock);
 | |
| 
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| int
 | |
| pcert_print(void *opt, int argc, char **argv)
 | |
| {
 | |
|     return validate_print(argc, argv, HX509_VALIDATE_F_VERBOSE);
 | |
| }
 | |
| 
 | |
| int
 | |
| pcert_validate(void *opt, int argc, char **argv)
 | |
| {
 | |
|     return validate_print(argc, argv, HX509_VALIDATE_F_VALIDATE);
 | |
| }
 | |
| 
 | |
| struct verify {
 | |
|     hx509_verify_ctx ctx;
 | |
|     hx509_certs chain;
 | |
| };
 | |
| 
 | |
| static int
 | |
| verify_f(void *ctx, hx509_cert c)
 | |
| {
 | |
|     struct verify *v = ctx;
 | |
|     int ret;
 | |
| 
 | |
|     ret = hx509_verify_path(v->ctx, c, v->chain);
 | |
|     if (ret)
 | |
| 	printf("verify_path returned %d\n", ret);
 | |
|     else
 | |
| 	printf("path ok\n");
 | |
| 
 | |
|     return ret;
 | |
| }
 | |
| 
 | |
| int
 | |
| pcert_verify(struct verify_options *opt, int argc, char **argv)
 | |
| {
 | |
|     hx509_certs anchors, chain, certs;
 | |
|     hx509_verify_ctx ctx;
 | |
|     struct verify v;
 | |
|     int ret;
 | |
| 
 | |
|     ret = hx509_verify_init_ctx(&ctx);
 | |
|     ret = hx509_certs_init("MEMORY:anchors", 0, NULL, &anchors);
 | |
|     ret = hx509_certs_init("MEMORY:chain", 0, NULL, &chain);
 | |
|     ret = hx509_certs_init("MEMORY:certs", 0, NULL, &certs);
 | |
| 
 | |
|     while(argc--) {
 | |
| 	char *s = *argv++;
 | |
| 
 | |
| 	if (strncmp(s, "chain:", 6) == 0) {
 | |
| 	    s += 6;
 | |
| 
 | |
| 	    ret = hx509_certs_append(chain, NULL, s);
 | |
| 	    if (ret)
 | |
| 		errx(1, "hx509_certs_append: chain: %s: %d", s, ret);
 | |
| 
 | |
| 	} else if (strncmp(s, "anchor:", 7) == 0) {
 | |
| 	    s += 7;
 | |
| 
 | |
| 	    ret = hx509_certs_append(anchors, NULL, s);
 | |
| 	    if (ret)
 | |
| 		errx(1, "hx509_certs_append: anchor: %s: %d", s, ret);
 | |
| 
 | |
| 	} else if (strncmp(s, "cert:", 5) == 0) {
 | |
| 	    s += 5;
 | |
| 
 | |
| 	    ret = hx509_certs_append(certs, NULL, s);
 | |
| 	    if (ret)
 | |
| 		errx(1, "hx509_certs_append: certs: %s: %d", s, ret);
 | |
| 
 | |
| 	} else {
 | |
| 	    errx(1, "unknown option to verify: `%s'\n", s);
 | |
| 	}
 | |
|     }
 | |
| 
 | |
|     hx509_verify_attach_anchors(ctx, anchors);
 | |
| 
 | |
|     v.ctx = ctx;
 | |
|     v.chain = chain;
 | |
| 
 | |
|     ret = hx509_certs_iter(certs, verify_f, &v);
 | |
| 
 | |
|     hx509_verify_destroy_ctx(ctx);
 | |
| 
 | |
|     hx509_certs_free(&anchors);
 | |
|     hx509_certs_free(&certs);
 | |
|     hx509_certs_free(&chain);
 | |
| 
 | |
| 
 | |
|     return ret;
 | |
| }
 | |
| 
 | |
| int
 | |
| pcert_pkcs11(void *opt, int argc, char **argv)
 | |
| {
 | |
|     int ret;
 | |
| 
 | |
|     ret = hx509_keyset_init(argv[0], NULL);
 | |
|     if (ret) {
 | |
| 	printf("hx509_keyset_init: %d\n", ret);
 | |
| 	return 0;
 | |
|     }
 | |
| 
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| int
 | |
| query(struct query_options *opt, int argc, char **argv)
 | |
| {
 | |
|     hx509_lock lock;
 | |
|     hx509_query q;
 | |
|     hx509_certs certs;
 | |
|     hx509_cert c;
 | |
|     int ret;
 | |
| 
 | |
|     _hx509_query_clear(&q);
 | |
| 
 | |
|     hx509_lock_init(&lock);
 | |
|     hx509_lock_add_password(lock, "foobar");
 | |
| 
 | |
|     ret = hx509_certs_init("MEMORY:cert-store", 0, NULL, &certs);
 | |
| 
 | |
|     while (argc > 0) {
 | |
| 
 | |
| 	ret = hx509_certs_append(certs, lock, argv[0]);
 | |
| 	if (ret)
 | |
| 	    errx(1, "hx509_certs_append: %s: %d", argv[0], ret);
 | |
| 
 | |
| 	argc--;
 | |
| 	argv++;
 | |
|     }
 | |
| 
 | |
|     if (opt->friendlyname_string) {
 | |
| 	q.match |= HX509_QUERY_MATCH_FRIENDLY_NAME;
 | |
| 	q.friendlyname = opt->friendlyname_string;
 | |
|     }
 | |
| 
 | |
|     if (opt->private_key_flag)
 | |
| 	q.match |= HX509_QUERY_PRIVATE_KEY;
 | |
| 
 | |
| 
 | |
|     ret = _hx509_certs_find(certs, &q, &c);
 | |
|     if (ret)
 | |
| 	warnx("_hx509_certs_find: %d", ret);
 | |
|     else
 | |
| 	printf("match found\n");
 | |
| 
 | |
|     hx509_lock_free(lock);
 | |
| 
 | |
|     return ret;
 | |
| }
 | |
| 
 | |
| int
 | |
| help(void *opt, int argc, char **argv)
 | |
| {
 | |
|     if(argc == 0) {
 | |
| 	sl_help(commands, 1, argv - 1 /* XXX */);
 | |
|     } else {
 | |
| 	SL_cmd *c = sl_match (commands, argv[0], 0);
 | |
|  	if(c == NULL) {
 | |
| 	    fprintf (stderr, "No such command: %s. "
 | |
| 		     "Try \"help\" for a list of commands\n",
 | |
| 		     argv[0]);
 | |
| 	} else {
 | |
| 	    if(c->func) {
 | |
| 		char *fake[] = { NULL, "--help", NULL };
 | |
| 		fake[0] = argv[0];
 | |
| 		(*c->func)(2, fake);
 | |
| 		fprintf(stderr, "\n");
 | |
| 	    }
 | |
| 	    if(c->help && *c->help)
 | |
| 		fprintf (stderr, "%s\n", c->help);
 | |
| 	    if((++c)->name && c->func == NULL) {
 | |
| 		int f = 0;
 | |
| 		fprintf (stderr, "Synonyms:");
 | |
| 		while (c->name && c->func == NULL) {
 | |
| 		    fprintf (stderr, "%s%s", f ? ", " : " ", (c++)->name);
 | |
| 		    f = 1;
 | |
| 		}
 | |
| 		fprintf (stderr, "\n");
 | |
| 	    }
 | |
| 	}
 | |
|     }
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| int
 | |
| main(int argc, char **argv)
 | |
| {
 | |
|     int ret, optidx = 0;
 | |
| 
 | |
|     setprogname (argv[0]);
 | |
| 
 | |
|     if(getarg(args, num_args, argc, argv, &optidx))
 | |
| 	usage(1);
 | |
|     if(help_flag)
 | |
| 	usage(0);
 | |
|     if(version_flag) {
 | |
| 	print_version(NULL);
 | |
| 	exit(0);
 | |
|     }
 | |
|     argv += optidx;
 | |
|     argc -= optidx;
 | |
| 
 | |
|     if (argc == 0)
 | |
| 	usage(1);
 | |
| 
 | |
|     ret = sl_command(commands, argc, argv);
 | |
|     if(ret == -1)
 | |
| 	warnx ("unrecognized command: %s", argv[0]);
 | |
| 
 | |
|     return ret;
 | |
| }
 |