The canonical localhost IPv6 address is [::1] not [::]

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/25533)

(cherry picked from commit 945df058801cdb14af58f3529068955cb1af4828)

diff --git a/doc/man1/openssl-cmp.pod.in b/doc/man1/openssl-cmp.pod.in
index c0d112f6082b8a7017eef1cc45bc8a709c1bf7ea..f54519f22abed5696eed160d5fa56e9bc8e201a7 100644 (file)
--- a/doc/man1/openssl-cmp.pod.in
+++ b/doc/man1/openssl-cmp.pod.in
@@ -455,7 +455,7 @@ Reason numbers defined in RFC 5280 are:
 
 The I<host> domain name or IP address and optionally I<port>
 of the CMP server to connect to using HTTP(S).
-IP address may be for v4 or v6, such as C<127.0.0.1> or C<[::]> for localhost.
+IP address may be for v4 or v6, such as C<127.0.0.1> or C<[::1]> for localhost.
 
 This option excludes I<-port> and I<-use_mock_srv>.
 It is ignored if I<-rspin> is given with enough filename arguments.
@@ -972,7 +972,7 @@ This excludes the B<-server> and B<-port> options.
 =item B<-port> I<number>
 
 Act as HTTP-based CMP server mock-up listening on the given local port.
-The client may address the server via, e.g., C<127.0.0.1> or C<[::]>.
+The client may address the server via, e.g., C<127.0.0.1> or C<[::1]>.
 This option excludes the B<-server> and B<-use_mock_srv> options.
 The B<-rspin>, B<-rspout>, B<-reqin>, and B<-reqout> options
 so far are not supported in this mode.

diff --git a/doc/man1/openssl-ocsp.pod.in b/doc/man1/openssl-ocsp.pod.in
index 662fb9e4c1de4a61ee70b333fe19a3cbf1e187a5..823f9bc53db6a9b7a4674e6210b6fd16e46c2af8 100644 (file)
--- a/doc/man1/openssl-ocsp.pod.in
+++ b/doc/man1/openssl-ocsp.pod.in
@@ -171,7 +171,7 @@ For details, see the B<-host> and B<-path> options described next.
 If the B<-host> option is present then the OCSP request is sent to the host
 I<host> on port I<port>.
 The I<host> may be a domain name or an IP (v4 or v6) address,
-such as C<127.0.0.1> or C<[::]> for localhost.
+such as C<127.0.0.1> or C<[::1]> for localhost.
 The B<-path> option specifies the HTTP pathname to use or "/" by default.
 This is equivalent to specifying B<-url> with scheme
 http:// and the given I<host>, I<port>, and optional I<pathname>.

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 52a39383d7442d890e3e79a577f03feb73b4b7fd..3c0a598d11cecaf39dd31ea7fa6dfb30cd66ca6a 100644 (file)
--- a/test/recipes/80-test_cmp_http_data/test_connection.csv
+++ b/test/recipes/80-test_cmp_http_data/test_connection.csv
@@ -3,7 +3,7 @@ expected,description, -section,val, -server,val, -proxy,val, -no_proxy,val, -tls
 ,,,,,,,,,,,,,,,,,,,
 1,default config, -section,,,,,,,,BLANK,,,,BLANK,,BLANK,,BLANK,
 1,server domain name, -section,, -server,localhost:_SERVER_PORT,,,,,,,,,,,,,,
-1,server IPv6 address, -section,, -server,[::]:_SERVER_PORT,,,,,,,,,,,,,,
+1,server IPv6 address, -section,, -server,[::1]:_SERVER_PORT,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,
 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,