diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-03-20 22:04:58 +0100 |
|---|---|---|
| committer | Dr. David von Oheimb <dev@ddvo.net> | 2021-03-31 19:51:52 +0200 |
| commit | 534725fd4389782d693cff061f4d31b786058ab1 (patch) | |
| tree | 2c950dd52c0a91c1d8754085bb0daf605d272392 /crypto/http | |
| parent | c37b94795730a857485c6cebac6402c03246dce5 (diff) | |
HTTP: Fix method_POST param by moving it to OSSL_HTTP_REQ_CTX_set_request_line()
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14699)
Diffstat (limited to 'crypto/http')
| -rw-r--r-- | crypto/http/http_client.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/crypto/http/http_client.c b/crypto/http/http_client.c index 4aba5e7761..8e4f8e8c83 100644 --- a/crypto/http/http_client.c +++ b/crypto/http/http_client.c @@ -73,8 +73,7 @@ struct ossl_http_req_ctx_st { #define OHS_HTTP_HEADER (9 | OHS_NOREAD) /* Headers set, w/o final \r\n */ OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, - int method_POST, int maxline, - unsigned long max_resp_len, + int maxline, unsigned long max_resp_len, int timeout, const char *expected_ct, int expect_asn1) { @@ -96,7 +95,6 @@ OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, OPENSSL_free(rctx); return NULL; } - rctx->method_POST = method_POST; rctx->expected_ct = expected_ct; rctx->expect_asn1 = expect_asn1; rctx->resp_len = 0; @@ -135,10 +133,10 @@ void OSSL_HTTP_REQ_CTX_set_max_response_length(OSSL_HTTP_REQ_CTX *rctx, } /* - * Create request line using |ctx| and |path| (or "/" in case |path| is NULL). + * Create request line using |rctx| and |path| (or "/" in case |path| is NULL). * Server name (and port) must be given if and only if plain HTTP proxy is used. */ -int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, +int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, int method_POST, const char *server, const char *port, const char *path) { @@ -150,6 +148,7 @@ int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, if ((rctx->mem = BIO_new(BIO_s_mem())) == NULL) return 0; + rctx->method_POST = method_POST != 0; if (BIO_printf(rctx->mem, "%s ", rctx->method_POST ? "POST" : "GET") <= 0) return 0; @@ -202,7 +201,7 @@ int OSSL_HTTP_REQ_CTX_add1_header(OSSL_HTTP_REQ_CTX *rctx, return 1; } -static int OSSL_HTTP_REQ_CTX_set_content(OSSL_HTTP_REQ_CTX *rctx, +static int ossl_http_req_ctx_set_content(OSSL_HTTP_REQ_CTX *rctx, const char *content_type, BIO *req_mem) { const unsigned char *req; @@ -259,7 +258,7 @@ int OSSL_HTTP_REQ_CTX_set1_req(OSSL_HTTP_REQ_CTX *rctx, const char *content_type } res = (mem = ossl_http_asn1_item2bio(it, req)) != NULL - && OSSL_HTTP_REQ_CTX_set_content(rctx, content_type, mem); + && ossl_http_req_ctx_set_content(rctx, content_type, mem); BIO_free(mem); return res; } @@ -308,18 +307,17 @@ OSSL_HTTP_REQ_CTX } /* remaining parameters are checked indirectly by the functions called */ - if ((rctx = OSSL_HTTP_REQ_CTX_new(wbio, rbio, req_mem != NULL, maxline, - max_resp_len, timeout, + if ((rctx = OSSL_HTTP_REQ_CTX_new(wbio, rbio, maxline, max_resp_len, timeout, expected_ct, expect_asn1)) == NULL) return NULL; - if (OSSL_HTTP_REQ_CTX_set_request_line(rctx, + if (OSSL_HTTP_REQ_CTX_set_request_line(rctx, req_mem != NULL, use_http_proxy ? server : NULL, port, path) && OSSL_HTTP_REQ_CTX_add1_headers(rctx, headers, server) && (req_mem == NULL - || OSSL_HTTP_REQ_CTX_set_content(rctx, content_type, req_mem))) + || ossl_http_req_ctx_set_content(rctx, content_type, req_mem))) return rctx; OSSL_HTTP_REQ_CTX_free(rctx); |