From: Tomasz Ziolkowski <tomasz.ziolkowski@allegro.pl>
Date: Wed, 4 Aug 2021 11:02:20 +0000 (+0200)
Subject: merge master
X-Git-Tag: release-1.14.0rc1~79^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a922c6d5258b9b3547f59cd8997f27b367ff3a14;p=thirdparty%2Funbound.git

merge master
---

a922c6d5258b9b3547f59cd8997f27b367ff3a14
diff --cc testcode/petal.c
index 78f1ca2f5,a1a376155..fbe5ac61b
--- a/testcode/petal.c
+++ b/testcode/petal.c
@@@ -241,11 -238,11 +241,14 @@@ setup_ctx(char* key, char* cert
  	(void)SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2);
  #endif
  	(void)SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv3);
+ #ifdef HAVE_SSL_CTX_SET_SECURITY_LEVEL
+ 	SSL_CTX_set_security_level(ctx, 0); /* for keys in tests */
+ #endif
 -	if(!SSL_CTX_use_certificate_chain_file(ctx, cert))
 +	if(!SSL_CTX_use_certificate_chain_file(ctx, cert)) {
- 		int e = ERR_peek_error();
- 		printf("error string: %s\n", ERR_reason_error_string(e));
++	    int e = ERR_peek_error();
++    	printf("error string: %s\n", ERR_reason_error_string(e));
  		print_exit("cannot read cert");
 +	}
  	if(!SSL_CTX_use_PrivateKey_file(ctx, key, SSL_FILETYPE_PEM))
  		print_exit("cannot read key");
  	if(!SSL_CTX_check_private_key(ctx))