aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc/src/ssh_app.xml
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2015-12-11 10:07:21 +0100
committerLars Thorsen <[email protected]>2015-12-11 10:07:21 +0100
commitfae6b9385f3d0d1c725ca6cdb588b8bf1e473721 (patch)
tree9b0b87cea4fd11a46bf64b9a04d4fbeca7875da3 /lib/ssh/doc/src/ssh_app.xml
parent8c276c8c804e8cefb9f88d6bc6449916c3ec3a82 (diff)
parent545b938fb12396c9e1313a4bacf68f5307941be5 (diff)
downloadotp-fae6b9385f3d0d1c725ca6cdb588b8bf1e473721.tar.gz
otp-fae6b9385f3d0d1c725ca6cdb588b8bf1e473721.tar.bz2
otp-fae6b9385f3d0d1c725ca6cdb588b8bf1e473721.zip
Merge branch 'lars/correct-doc-bugs' into maint
Diffstat (limited to 'lib/ssh/doc/src/ssh_app.xml')
-rw-r--r--lib/ssh/doc/src/ssh_app.xml43
1 files changed, 22 insertions, 21 deletions
diff --git a/lib/ssh/doc/src/ssh_app.xml b/lib/ssh/doc/src/ssh_app.xml
index 79dd1e210e..f6ce44c015 100644
--- a/lib/ssh/doc/src/ssh_app.xml
+++ b/lib/ssh/doc/src/ssh_app.xml
@@ -4,7 +4,7 @@
<appref>
<header>
<copyright>
- <year>2012</year><year>2013</year>
+ <year>2012</year><year>2015</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -214,21 +214,21 @@
<p>The following rfc:s are supported:</p>
<list type="bulleted">
<item><url href="https://tools.ietf.org/html/rfc4251">RFC 4251</url>, The Secure Shell (SSH) Protocol Architecture.
- <p>Except
+ <p>Except</p>
<list type="bulleted">
<item>9.4.6 Host-Based Authentication</item>
<item>9.5.2 Proxy Forwarding</item>
<item>9.5.3 X11 Forwarding</item>
</list>
- </p>
+ <p/>
</item>
<item><url href="https://tools.ietf.org/html/rfc4252">RFC 4252</url>, The Secure Shell (SSH) Authentication Protocol.
- <p>Except
+ <p>Except</p>
<list type="bulleted">
<item>9. Host-Based Authentication: "hostbased"</item>
</list>
- </p>
+ <p/>
</item>
<item><url href="https://tools.ietf.org/html/rfc4253">RFC 4253</url>, The Secure Shell (SSH) Transport Layer Protocol.
@@ -236,32 +236,32 @@
</item>
<item><url href="https://tools.ietf.org/html/rfc4254">RFC 4254</url>, The Secure Shell (SSH) Connection Protocol.
- <p>Except
+ <p>Except</p>
<list type="bulleted">
<item>6.3. X11 Forwarding</item>
<item>7. TCP/IP Port Forwarding</item>
</list>
- </p>
+ <p/>
</item>
<item><url href="https://tools.ietf.org/html/rfc4256">RFC 4256</url>, Generic Message Exchange Authentication for
the Secure Shell Protocol (SSH).
- <p>Except
+ <p>Except</p>
<list type="bulleted">
<item><c>num-prompts > 1</c></item>
<item>password changing</item>
<item>other identification methods than userid-password</item>
</list>
- </p>
+ <p/>
</item>
<item><url href="https://tools.ietf.org/html/rfc4419">RFC 4419</url>, Diffie-Hellman Group Exchange for
the Secure Shell (SSH) Transport Layer Protocol.
- <p></p>
+ <p/>
</item>
<item><url href="https://tools.ietf.org/html/rfc4716">RFC 4716</url>, The Secure Shell (SSH) Public Key File Format.
- <p></p>
+ <p/>
</item>
<item><url href="https://tools.ietf.org/html/rfc5647">RFC 5647</url>, AES Galois Counter Mode for
@@ -270,34 +270,35 @@
This is resolved by OpenSSH in the ciphers [email protected] and [email protected] which are implemented.
If the explicit ciphers and macs AEAD_AES_128_GCM or AEAD_AES_256_GCM are needed,
they could be enabled with the option preferred_algorithms.
+ </p>
<warning>
- If the client or the server is not Erlang/OTP, it is the users responsibility to check that
- other implementation has the same interpretation of AEAD_AES_*_GCM as the Erlang/OTP SSH before
- enabling them. The aes*[email protected] variants are always safe to use since they lack the
- ambiguity.
+ <p>
+ If the client or the server is not Erlang/OTP, it is the users responsibility to check that
+ other implementation has the same interpretation of AEAD_AES_*_GCM as the Erlang/OTP SSH before
+ enabling them. The aes*[email protected] variants are always safe to use since they lack the
+ ambiguity.
+ </p>
</warning>
- </p>
- <p>The second paragraph in section 5.1 is resolved as:
+ <p>The second paragraph in section 5.1 is resolved as:</p>
<list type="ordered">
<item>If the negotiated cipher is AEAD_AES_128_GCM, the mac algorithm is set to AEAD_AES_128_GCM.</item>
<item>If the negotiated cipher is AEAD_AES_256_GCM, the mac algorithm is set to AEAD_AES_256_GCM.</item>
<item>If the mac algorithm is AEAD_AES_128_GCM, the cipher is set to AEAD_AES_128_GCM.</item>
<item>If the mac algorithm is AEAD_AES_256_GCM, the cipher is set to AEAD_AES_256_GCM.</item>
</list>
- The first rule that matches when read in order from the top is applied
- </p>
+ <p>The first rule that matches when read in order from the top is applied</p>
</item>
<item><url href="https://tools.ietf.org/html/rfc5656">RFC 5656</url>, Elliptic Curve Algorithm Integration in
the Secure Shell Transport Layer.
- <p>Except
+ <p>Except</p>
<list type="bulleted">
<item>5. ECMQV Key Exchange</item>
<item>6.4. ECMQV Key Exchange and Verification Method Name</item>
<item>7.2. ECMQV Message Numbers</item>
<item>10.2. Recommended Curves</item>
</list>
- </p>
+ <p/>
</item>
<item><url href="https://tools.ietf.org/html/rfc6668">RFC 6668</url>, SHA-2 Data Integrity Verification for