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
Diffstat (limited to '')
-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);
 	}
 
logheader'>2021-05-25build: Add scripts to EXTRA_DISTJune McEnroe 2021-05-25import: Add missing scripts/wrap-compiler-for-flag-checkJune McEnroe 2021-05-08Import LibreSSL 3.3.3June McEnroe 2021-04-18build: Remove added x509_verify.3 links 3.3.2June McEnroe 2021-04-18tls: Use EC_KEY_set_ex_dataJune McEnroe 2021-04-18Import LibreSSL 3.3.2June McEnroe 2021-03-05Bump version to 3.3.1p1 3.3.1p1June McEnroe 2021-03-05build: Add OpenSSL includes to libcompatJune McEnroe Some compat sources (getentropy_linux.c for example) require OpenSSL. Reported by Robert Scheck. 2020-12-15Import LibreSSL 3.3.1June McEnroe 2020-11-24Import LibreSSL 3.3.0June McEnroe 2020-10-22Import LibreSSL 3.2.2June McEnroe 2020-09-29Import LibreSSL 3.2.1June McEnroe 2020-09-29import: Add m4/ax_add_fortify_source.m4June McEnroe 2020-08-05build: Add README.7 to EXTRA_DIST 3.2.0June McEnroe 2020-08-03doc: Indicate that only OpenSSL 1.1.1b and newer workJune McEnroe