diff options
author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-03-25 13:46:02 +0100 |
---|---|---|
committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-04-02 18:31:06 +0200 |
commit | 4b1fe471ac99b9f8692be85dcbcbf6977eb35c78 (patch) | |
tree | 1589302a8fad703bc2e626a45bddffa5f0d6c4d9 /crypto/cmp/cmp_ctx.c | |
parent | afe554c2d244b4e7fc8c1b14acef806a2a581a8d (diff) |
HTTP client: make server/proxy and port params more consistent; minor other improvements
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/11404)
Diffstat (limited to 'crypto/cmp/cmp_ctx.c')
-rw-r--r-- | crypto/cmp/cmp_ctx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/cmp/cmp_ctx.c b/crypto/cmp/cmp_ctx.c index eb799b103c..9a252cca79 100644 --- a/crypto/cmp/cmp_ctx.c +++ b/crypto/cmp/cmp_ctx.c @@ -95,7 +95,6 @@ OSSL_CMP_CTX *OSSL_CMP_CTX_new(void) ctx->status = -1; ctx->failInfoCode = -1; - ctx->serverPort = OSSL_CMP_DEFAULT_PORT; ctx->msg_timeout = 2 * 60; if ((ctx->untrusted_certs = sk_X509_new_null()) == NULL) @@ -146,7 +145,7 @@ void OSSL_CMP_CTX_free(OSSL_CMP_CTX *ctx) return; OPENSSL_free(ctx->serverPath); - OPENSSL_free(ctx->serverName); + OPENSSL_free(ctx->server); OPENSSL_free(ctx->proxy); OPENSSL_free(ctx->no_proxy); @@ -775,7 +774,7 @@ int OSSL_CMP_CTX_set1_senderNonce(OSSL_CMP_CTX *ctx, DEFINE_OSSL_CMP_CTX_set1(proxy, char) /* Set the (HTTP) host name of the CMP server */ -DEFINE_OSSL_CMP_CTX_set1(serverName, char) +DEFINE_OSSL_CMP_CTX_set1(server, char) /* Set the server exclusion list of the HTTP proxy server */ DEFINE_OSSL_CMP_CTX_set1(no_proxy, char) |