mechanisms.html: added G2, GSS-SPNEGO, SCRAM

cyrusimap · Nov 7, 2016 · 67c9f16 · 67c9f16
1 parent 6275da3
commit 67c9f16
Showing 1 changed file with 84 additions and 2 deletions.
diff --git a/doc/mechanisms.html b/doc/mechanisms.html
@@ -15,7 +15,7 @@ <h2>SASL Mechanism Properties/Features</h2>
 <TH ROWSPAN=2><br></TH>
 <TH ROWSPAN=2>MAX<br>SSF</TH>
 <TH COLSPAN=7>SECURITY PROPERTIES</TH>
-<TH COLSPAN=4>FEATURES</TH>
+<TH COLSPAN=6>FEATURES</TH>
 </TR>
 
 <TR>
@@ -30,6 +30,8 @@ <h2>SASL Mechanism Properties/Features</h2>
 <TH><CENTER>SRV FIRST</CENTER></TH>
 <TH><CENTER>SRV LAST</CENTER></TH>
 <TH><CENTER>PROXY</CENTER></TH>
+<TH><CENTER>BIND</CENTER></TH>
+<TH><CENTER>HTTP</CENTER></TH>
 </TR>
 
 <TR>
@@ -46,6 +48,8 @@ <h2>SASL Mechanism Properties/Features</h2>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER><br></CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
 </TR>
 
 <TR>
@@ -62,6 +66,8 @@ <h2>SASL Mechanism Properties/Features</h2>
 <TD><CENTER>X</CENTER></TD>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER><br></CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
 </TR>
 
 <TR>
@@ -78,6 +84,8 @@ <h2>SASL Mechanism Properties/Features</h2>
 <TD><CENTER>initial auth</CENTER></TD>
 <TD><CENTER>X</CENTER></TD>
 <TD><CENTER>X</CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
 </TR>
 
 <TR>
@@ -94,6 +102,26 @@ <h2>SASL Mechanism Properties/Features</h2>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER>X</CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+</TR>
+
+<TR>
+<TH>G2</TH>
+<TD><CENTER>56</CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
 </TR>
 
 <TR>
@@ -104,12 +132,32 @@ <h2>SASL Mechanism Properties/Features</h2>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER>X</CENTER></TD>
+<TD><CENTER>X<br></CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+</TR>
+
+<TR>
+<TH>GSS-SPNEGO</TH>
+<TD><CENTER>56</CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
 <TD><CENTER><br></CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER>X<br></CENTER></TD>
 <TD><CENTER>X</CENTER></TD>
 <TD><CENTER>X</CENTER></TD>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER>X</CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
 </TR>
 
 <TR>
@@ -126,6 +174,8 @@ <h2>SASL Mechanism Properties/Features</h2>
 <TD><CENTER>X</CENTER></TD>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER>X</CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
 </TR>
 
 <TR>
@@ -142,6 +192,8 @@ <h2>SASL Mechanism Properties/Features</h2>
 <TD><CENTER>X</CENTER></TD>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER><br></CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
 </TR>
 
 <TR>
@@ -158,6 +210,8 @@ <h2>SASL Mechanism Properties/Features</h2>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER><br></CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
 </TR>
 
 <TR>
@@ -174,10 +228,12 @@ <h2>SASL Mechanism Properties/Features</h2>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER>X</CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
 </TR>
 
 <TR>
-<TH>PASSDSS-3DES-1</TH>
+<TH>PASSDSS</TH>
 <TD><CENTER>112</CENTER></TD>
 <TD><CENTER>X</CENTER></TD>
 <TD><CENTER>X</CENTER></TD>
@@ -190,6 +246,8 @@ <h2>SASL Mechanism Properties/Features</h2>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER>X</CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
 </TR>
 
 <TR>
@@ -206,6 +264,8 @@ <h2>SASL Mechanism Properties/Features</h2>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER>X</CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
 </TR>
 <!--
 <TR>
@@ -240,6 +300,24 @@ <h2>SASL Mechanism Properties/Features</h2>
 <TD><CENTER><br></CENTER></TD>
 </TR>
 -->
+<TR>
+<TH>SCRAM</TH>
+<TD><CENTER>0</CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER></CENTER></TD>
+<TD><CENTER></CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER>X</CENTER></TD>
+<TD><CENTER>?</CENTER></TD>
+</TR>
+
 <TR>
 <TH>SRP</TH>
 <TD><CENTER>128</CENTER></TD>
@@ -254,6 +332,8 @@ <h2>SASL Mechanism Properties/Features</h2>
 <TD><CENTER><br></CENTER></TD>
 <TD><CENTER>X</CENTER></TD>
 <TD><CENTER>X</CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
+<TD><CENTER><br></CENTER></TD>
 </TR>
 
 </TABLE>
@@ -278,6 +358,8 @@ <h3>Understanding this table:</h3>
 <li><b>SRVFIRST</b> - The server must send first in this mechanism.</li>
 <li><b>SRVLAST</b> - This mechanism supports server-send-last configurations.</li>
 <li><b>PROXY</b> - This mechanism supports proxy authentication.</li>
+<li><b>BIND</b> - This mechanism supports channel binding.</li>
+<li><b>HTTP</b> - This mechanism has a profile for HTTP.</li>
 </ul>
 
 </BODY>