summaryrefslogtreecommitdiff
path: root/lib/libtls/tls.c
diff options
context:
space:
mode:
authorBob Beck <beck@cvs.openbsd.org>2016-11-05 14:50:06 +0000
committerBob Beck <beck@cvs.openbsd.org>2016-11-05 14:50:06 +0000
commit99262928981816c37649095d90839f70c0f37857 (patch)
treeb7b6a40a544d2a28f70da5afd026a4e122fcdc81 /lib/libtls/tls.c
parenta53cf54d1b27510c547115d7c67c01a5ea0c8622 (diff)
rename ocsp_ctx to ocsp
ok jsing@
Diffstat (limited to 'lib/libtls/tls.c')
-rw-r--r--lib/libtls/tls.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libtls/tls.c b/lib/libtls/tls.c
index 6893e95b083..51717a79cb9 100644
--- a/lib/libtls/tls.c
+++ b/lib/libtls/tls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls.c,v 1.51 2016/11/03 10:05:32 jsing Exp $ */
+/* $OpenBSD: tls.c,v 1.52 2016/11/05 14:50:05 beck Exp $ */
/*
* Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
*
@@ -446,9 +446,9 @@ tls_reset(struct tls *ctx)
tls_conninfo_free(ctx->conninfo);
ctx->conninfo = NULL;
- tls_ocsp_ctx_free(ctx->ocsp_ctx);
- ctx->ocsp_ctx = NULL;
-
+ tls_ocsp_free(ctx->ocsp);
+ ctx->ocsp = NULL;
+
for (sni = ctx->sni_ctx; sni != NULL; sni = nsni) {
nsni = sni->next;
tls_sni_ctx_free(sni);
@@ -531,8 +531,8 @@ tls_handshake(struct tls *ctx)
ctx->ssl_peer_cert = SSL_get_peer_certificate(ctx->ssl_conn);
if (tls_conninfo_populate(ctx) == -1)
rv = -1;
- if (ctx->ocsp_ctx == NULL)
- ctx->ocsp_ctx = tls_ocsp_setup_from_peer(ctx);
+ if (ctx->ocsp == NULL)
+ ctx->ocsp = tls_ocsp_setup_from_peer(ctx);
}
out:
/* Prevent callers from performing incorrect error handling */