提交 5e7be6e6 编写于 作者: D Dr. David von Oheimb

Remove extra newline from CMP mock server error and add TODO on using request template

Reviewed-by: NMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11998)
上级 c4a9e3eb
...@@ -2996,7 +2996,7 @@ int cmp_main(int argc, char **argv) ...@@ -2996,7 +2996,7 @@ int cmp_main(int argc, char **argv)
if (req != NULL) { if (req != NULL) {
if (strcmp(path, "") != 0 && strcmp(path, "pkix/") != 0) { if (strcmp(path, "") != 0 && strcmp(path, "pkix/") != 0) {
(void)http_server_send_status(cbio, 404, "Not Found"); (void)http_server_send_status(cbio, 404, "Not Found");
CMP_err1("Expecting empty path or 'pkix/' but got '%s'\n", CMP_err1("Expecting empty path or 'pkix/' but got '%s'",
path); path);
OPENSSL_free(path); OPENSSL_free(path);
OSSL_CMP_MSG_free(req); OSSL_CMP_MSG_free(req);
......
...@@ -208,6 +208,7 @@ static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx, ...@@ -208,6 +208,7 @@ static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
} }
if (ctx->certOut != NULL if (ctx->certOut != NULL
&& (*certOut = X509_dup(ctx->certOut)) == NULL) && (*certOut = X509_dup(ctx->certOut)) == NULL)
/* TODO better return a cert produced from data in request template */
goto err; goto err;
if (ctx->chainOut != NULL if (ctx->chainOut != NULL
&& (*chainOut = X509_chain_up_ref(ctx->chainOut)) == NULL) && (*chainOut = X509_chain_up_ref(ctx->chainOut)) == NULL)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册