summaryrefslogtreecommitdiff
path: root/src/lib/libtls/tls.c
diff options
context:
space:
mode:
authorbeck <>2016-11-05 14:50:05 +0000
committerbeck <>2016-11-05 14:50:05 +0000
commit857e056d8e939aab5d14f1aadf80c28fe9a4f805 (patch)
treef8562aaa3f17de87e3eca50e4d128c22873832f0 /src/lib/libtls/tls.c
parent31aa40a36a1a6abcd16ec90eba9325e1bdc5edc8 (diff)
downloadopenbsd-857e056d8e939aab5d14f1aadf80c28fe9a4f805.tar.gz
openbsd-857e056d8e939aab5d14f1aadf80c28fe9a4f805.tar.bz2
openbsd-857e056d8e939aab5d14f1aadf80c28fe9a4f805.zip
rename ocsp_ctx to ocsp
ok jsing@
Diffstat (limited to 'src/lib/libtls/tls.c')
-rw-r--r--src/lib/libtls/tls.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libtls/tls.c b/src/lib/libtls/tls.c
index 6893e95b08..51717a79cb 100644
--- a/src/lib/libtls/tls.c
+++ b/src/lib/libtls/tls.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls.c,v 1.51 2016/11/03 10:05:32 jsing Exp $ */ 1/* $OpenBSD: tls.c,v 1.52 2016/11/05 14:50:05 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -446,9 +446,9 @@ tls_reset(struct tls *ctx)
446 tls_conninfo_free(ctx->conninfo); 446 tls_conninfo_free(ctx->conninfo);
447 ctx->conninfo = NULL; 447 ctx->conninfo = NULL;
448 448
449 tls_ocsp_ctx_free(ctx->ocsp_ctx); 449 tls_ocsp_free(ctx->ocsp);
450 ctx->ocsp_ctx = NULL; 450 ctx->ocsp = NULL;
451 451
452 for (sni = ctx->sni_ctx; sni != NULL; sni = nsni) { 452 for (sni = ctx->sni_ctx; sni != NULL; sni = nsni) {
453 nsni = sni->next; 453 nsni = sni->next;
454 tls_sni_ctx_free(sni); 454 tls_sni_ctx_free(sni);
@@ -531,8 +531,8 @@ tls_handshake(struct tls *ctx)
531 ctx->ssl_peer_cert = SSL_get_peer_certificate(ctx->ssl_conn); 531 ctx->ssl_peer_cert = SSL_get_peer_certificate(ctx->ssl_conn);
532 if (tls_conninfo_populate(ctx) == -1) 532 if (tls_conninfo_populate(ctx) == -1)
533 rv = -1; 533 rv = -1;
534 if (ctx->ocsp_ctx == NULL) 534 if (ctx->ocsp == NULL)
535 ctx->ocsp_ctx = tls_ocsp_setup_from_peer(ctx); 535 ctx->ocsp = tls_ocsp_setup_from_peer(ctx);
536 } 536 }
537 out: 537 out:
538 /* Prevent callers from performing incorrect error handling */ 538 /* Prevent callers from performing incorrect error handling */