aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-10-16 12:06:58 +0200
committerHans Nilsson <[email protected]>2017-10-16 12:06:58 +0200
commit41765cc89a82fd28159b492c2156b6418e6dd8b8 (patch)
treefbfcad0a1e0bd4c4369be428758d20618b93a42c /lib
parent1c61294202583bdc297efd59ab03b4366bfbc4f9 (diff)
parentb02cd40775cbc9ad8981845f83a7fc45cb61d909 (diff)
downloadotp-41765cc89a82fd28159b492c2156b6418e6dd8b8.tar.gz
otp-41765cc89a82fd28159b492c2156b6418e6dd8b8.tar.bz2
otp-41765cc89a82fd28159b492c2156b6418e6dd8b8.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/public_key/doc/src/public_key.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index 3040f2db0d..5230cef496 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -883,8 +883,8 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
</type>
<desc>
<p>This function checks that the <i>Presented Identifier</i> (e.g hostname) in a peer certificate
- conforms with the Expected Identifier that the client wants to connect to.
- This functions is intended to be added as an extra client check to the peer certificate when performing
+ is in agreement with the <i>Reference Identifier</i> that the client expects to be connected to.
+ The function is intended to be added as an extra client check of the peer certificate when performing
<seealso marker="public_key:public_key#pkix_path_validation-3">public_key:pkix_path_validation/3</seealso>
</p>
<p>See <url href="https://tools.ietf.org/html/rfc6125">RFC 6125</url>
@@ -897,7 +897,8 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
<p>The <c>{OtherRefId,term()}</c> is defined by the user and is passed to the <c>match_fun</c>, if defined.
If that term is a binary, it will be converted to a string.
</p>
- <p>The <c>ip</c> takes a 4-tuple or a
+ <p>The <c>ip</c> Reference ID takes an <seealso marker="inet:inet#type-ip_address">inet:ip_address()</seealso>
+ or an ip address in string format (E.g "10.0.1.1" or "1234::5678:9012") as second element.
</p>
</desc>
</func>