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

Adapt to new request handling.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21342 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-06-26 14:21:34 +00:00
parent 1b57c08324
commit a2c72dc392
1 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
lib/hx509/hxtool.c
View File

@@ -1202,23 +1202,23 @@ request_create(struct request_create_options *opt, int argc, char **argv)
} }
int int
pkcs10_print(struct pkcs10_print_options *opt, int argc, char **argv) request_print(struct request_print_options *opt, int argc, char **argv)
{ {
size_t length;
int ret, i; int ret, i;
void *p;
printf("pkcs10 print\n"); printf("request print\n");
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
ret = _hx509_map_file(argv[i], &p, &length, NULL); hx509_request req;
if (ret)
err(1, "map_file: %s: %d", argv[i], ret);
ret = _hx509_request_print(context, stdout, p, length); ret = _hx509_request_parse(context, argv[i], &req);
_hx509_unmap_file(p, length);
if (ret) if (ret)
hx509_err(context, 1, ret, "Failed to print file %s", argv[ i]); hx509_err(context, 1, ret, "parse_request: %s", argv[i]);
ret = _hx509_request_print(context, req, stdout);
_hx509_request_free(&req);
if (ret)
hx509_err(context, 1, ret, "Failed to print file %s", argv[i]);
} }
return 0; return 0;
@@ -1575,31 +1575,18 @@ hxtool_ca(struct certificate_sign_options *opt, int argc, char **argv)
} }
if (opt->req_string) { if (opt->req_string) {
CertificationRequest req; hx509_request req;
CertificationRequestInfo *rinfo;
void *p;
size_t len, size;
ret = _hx509_map_file(opt->req_string, &p, &len, NULL); ret = _hx509_request_parse(context, opt->req_string, &req);
if (ret) if (ret)
err(1, "map_file: %s: %d", opt->req_string, ret); hx509_err(context, 1, ret, "parse_request: %s", opt->req_string);
ret = _hx509_request_get_name(context, req, &subject);
ret = decode_CertificationRequest(p, len, &req, &size);
_hx509_unmap_file(p, len);
if (ret) if (ret)
errx(1, "failed to parse req file %s: %d", opt->req_string, ret); hx509_err(context, 1, ret, "get name");
ret = _hx509_request_get_SubjectPublicKeyInfo(context, req, &spki);
rinfo = &req.certificationRequestInfo;
ret = _hx509_name_from_Name(&rinfo->subject, &subject);
if (ret) if (ret)
errx(1, "_hx509_name_from_Name %d", ret); hx509_err(context, 1, ret, "get spki");
_hx509_request_free(&req);
ret = copy_SubjectPublicKeyInfo(&rinfo->subjectPKInfo, &spki);
if (ret)
errx(1, "copy_SubjectPublicKeyInfo: %d", ret);
free_CertificationRequest(&req);
} }
if (opt->generate_key_string) { if (opt->generate_key_string) {