about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2021-11-29 15:15:44 -0500
committerJune McEnroe <june@causal.agency>2021-11-29 15:15:44 -0500
commit9a7b950929457f6f02364fbbeec084a980d4b576 (patch)
tree37e7bb51ac631e5b4aac15139230cfd34fa1b6ce
parentMerge LibreSSL 3.4.1 (diff)
parentImport LibreSSL 3.4.2 (diff)
downloadlibretls-9a7b950929457f6f02364fbbeec084a980d4b576.tar.gz
libretls-9a7b950929457f6f02364fbbeec084a980d4b576.zip
Merge LibreSSL 3.4.2
-rw-r--r--VERSION2
-rw-r--r--tls.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/VERSION b/VERSION
index bc5999b..ec46c1f 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-3.4.1
+3.4.2
 
diff --git a/tls.c b/tls.c
index fabf790..7b612b8 100644
--- a/tls.c
+++ b/tls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls.c,v 1.90 2021/10/02 09:46:48 jsing Exp $ */
+/* $OpenBSD: tls.c,v 1.89 2021/02/01 15:35:41 tb Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -582,7 +582,7 @@ tls_configure_ssl(struct tls *ctx, SSL_CTX *ssl_ctx)
 	}
 
 	if (ctx->config->verify_time == 0) {
-		X509_VERIFY_PARAM_set_flags(SSL_CTX_get0_param(ssl_ctx),
+		X509_VERIFY_PARAM_set_flags(ssl_ctx->param,
 		    X509_V_FLAG_NO_CHECK_TIME);
 	}
 
54f7bc80d31c5c0880d6520a088&follow=1'>Clean up htmlHeaderJune McEnroe 2019-02-18Remove hi line numberingJune McEnroe Tags are much better for referring to specific parts of a file and line numbering is better done by a post-processing tool such as cat -n or producing a two-column HTML <table>. 2019-02-18Add Tag class to hiJune McEnroe 2019-02-17Generate HTML with hi -n -f html -o anchorJune McEnroe Running hi twice to insert stuff between the head and the content is a bit of a hack but oh well. 2019-02-17Add hi -f html -o anchor for line number linksJune McEnroe 2019-02-17Simplify temp trap in upJune McEnroe 2019-02-17Add line numbers to hiJune McEnroe Renames previous -n option to -m to stay consistent with cat -n. Prefixing lines with line numbers affects where the first tab indent ends up relative to the text above it. Not sure if it's worth fixing somehow. 2019-02-17Always split spans after newlinesJune McEnroe Simplifies ANSI and IRC output code, and prepares for line numbered output. 2019-02-15Color format specifiers light cyan in vimJune McEnroe 2019-02-15Highlight Interp as yellowJune McEnroe 2019-02-15Highlight strings in sh command substitutionsJune McEnroe 2019-02-15Add nmap gpJune McEnroe 2019-02-14Avoid newline when copying URL to pasteboardJune McEnroe 2019-02-13Add forgotten "sixth" book of H2G2June McEnroe