diff --git a/lib/hx509/hxtool.c b/lib/hx509/hxtool.c index 5979d1e39..8cdf82ece 100644 --- a/lib/hx509/hxtool.c +++ b/lib/hx509/hxtool.c @@ -1425,7 +1425,7 @@ request_print(struct request_print_options *opt, int argc, char **argv) for (i = 0; i < argc; i++) { hx509_request req; - ret = _hx509_request_parse(context, argv[i], &req); + ret = hx509_request_parse(context, argv[i], &req); if (ret) 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) { hx509_request req; - ret = _hx509_request_parse(context, opt->req_string, &req); + ret = hx509_request_parse(context, opt->req_string, &req); if (ret) hx509_err(context, 1, ret, "parse_request: %s", opt->req_string); ret = hx509_request_get_name(context, req, &subject); diff --git a/lib/hx509/libhx509-exports.def b/lib/hx509/libhx509-exports.def index 80db8c7e5..755ca7562 100644 --- a/lib/hx509/libhx509-exports.def +++ b/lib/hx509/libhx509-exports.def @@ -29,7 +29,8 @@ EXPORTS hx509_request_get_SubjectPublicKeyInfo hx509_request_get_name hx509_request_init - _hx509_request_parse + hx509_request_parse + hx509_request_parse_der _hx509_request_print hx509_request_set_SubjectPublicKeyInfo ; _hx509_request_set_email diff --git a/lib/hx509/req.c b/lib/hx509/req.c index b08176faa..dadea7eb2 100644 --- a/lib/hx509/req.c +++ b/lib/hx509/req.c @@ -238,9 +238,9 @@ out: } HX509_LIB_FUNCTION int HX509_LIB_CALL -_hx509_request_parse_der(hx509_context context, - heim_octet_string *der, - hx509_request *req) +hx509_request_parse_der(hx509_context context, + heim_octet_string *der, + hx509_request *req) { CertificationRequestInfo *rinfo = NULL; CertificationRequest r; @@ -314,9 +314,9 @@ _hx509_request_parse_der(hx509_context context, } HX509_LIB_FUNCTION int HX509_LIB_CALL -_hx509_request_parse(hx509_context context, - const char *csr, - hx509_request *req) +hx509_request_parse(hx509_context context, + const char *csr, + hx509_request *req) { heim_octet_string d; int ret; @@ -334,7 +334,7 @@ _hx509_request_parse(hx509_context context, return ret; } - ret = _hx509_request_parse_der(context, &d, req); + ret = hx509_request_parse_der(context, &d, req); free(d.data); if (ret) hx509_set_error_string(context, HX509_ERROR_APPEND, ret, diff --git a/lib/hx509/version-script.map b/lib/hx509/version-script.map index df04003ec..8e19abf0a 100644 --- a/lib/hx509/version-script.map +++ b/lib/hx509/version-script.map @@ -24,7 +24,6 @@ HEIMDAL_X509_1.2 { _hx509_request_add_dns_name; _hx509_request_add_eku; _hx509_request_add_email; - _hx509_request_parse; _hx509_request_print; _hx509_request_set_email; _hx509_request_to_pkcs10; @@ -210,6 +209,8 @@ HEIMDAL_X509_1.2 { hx509_request_get_SubjectPublicKeyInfo; hx509_request_free; hx509_request_init; + hx509_request_parse; + hx509_request_parse_der; hx509_request_set_name; hx509_request_set_SubjectPublicKeyInfo; hx509_revoke_add_crl;