Changes

no edit summary
Line 73: Line 73:  
     <tr>
 
     <tr>
 
       <td>Enable OpenVPN config from file</td>
 
       <td>Enable OpenVPN config from file</td>
       <td>off {{!}} <span style="color:#8B4513;">on</span>; default: <b>off</b></td>
+
       <td>off {{!}} <span style="color:#ffce33 ;">on</span>; default: <b>off</b></td>
 
       <td>Enables or disables custom OpenVPN config from file.</td>
 
       <td>Enables or disables custom OpenVPN config from file.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
       <td><span style="color:#8B4513;">OpenVPN configuration file</span></td>
+
       <td><span style="color:#ffce33 ;">OpenVPN configuration file</span></td>
 
       <td>-(interactive button)</td>
 
       <td>-(interactive button)</td>
 
       <td>Upload OpenVPN configuration. Warning! This will overwrite your current configuration.</td>
 
       <td>Upload OpenVPN configuration. Warning! This will overwrite your current configuration.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
       <td><span style="color:#8B4513;">Upload OpenVPN authentications files</span></td>
+
       <td><span style="color:#ffce33 ;">Upload OpenVPN authentications files</span></td>
 
       <td>off {{!}} on; default: <b>off</b></td>
 
       <td>off {{!}} on; default: <b>off</b></td>
 
       <td>Upload OpenVPN authentication files, which will be automatically included in configuration.</td>
 
       <td>Upload OpenVPN authentication files, which will be automatically included in configuration.</td>
Line 145: Line 145:  
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
     <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>: TLS cipher</td>
+
     <td><span style="color: red;">TLS:</span> TLS cipher</td>
         <td>All {{!}} <span style="color: lime;">DHE+RSA</span> {{!}} <span style="color: lime;">Custom</span>; default: <b>All</b></td>
+
         <td>All {{!}} DHE+RSA {{!}} Custom; default: <b>All</b></td>
 
         <td>Packet encryption algorithm cipher.</td>
 
         <td>Packet encryption algorithm cipher.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
     <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>:<span style="color: lime;"> Allowed TLS ciphers</span></td>
+
     <td><span style="color: red;">TLS:</span> Allowed TLS ciphers</td>
         <td>Custom {{!}} TLS-DHE-RSA-WITH-AES-256-GCM-SHA384 {{!}} TLS-DHE-RSA-WITH-AES-256-CBC-SHA {{!}} TLS-DHE-RSA-WITH-AES-256-CBC-SHA256 {{!}} TLS-DHE-RSA-WITH-CAMELLIA-256-CBC-SHA {{!}} TLS-DHE-RSA-WITH-3DES-EDE-CBC-SHA {{!}} TLS-DHE-RSA-WITH-AES-128-GCM-SHA256 {{!}} TLS-DHE-RSA-WITH-AES-128-CBC-SHA {{!}} TLS-DHE-RSA-WITH-AES-128-CBC-SHA256 {{!}} TLS-DHE-RSA-WITH-SEED-CBC-SHA {{!}} TLS-DHE-RSA-WITH-CAMELLIA-128-CBC-SHA {{!}} TLS-DHE-RSA-WITH-DES-CBC-SHA; default: <b>All</b></td>
+
         <td>All {{!}} DHE+RSA {{!}} Custom; default: <b>All</b></td>
         <td>Specific cyphers to use. Only 6 can be selected at a time.</td>
+
         <td>A list of TLS ciphers accepted by this connection.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
Line 205: Line 205:  
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
         <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password:</span>Use PKCS #12 format</td>
+
         <td><span style="color: red;">TLS</span>/<span style="color: #0054a6;">Password:</span>Use PKCS #12 format</td>
 
         <td>off {{!}} on; default: <b>off</b></td>
 
         <td>off {{!}} on; default: <b>off</b></td>
 
         <td>Turn PKCS #12 format on or off.</td>
 
         <td>Turn PKCS #12 format on or off.</td>
Line 220: Line 220:  
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
     <td>Authentication algorithm</td>
+
     <td><span style="color: red;">TLS</span>/<span style="color: #0054a6;">Password:</span> HMAC authentication algorithm</td>
         <td>none {{!}} MD5 {{!}} SHA1 {{!}} SHA256 {{!}} SHA384 {{!}} SHA512; default: <b>SHA1</b></td>
+
         <td>none {{!}} SHA1 {{!}} SHA256 {{!}} SHA384 {{!}} SHA512; default: <b>SHA1</b></td>
 
         <td>HMAC authentication algorithm type.</td>
 
         <td>HMAC authentication algorithm type.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
       <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password:</span>Additional HMAC authentication</td>
+
       <td><span style="color: red;">TLS</span>/<span style="color: #0054a6;">Password:</span>Additional HMAC authentication</td>
 
       <td>off {{!}} on; default: <b>off</b></td>
 
       <td>off {{!}} on; default: <b>off</b></td>
 
       <td>An additional layer of HMAC authentication on top of the TLS control channel to protect against DoS attacks.</td>
 
       <td>An additional layer of HMAC authentication on top of the TLS control channel to protect against DoS attacks.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
       <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password:</span> HMAC authentication key</td>
+
       <td><span style="color: red;">TLS</span>/<span style="color: #0054a6;">Password:</span> HMAC authentication key</td>
 
       <td>.key file; default: <b>none</b></td>
 
       <td>.key file; default: <b>none</b></td>
 
       <td>Uploads an HMAC authentication key file.</td>
 
       <td>Uploads an HMAC authentication key file.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
       <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password:</span> HMAC key direction</td>
+
       <td><span style="color: red;">TLS</span>/<span style="color: #0054a6;">Password:</span> HMAC key direction</td>
 
       <td>0 {{!}} 1 {{!}} none; default: <b>1</b></td>
 
       <td>0 {{!}} 1 {{!}} none; default: <b>1</b></td>
 
       <td>The value of the key direction parameter should be complementary on either side (client and server) of the connection. If one side uses <i>0</i>, the other side should use <i>1</i>, or both sides should omit the parameter altogether.</td>
 
       <td>The value of the key direction parameter should be complementary on either side (client and server) of the connection. If one side uses <i>0</i>, the other side should use <i>1</i>, or both sides should omit the parameter altogether.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
       <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password:</span> Certificate authority</td>
+
       <td><span style="color: red;">TLS</span>/<span style="color: #0054a6;">Password:</span> Certificate authority</td>
 
       <td>.ca file; default: <b>none</b></td>
 
       <td>.ca file; default: <b>none</b></td>
 
       <td>Certificate authority is an entity that issues digital certificates. A digital certificate certifies the ownership of a public key by the named subject of the certificate.</td>
 
       <td>Certificate authority is an entity that issues digital certificates. A digital certificate certifies the ownership of a public key by the named subject of the certificate.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
     <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>: Client certificate</td>
+
     <td><span style="color: red;">TLS:</span> Client certificate</td>
 
         <td>.crt file; default: <b>none</b></td>
 
         <td>.crt file; default: <b>none</b></td>
 
         <td>Client certificate is a type of digital certificate that is used by client systems to make authenticated requests to a remote server. Client certificates play a key role in many mutual authentication designs, providing strong assurances of a requester's identity.</td>
 
         <td>Client certificate is a type of digital certificate that is used by client systems to make authenticated requests to a remote server. Client certificates play a key role in many mutual authentication designs, providing strong assurances of a requester's identity.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
     <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>:Client key</td>
+
     <td><span style="color: red;">TLS:</span> Client key</td>
 
         <td>.key file; default: <b>none</b></td>
 
         <td>.key file; default: <b>none</b></td>
 
         <td>Authenticates the client to the server and establishes precisely who they are.</td>
 
         <td>Authenticates the client to the server and establishes precisely who they are.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
     <td><span style="color: red;">TLS</span>/<span style="color: SaddleBrown;">Config File</span>: Private key decryption password (optional)</td>
+
     <td><span style="color: red;">TLS:</span> Private key decryption password (optional)</td>
 
         <td>string; default: <b>none</b></td>
 
         <td>string; default: <b>none</b></td>
 
         <td>A password used to decrypt the server's private key. Use only if server's .key file is encrypted with a password.</td>
 
         <td>A password used to decrypt the server's private key. Use only if server's .key file is encrypted with a password.</td>
Line 271: Line 271:  
         <ul>
 
         <ul>
 
             <li>Red for <span style="color: red;">Authentication: TLS</span></li>
 
             <li>Red for <span style="color: red;">Authentication: TLS</span></li>
            <li>Olive for <span style="color: olive;">Authentication: TLS/Password</span></li>
   
             <li>Purple for <span style="color: purple;">Authentication: Static key</span></li>
 
             <li>Purple for <span style="color: purple;">Authentication: Static key</span></li>
 
             <li>Blue for <span style="color: #0054a6;">Authentication: Password</span></li>
 
             <li>Blue for <span style="color: #0054a6;">Authentication: Password</span></li>
            <li>Brown for <span style="color: #8B4513;">OpenVPN config from file</span></li>
   
         </ul>
 
         </ul>
 
     </li>
 
     </li>
Line 301: Line 299:  
       <td>Turns the OpenVPN instance on or off.</td>
 
       <td>Turns the OpenVPN instance on or off.</td>
 
     </tr>
 
     </tr>
<tr>
+
    <tr>
 
       <td>Enable OpenVPN config from file</td>
 
       <td>Enable OpenVPN config from file</td>
       <td>off {{!}} <span style="color:#8B4513;">on</span>; default: <b>off</b></td>
+
       <td>off {{!}} on; default: <b>off</b></td>
 
       <td>Enables or disables custom OpenVPN config from file.</td>
 
       <td>Enables or disables custom OpenVPN config from file.</td>
    </tr>
  −
    <tr>
  −
      <td><span style="color:#8B4513;">OpenVPN configuration file</span></td>
  −
      <td>-(interactive button)</td>
  −
      <td>Upload OpenVPN configuration. Warning! This will overwrite your current configuration.</td>
  −
    </tr>
  −
    <tr>
  −
      <td><span style="color:#8B4513;">Upload OpenVPN authentications files</span></td>
  −
      <td>off {{!}} on; default: <b>off</b></td>
  −
      <td>Upload OpenVPN authentication files, which will be automatically included in configuration.</td>
   
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
 
       <td>TUN/TAP</td>
 
       <td>TUN/TAP</td>
       <td>TUN (tunnel) {{!}} <span style="color:brown ;">TAP (bridged)</span>; default: <b>TUN (tunnel)</b></td>
+
       <td>TUN (tunnel) {{!}} TAP (bridged); default: <b>TUN (tunnel)</b></td>
 
       <td>Virtual network device type.
 
       <td>Virtual network device type.
 
             <ul>
 
             <ul>
Line 325: Line 313:  
             </ul>
 
             </ul>
 
         </td>
 
         </td>
    </tr>
  −
    <tr>
  −
      <td><span style="color:brown ;">Bridge</span></td>
  −
      <td>Bridge interface for TAP; default: br-lan</td>
  −
      <td>Assign a TAP interface to a bridge.</td>
   
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
Line 351: Line 334:  
       <td>Turns LZO data compression on or off.</td>
 
       <td>Turns LZO data compression on or off.</td>
 
     </tr>
 
     </tr>
        <tr>
+
    <tr>
 +
      <td>Encryption</td>
 +
      <td>DES-CBC 64 {{!}} RC2-CBC 128 {{!}} DES-EDE-CBC 128 {{!}} DES-EDE3-CBC 192 {{!}} DESX-CBC 192 {{!}} BF-CBC 128 {{!}} RC2-40-CBC 40 {{!}} CAST5-CBC 128 {{!}} RC2-64CBC 64 {{!}} AES-128-CBC 128 {{!}} AES-128-CFB 128 {{!}} AES-128-CFB1 128 {{!}} AES-128-CFB8 128 {{!}} AES-128-OFB 128 {{!}} AES-128-GCM 128 {{!}} AES-192-CBC 192 {{!}} AES-192-CFB 192 {{!}} AES-192-CFB1 192 {{!}} AES-192-CFB8 192 {{!}} AES-192-OFB 192 {{!}} AES-192-GCM 192 {{!}} AES-256-CBC 256 {{!}} AES-256-CFB 256 {{!}} AES-256-CFB1 256 {{!}} AES-256-CFB8 256 {{!}} AES-256-OFB 256 {{!}} AES-256-GCM 256 {{!}} none; default: <b>AES-256-CBC 256</b></td>
 +
      <td>Algorithm used for packet encryption.</td>
 +
    </tr>
 +
    <tr>
 
     <td>Authentication</td>
 
     <td>Authentication</td>
 
         <td>TLS {{!}} Static Key {{!}} TLS/Password; default: <b>TLS</b></td>
 
         <td>TLS {{!}} Static Key {{!}} TLS/Password; default: <b>TLS</b></td>
Line 367: Line 355:  
             </ul>
 
             </ul>
 
         </td>
 
         </td>
    </tr>
  −
    <tr>
  −
      <td>Encryption</td>
  −
      <td>DES-CBC 64 {{!}} RC2-CBC 128 {{!}} DES-EDE-CBC 128 {{!}} DES-EDE3-CBC 192 {{!}} DESX-CBC 192 {{!}} BF-CBC 128 {{!}} RC2-40-CBC 40 {{!}} CAST5-CBC 128 {{!}} RC2-64CBC 64 {{!}} AES-128-CBC 128 {{!}} AES-128-CFB 128 {{!}} AES-128-CFB1 128 {{!}} AES-128-CFB8 128 {{!}} AES-128-OFB 128 {{!}} AES-128-GCM 128 {{!}} AES-192-CBC 192 {{!}} AES-192-CFB 192 {{!}} AES-192-CFB1 192 {{!}} AES-192-CFB8 192 {{!}} AES-192-OFB 192 {{!}} AES-192-GCM 192 {{!}} AES-256-CBC 256 {{!}} AES-256-CFB 256 {{!}} AES-256-CFB1 256 {{!}} AES-256-CFB8 256 {{!}} AES-256-OFB 256 {{!}} AES-256-GCM 256 {{!}} none; default: <b>AES-256-CBC 256</b></td>
  −
      <td>Algorithm used for packet encryption.</td>
  −
    </tr>
  −
    <tr>
  −
    <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>: TLS cipher</td>
  −
        <td>All {{!}} <span style="color: lime;">DHE+RSA</span> {{!}} <span style="color: lime;">Custom</span>; default: <b>All</b></td>
  −
        <td>Packet encryption algorithm cipher.</td>
  −
    </tr>
  −
    <tr>
  −
    <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>:<span style="color: lime;"> Allowed TLS ciphers</span></td>
  −
        <td>Custom {{!}} TLS-DHE-RSA-WITH-AES-256-GCM-SHA384 {{!}} TLS-DHE-RSA-WITH-AES-256-CBC-SHA {{!}} TLS-DHE-RSA-WITH-AES-256-CBC-SHA256 {{!}} TLS-DHE-RSA-WITH-CAMELLIA-256-CBC-SHA {{!}} TLS-DHE-RSA-WITH-3DES-EDE-CBC-SHA {{!}} TLS-DHE-RSA-WITH-AES-128-GCM-SHA256 {{!}} TLS-DHE-RSA-WITH-AES-128-CBC-SHA {{!}} TLS-DHE-RSA-WITH-AES-128-CBC-SHA256 {{!}} TLS-DHE-RSA-WITH-SEED-CBC-SHA {{!}} TLS-DHE-RSA-WITH-CAMELLIA-128-CBC-SHA {{!}} TLS-DHE-RSA-WITH-DES-CBC-SHA; default: <b>All</b></td>
  −
        <td>Specific cyphers to use. Only 6 can be selected at a time.</td>
   
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
Line 409: Line 382:  
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
      <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password</span>: Client to client</td>
+
    <td><span style="color: red;">TLS</span>/<span style="color: #0054a6;">TLS/Password:</span> TLS cipher</td>
 +
        <td>All {{!}} DHE+RSA {{!}} Custom; default: <b>All</b></td>
 +
        <td>Packet encryption algorithm cipher.</td>
 +
    </tr>
 +
    <tr>
 +
    <td><span style="color: red;">TLS/Password:</span> Allowed TLS ciphers</td>
 +
        <td>All {{!}} DHE+RSA {{!}} Custom; default: <b>All</b></td>
 +
        <td>A list of TLS ciphers accepted by this connection.</td>
 +
    </tr>
 +
    <tr>
 +
      <td><span style="color: red;">TLS</span>/<span style="color: #0054a6;">TLS/Password:</span> Client to client</td>
 
       <td>off {{!}} on; default: <b>off</b></td>
 
       <td>off {{!}} on; default: <b>off</b></td>
 
       <td>Allows OpenVPN clients to communicate with each other on the VPN network.</td>
 
       <td>Allows OpenVPN clients to communicate with each other on the VPN network.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
     <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password</span>: Keep alive</td>
+
     <td><span style="color: red;">TLS</span>/<span style="color: #0054a6;">TLS/Password:</span> Keep alive</td>
 
         <td>two integers separated by a space; default: <b>none</b></td>
 
         <td>two integers separated by a space; default: <b>none</b></td>
 
         <td>Defines two time intervals: the first is used to periodically send ICMP requests to the OpenVPN server, the second one defines a time window, which is used to restart the OpenVPN service if no ICMP response is received during the specified time slice. When this value is specifiied on the OpenVPN server, it overrides the 'keep alive' values set on client instances.<br><b>Example</b>: <i>10 120</i></td>
 
         <td>Defines two time intervals: the first is used to periodically send ICMP requests to the OpenVPN server, the second one defines a time window, which is used to restart the OpenVPN service if no ICMP response is received during the specified time slice. When this value is specifiied on the OpenVPN server, it overrides the 'keep alive' values set on client instances.<br><b>Example</b>: <i>10 120</i></td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
     <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password</span>: Virtual network IP address</td>
+
     <td><span style="color: red;">TLS</span>/<span style="color: #0054a6;">TLS/Password:</span> Virtual network IP address</td>
 
         <td>ip4; default: <b>none</b></td>
 
         <td>ip4; default: <b>none</b></td>
 
         <td>IPv4 address of the OpenVPN network.</td>
 
         <td>IPv4 address of the OpenVPN network.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
     <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password</span>: Virtual network netmask</td>
+
     <td><span style="color: red;">TLS</span>/<span style="color: #0054a6;">TLS/Password:</span> Virtual network netmask</td>
 
         <td>netmask; default: <b>none</b></td>
 
         <td>netmask; default: <b>none</b></td>
 
         <td>Subnet mask of the OpenVPN network.</td>
 
         <td>Subnet mask of the OpenVPN network.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
     <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password</span>: Assign IP start</td>
+
     <td><span style="color: red;">TLS</span>/<span style="color: #0054a6;">TLS/Password:</span> <span style="color: #20C0D7;"><b>Virtual network IPv6 address</b></span></td>
        <td>IP; default: <b>none</b></td>
  −
        <td>Assign IP addresses starting from a pool of subnets to be dynamically allocated to connecting clients.</td>
  −
    </tr>
  −
    <tr>
  −
    <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password</span>: Assign IP end</td>
  −
        <td>IP; default: <b>none</b></td>
  −
        <td>Assign IP addresses ending at a pool of subnets to be dynamically allocated to connecting clients.</td>
  −
    </tr>
  −
    <tr>
  −
    <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password</span>: <span style="color: green;"><b>Virtual network IPv6 address</b></span></td>
   
         <td>ip6; default: <b>none</b></td>
 
         <td>ip6; default: <b>none</b></td>
 
         <td>IPv6 address of the OpenVPN network. This field becomes visible when protocol is set to UDP6 or TCP6</td>
 
         <td>IPv6 address of the OpenVPN network. This field becomes visible when protocol is set to UDP6 or TCP6</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
       <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password</span>: Push option</td>
+
       <td><span style="color: red;">TLS</span>/<span style="color: #0054a6;">TLS/Password:</span> Push option</td>
 
       <td>OpenVPN options; default: <b>none</b></td>
 
       <td>OpenVPN options; default: <b>none</b></td>
 
       <td>Push options are a way to "push" routes and other additional OpenVPN options to connecting clients.</td>
 
       <td>Push options are a way to "push" routes and other additional OpenVPN options to connecting clients.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
     <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password</span>: Allow duplicate certificates</td>
+
     <td><span style="color: red;">TLS</span>/<span style="color: #0054a6;">TLS/Password:</span> Allow duplicate certificates</td>
 
         <td>off {{!}} on; default: <b>off</b></td>
 
         <td>off {{!}} on; default: <b>off</b></td>
 
         <td>When enabled allows multiple clients to connect using the same certificates.</td>
 
         <td>When enabled allows multiple clients to connect using the same certificates.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
       <td><span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password</span>: Usernames & Passwords</td>
+
       <td><span style="color: #0054a6;">TLS/Password:</span> User name</td>
       <td>-interactive button; default: <b>none</b></td>
+
      <td>string; default: <b>none</b></td>
       <td>File containing usernames and passwords against which the server can authenticate clients. Each username and password pair should be placed on a single line and separated by a space..</td>
+
      <td>Username used for authentication to this OpenVPN server.</td>
 +
    </tr>
 +
    <tr>
 +
      <td><span style="color: #0054a6;">TLS/Password:</span> Password</td>
 +
       <td>string; default: <b>none</b></td>
 +
       <td>Password used for authentication to this OpenVPN server.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
Line 464: Line 442:  
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
       <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password</span>: Certificate authority</td>
+
       <td><span style="color: red;">TLS</span>/<span style="color: #0054a6;">TLS/Password:</span> Certificate authority</td>
 
       <td>.ca file; default: <b>none</b></td>
 
       <td>.ca file; default: <b>none</b></td>
 
       <td>Certificate authority is an entity that issues digital certificates. A digital certificate certifies the ownership of a public key by the named subject of the certificate.</td>
 
       <td>Certificate authority is an entity that issues digital certificates. A digital certificate certifies the ownership of a public key by the named subject of the certificate.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
     <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password</span>: Server certificate</td>
+
     <td><span style="color: red;">TLS</span>/<span style="color: #0054a6;">TLS/Password:</span> Server certificate</td>
 
         <td>.crt file; default: <b>none</b></td>
 
         <td>.crt file; default: <b>none</b></td>
 
         <td>A type of digital certificate that is used to identify the OpenVPN server.</td>
 
         <td>A type of digital certificate that is used to identify the OpenVPN server.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
     <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password</span>: Server key</td>
+
     <td><span style="color: red;">TLS</span>/<span style="color: #0054a6;">TLS/Password:</span> Server key</td>
 
         <td>.key file; default: <b>none</b></td>
 
         <td>.key file; default: <b>none</b></td>
 
         <td>Authenticates clients to the server.</td>
 
         <td>Authenticates clients to the server.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
     <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password</span>: Diffie Hellman parameters</td>
+
     <td><span style="color: red;">TLS</span>/<span style="color: #0054a6;">TLS/Password:</span> Diffie Hellman parameters</td>
 
         <td>.pem file; default: <b>none</b></td>
 
         <td>.pem file; default: <b>none</b></td>
 
         <td>DH parameters define how OpenSSL performs the Diffie-Hellman (DH) key-exchange.</td>
 
         <td>DH parameters define how OpenSSL performs the Diffie-Hellman (DH) key-exchange.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
     <td><span style="color: red;">TLS</span>/<span style="color: olive;">TLS/Password</span>/<span style="color: #0054a6;">Password</span>: CRL file (optional)</td>
+
     <td><span style="color: red;">TLS</span>/<span style="color: #0054a6;">TLS/Password:</span> CRL file (optional)</td>
 
         <td>.pem file {{!}} .crl file; Default: <b>none</b></td>
 
         <td>.pem file {{!}} .crl file; Default: <b>none</b></td>
 
         <td>A certificate revocation list (CRL) file is a list of certificates that have been revoked by the certificate authority (CA). It indicates which certificates are no longer acccepted by the CA and therefore cannot be authenticated to the server.</td>
 
         <td>A certificate revocation list (CRL) file is a list of certificates that have been revoked by the certificate authority (CA). It indicates which certificates are no longer acccepted by the CA and therefore cannot be authenticated to the server.</td>
Line 495: Line 473:  
         <ul>
 
         <ul>
 
             <li>Red for <span style="color: red;">Authentication: TLS</span></li>
 
             <li>Red for <span style="color: red;">Authentication: TLS</span></li>
            <li>Olive for <span style="color: olive;">Authentication: TLS/Passwords</span></li>
   
             <li>Purple for <span style="color: purple;">Authentication: Static key</span></li>
 
             <li>Purple for <span style="color: purple;">Authentication: Static key</span></li>
             <li>Blue for <span style="color: #0054a6;">Authentication: Password</span></li>
+
             <li>Blue for <span style="color: #0054a6;">Authentication: TLS/Password</span></li>
            <li>Brown for <span style="color: #8B4513;">OpenVPN config from file</span></li>
   
         </ul>
 
         </ul>
 
     </li>
 
     </li>