[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  733094ec6b718ebced449b275a780ec3d0a361a5 (commit)
      from  e16d9afe4106503ba6c4b22c9b7c5bd367e3b565 (commit)


- Log -----------------------------------------------------------------
commit 733094ec6b718ebced449b275a780ec3d0a361a5
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri May 21 06:07:25 2021 +0200

    TEST: Avoid using just 'example.com'  - test_cmp_http
    
    We have reports that some are using example.com in their /etc/hosts
    for testing purposes, so we can't necessarily assume that those will
    fail.
    
    We fix it by using "random" hosts in that domain.
    
    Fixes #15395
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15398)

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/80-test_cmp_http_data/Mock/test.cnf       | 6 +++---
 test/recipes/80-test_cmp_http_data/test_connection.csv | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/recipes/80-test_cmp_http_data/Mock/test.cnf b/test/recipes/80-test_cmp_http_data/Mock/test.cnf
index 503ded18e3..8c8913b3c9 100644
--- a/test/recipes/80-test_cmp_http_data/Mock/test.cnf
+++ b/test/recipes/80-test_cmp_http_data/Mock/test.cnf
@@ -135,6 +135,6 @@ subjectAltName = @alt_names_3
 
 [alt_names_3]
 DNS.0 = localhost
-DNS.1 = example.com
-DNS.2 = example2.com
-DNS__3 = example3.com
+DNS.1 = xn--rksmrgs-5wao1o.example.com
+DNS.2 = xn--rkmacka-5wa.example.com
+DNS__3 = xn--rksallad-0za.example.com
diff --git a/test/recipes/80-test_cmp_http_data/test_connection.csv b/test/recipes/80-test_cmp_http_data/test_connection.csv
index 55670cf446..33a572a29d 100644
--- a/test/recipes/80-test_cmp_http_data/test_connection.csv
+++ b/test/recipes/80-test_cmp_http_data/test_connection.csv
@@ -5,7 +5,7 @@ expected,description, -section,val, -server,val, -proxy,val, -no_proxy,val, -tls
 TBD,Domain name, -section,, -server,_SERVER_CN:_SERVER_PORT,,,,,,,,,,,,,,
 TBD,IP address, -section,, -server,_SERVER_IP:_SERVER_PORT,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,
-0,wrong server, -section,, -server,example.com:_SERVER_PORT,,,,,BLANK,,,, -msg_timeout,1,BLANK,,BLANK,
+0,wrong server, -section,, -server,xn--rksmrgs-5wao1o.example.com:_SERVER_PORT,,,,,BLANK,,,, -msg_timeout,1,BLANK,,BLANK,
 0,wrong server port, -section,, -server,_SERVER_HOST:99,,,,,BLANK,,,, -msg_timeout,1,BLANK,,BLANK,
 0,server default port, -section,, -server,_SERVER_HOST,,,,,BLANK,,,, -msg_timeout,1,BLANK,,BLANK,
 0,server port out of range, -section,, -server,_SERVER_HOST:65536,,,,,BLANK,,,,BLANK,,BLANK,,BLANK,