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

Update to new hx509_pem_write().

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21312 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-06-25 18:27:28 +00:00
parent 1761c997f6
commit b376cf9ad6
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/hx509/hxtool.c
View File

@@ -59,6 +59,10 @@ usage(int code)
exit(code); exit(code);
} }
/*
*
*/
static void static void
lock_strings(hx509_lock lock, getarg_strings *pass) lock_strings(hx509_lock lock, getarg_strings *pass)
{ {
@@ -71,6 +75,10 @@ lock_strings(hx509_lock lock, getarg_strings *pass)
} }
} }
/*
*
*/
static void static void
certs_strings(hx509_context context, const char *type, hx509_certs certs, certs_strings(hx509_context context, const char *type, hx509_certs certs,
hx509_lock lock, const getarg_strings *s) hx509_lock lock, const getarg_strings *s)
@@ -85,6 +93,10 @@ certs_strings(hx509_context context, const char *type, hx509_certs certs,
} }
} }
/*
*
*/
static void static void
parse_oid(const char *str, const heim_oid *def, heim_oid *oid) parse_oid(const char *str, const heim_oid *def, heim_oid *oid)
{ {
@@ -97,6 +109,10 @@ parse_oid(const char *str, const heim_oid *def, heim_oid *oid)
errx(1, "parse_oid failed for: %s", str ? str : "default oid"); errx(1, "parse_oid failed for: %s", str ? str : "default oid");
} }
/*
*
*/
static void static void
peer_strings(hx509_context context, peer_strings(hx509_context context,
hx509_peer_info *peer, hx509_peer_info *peer,
@@ -125,6 +141,9 @@ peer_strings(hx509_context context,
free(val); free(val);
} }
/*
*
*/
int int
cms_verify_sd(struct cms_verify_sd_options *opt, int argc, char **argv) cms_verify_sd(struct cms_verify_sd_options *opt, int argc, char **argv)
@@ -337,26 +356,21 @@ cms_create_sd(struct cms_create_sd_options *opt, int argc, char **argv)
} }
if (opt->pem_flag) { if (opt->pem_flag) {
char *headers[3]; hx509_pem_header *header = NULL;
FILE *f; FILE *f;
if (opt->detached_signature_flag) hx509_pem_add_header(&header, "Content-disposition",
headers[0] = "Content-disposition: detached"; opt->detached_signature_flag ? "detached" : "inline");
else hx509_pem_add_header(&header, "Signer", signer_name);
headers[0] = "Content-disposition: inline";
asprintf(&headers[1], "Signer: %s", signer_name);
if (headers[1] == NULL)
errx(1, "out of memory");
headers[2] = NULL;
f = fopen(argv[1], "w"); f = fopen(argv[1], "w");
if (f == NULL) if (f == NULL)
err(1, "open %s", argv[1]); err(1, "open %s", argv[1]);
ret = hx509_pem_write(context, "CMS SIGNEDDATA", headers, f, ret = hx509_pem_write(context, "CMS SIGNEDDATA", header, f,
o.data, o.length); o.data, o.length);
fclose(f); fclose(f);
free(headers[1]); hx509_pem_free_header(header);
if (ret) if (ret)
errx(1, "hx509_pem_write: %d", ret); errx(1, "hx509_pem_write: %d", ret);