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

hx509: expose hx509_request_parse*()

Browse Source
This commit is contained in:
Nicolas Williams
2019-07-15 23:11:12 -05:00
parent 87eb05df6a
commit d13f89cb11
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/hx509/hxtool.c
View File

@@ -1425,7 +1425,7 @@ request_print(struct request_print_options *opt, int argc, char **argv)
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
hx509_request req; hx509_request req;
ret = _hx509_request_parse(context, argv[i], &req); ret = hx509_request_parse(context, argv[i], &req);
if (ret) if (ret)
hx509_err(context, 1, ret, "parse_request: %s", argv[i]); hx509_err(context, 1, ret, "parse_request: %s", argv[i]);
@@ -1884,7 +1884,7 @@ hxtool_ca(struct certificate_sign_options *opt, int argc, char **argv)
if (opt->req_string) { if (opt->req_string) {
hx509_request req; hx509_request req;
ret = _hx509_request_parse(context, opt->req_string, &req); ret = hx509_request_parse(context, opt->req_string, &req);
if (ret) if (ret)
hx509_err(context, 1, ret, "parse_request: %s", opt->req_string); hx509_err(context, 1, ret, "parse_request: %s", opt->req_string);
ret = hx509_request_get_name(context, req, &subject); ret = hx509_request_get_name(context, req, &subject);

3
lib/hx509/libhx509-exports.def
View File

@@ -29,7 +29,8 @@ EXPORTS
hx509_request_get_SubjectPublicKeyInfo hx509_request_get_SubjectPublicKeyInfo
hx509_request_get_name hx509_request_get_name
hx509_request_init hx509_request_init
_hx509_request_parse hx509_request_parse
hx509_request_parse_der
_hx509_request_print _hx509_request_print
hx509_request_set_SubjectPublicKeyInfo hx509_request_set_SubjectPublicKeyInfo
; _hx509_request_set_email ; _hx509_request_set_email

6
lib/hx509/req.c
View File

@@ -238,7 +238,7 @@ out:
} }
HX509_LIB_FUNCTION int HX509_LIB_CALL HX509_LIB_FUNCTION int HX509_LIB_CALL
_hx509_request_parse_der(hx509_context context, hx509_request_parse_der(hx509_context context,
heim_octet_string *der, heim_octet_string *der,
hx509_request *req) hx509_request *req)
{ {
@@ -314,7 +314,7 @@ _hx509_request_parse_der(hx509_context context,
} }
HX509_LIB_FUNCTION int HX509_LIB_CALL HX509_LIB_FUNCTION int HX509_LIB_CALL
_hx509_request_parse(hx509_context context, hx509_request_parse(hx509_context context,
const char *csr, const char *csr,
hx509_request *req) hx509_request *req)
{ {
@@ -334,7 +334,7 @@ _hx509_request_parse(hx509_context context,
return ret; return ret;
} }
ret = _hx509_request_parse_der(context, &d, req); ret = hx509_request_parse_der(context, &d, req);
free(d.data); free(d.data);
if (ret) if (ret)
hx509_set_error_string(context, HX509_ERROR_APPEND, ret, hx509_set_error_string(context, HX509_ERROR_APPEND, ret,

3
lib/hx509/version-script.map
View File

@@ -24,7 +24,6 @@ HEIMDAL_X509_1.2 {
_hx509_request_add_dns_name; _hx509_request_add_dns_name;
_hx509_request_add_eku; _hx509_request_add_eku;
_hx509_request_add_email; _hx509_request_add_email;
_hx509_request_parse;
_hx509_request_print; _hx509_request_print;
_hx509_request_set_email; _hx509_request_set_email;
_hx509_request_to_pkcs10; _hx509_request_to_pkcs10;
@@ -210,6 +209,8 @@ HEIMDAL_X509_1.2 {
hx509_request_get_SubjectPublicKeyInfo; hx509_request_get_SubjectPublicKeyInfo;
hx509_request_free; hx509_request_free;
hx509_request_init; hx509_request_init;
hx509_request_parse;
hx509_request_parse_der;
hx509_request_set_name; hx509_request_set_name;
hx509_request_set_SubjectPublicKeyInfo; hx509_request_set_SubjectPublicKeyInfo;
hx509_revoke_add_crl; hx509_revoke_add_crl;