diff options
| author | Hans Nilsson <[email protected]> | 2017-11-27 12:46:38 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-11-27 12:46:38 +0100 |
| commit | caffc7d68273714a2ed5bbf67e8b604f550eefcd (patch) | |
| tree | aec630c30929f3b863590e6049486299c1ae21db /lib/public_key/test/public_key_SUITE_data/verify_hostname_ip.conf | |
| parent | eb2da85bf1f29000cd3c1b2f6dfbfcb5d6aec016 (diff) | |
| download | otp-caffc7d68273714a2ed5bbf67e8b604f550eefcd.tar.gz otp-caffc7d68273714a2ed5bbf67e8b604f550eefcd.tar.bz2 otp-caffc7d68273714a2ed5bbf67e8b604f550eefcd.zip | |
public_key: Fix failing pkix_verify_hostname_subjAltName_IP TC
Was due to an unresolved merge conflict in a453532fe31eecd8c39b5035702ee20b402fd687
Diffstat (limited to 'lib/public_key/test/public_key_SUITE_data/verify_hostname_ip.conf')
| -rw-r--r-- | lib/public_key/test/public_key_SUITE_data/verify_hostname_ip.conf | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/public_key/test/public_key_SUITE_data/verify_hostname_ip.conf b/lib/public_key/test/public_key_SUITE_data/verify_hostname_ip.conf index f27dac07ec..798592e4f6 100644 --- a/lib/public_key/test/public_key_SUITE_data/verify_hostname_ip.conf +++ b/lib/public_key/test/public_key_SUITE_data/verify_hostname_ip.conf @@ -5,21 +5,13 @@ distinguished_name = DN [DN] C=SE CN=example.com -<<<<<<< HEAD -======= -CN=5.6.7.8 ->>>>>>> maint-20 [SAN] subjectAltName = @alt_names [alt_names] DNS = 1.2.3.4 -<<<<<<< HEAD IP.1 = 10.67.16.75 -======= -IP.1 = 5.6.7.8 ->>>>>>> maint-20 IP.2 = abcd:ef::1 URI = https://10.11.12.13 |