aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/test/public_key_SUITE_data/verify_hostname_ip.conf
diff options
context:
space:
mode:
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.conf8
1 files changed, 8 insertions, 0 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 798592e4f6..f27dac07ec 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,13 +5,21 @@ 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