oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Support verifying PEM signature files.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22651 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-02-26 12:28:23 +00:00
parent 8eaef94597
commit 35a3b73c9c
1 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
lib/hx509/hxtool.c
View File

@@ -141,6 +141,26 @@ peer_strings(hx509_context context,
free(val); free(val);
} }
/*
*
*/
static int
pem_reader(hx509_context context, const char *type,
const hx509_pem_header *headers,
const void *data , size_t length, void *ctx)
{
heim_octet_string *c = (heim_octet_string *)ctx;
c->data = malloc(length);
if (c->data == NULL)
return ENOMEM;
memcpy(c->data, data, length);
c->length = length;
return 0;
}
/* /*
* *
*/ */
@@ -166,17 +186,6 @@ cms_verify_sd(struct cms_verify_sd_options *opt, int argc, char **argv)
hx509_lock_init(context, &lock); hx509_lock_init(context, &lock);
lock_strings(lock, &opt->pass_strings); lock_strings(lock, &opt->pass_strings);
ret = _hx509_map_file(argv[0], &p, &sz, NULL);
if (ret)
err(1, "map_file: %s: %d", argv[0], ret);
if (opt->signed_content_string) {
ret = _hx509_map_file_os(opt->signed_content_string, &signeddata, NULL);
if (ret)
err(1, "map_file: %s: %d", opt->signed_content_string, ret);
sd = &signeddata;
}
ret = hx509_verify_init_ctx(context, &ctx); ret = hx509_verify_init_ctx(context, &ctx);
ret = hx509_certs_init(context, "MEMORY:cms-anchors", 0, NULL, &anchors); ret = hx509_certs_init(context, "MEMORY:cms-anchors", 0, NULL, &anchors);
@@ -185,8 +194,32 @@ cms_verify_sd(struct cms_verify_sd_options *opt, int argc, char **argv)
certs_strings(context, "anchors", anchors, lock, &opt->anchors_strings); certs_strings(context, "anchors", anchors, lock, &opt->anchors_strings);
certs_strings(context, "store", store, lock, &opt->certificate_strings); certs_strings(context, "store", store, lock, &opt->certificate_strings);
if (opt->pem_flag) {
FILE *f;
f = fopen(argv[0], "r");
if (f == NULL)
err(1, "Failed to open file %s", argv[0]);
ret = hx509_pem_read(context, f, pem_reader, &co);
fclose(f);
if (ret)
errx(1, "PEM reader failed: %d", ret);
} else {
ret = _hx509_map_file(argv[0], &p, &sz, NULL);
if (ret)
err(1, "map_file: %s: %d", argv[0], ret);
co.data = p; co.data = p;
co.length = sz; co.length = sz;
}
if (opt->signed_content_string) {
ret = _hx509_map_file_os(opt->signed_content_string, &signeddata, NULL);
if (ret)
errx(1, "map_file: %s: %d", opt->signed_content_string, ret);
sd = &signeddata;
}
if (opt->content_info_flag) { if (opt->content_info_flag) {
heim_octet_string uwco; heim_octet_string uwco;
@@ -235,6 +268,9 @@ cms_verify_sd(struct cms_verify_sd_options *opt, int argc, char **argv)
errx(1, "hx509_write_file: %d", ret); errx(1, "hx509_write_file: %d", ret);
der_free_octet_string(&c); der_free_octet_string(&c);
if (opt->pem_flag)
der_free_octet_string(&co);
else
_hx509_unmap_file(p, sz); _hx509_unmap_file(p, sz);
if (sd) if (sd)
_hx509_unmap_file_os(sd); _hx509_unmap_file_os(sd);
@@ -360,7 +396,8 @@ cms_create_sd(struct cms_create_sd_options *opt, int argc, char **argv)
FILE *f; FILE *f;
hx509_pem_add_header(&header, "Content-disposition", hx509_pem_add_header(&header, "Content-disposition",
opt->detached_signature_flag ? "detached" : "inline"); opt->detached_signature_flag ?
"detached" : "inline");
hx509_pem_add_header(&header, "Signer", signer_name); hx509_pem_add_header(&header, "Signer", signer_name);
f = fopen(argv[1], "w"); f = fopen(argv[1], "w");