summaryrefslogtreecommitdiffstats
path: root/usr/local/pkg
diff options
context:
space:
mode:
authorErmal Luçi <eri@pfsense.org>2008-03-06 17:33:32 +0000
committerErmal Luçi <eri@pfsense.org>2008-03-06 17:33:32 +0000
commit267ab13f685d0435d7867705e60409a7081e06df (patch)
tree65eb5361c9a52686ce35f5081811f07d5041925e /usr/local/pkg
parentbc1fd2b7de2d3e17c0ce0cdf11b090d1c937343a (diff)
downloadpfsense-267ab13f685d0435d7867705e60409a7081e06df.zip
pfsense-267ab13f685d0435d7867705e60409a7081e06df.tar.gz
Switch to using generated certificates for server mode.
Diffstat (limited to 'usr/local/pkg')
-rw-r--r--usr/local/pkg/openvpn.xml73
-rw-r--r--usr/local/pkg/openvpn_cli.xml6
2 files changed, 14 insertions, 65 deletions
diff --git a/usr/local/pkg/openvpn.xml b/usr/local/pkg/openvpn.xml
index 665bcf1..8b0cbd3 100644
--- a/usr/local/pkg/openvpn.xml
+++ b/usr/local/pkg/openvpn.xml
@@ -157,68 +157,17 @@
<onchange>onAuthMethodChanged()</onchange>
</field>
<field>
- <fieldname>shared_key</fieldname>
- <fielddescr>Shared key</fielddescr>
- <description>Paste your shared key here.</description>
- <type>textarea</type>
- <encoding>base64</encoding>
- <rows>8</rows>
- <cols>40</cols>
- </field>
- <field>
- <fieldname>ca_cert</fieldname>
- <fielddescr>CA certificate</fielddescr>
- <description>Paste your CA certificate in X.509 format here.</description>
- <type>textarea</type>
- <encoding>base64</encoding>
- <rows>8</rows>
- <cols>40</cols>
- </field>
- <field>
- <fieldname>server_cert</fieldname>
- <fielddescr>Server certificate</fielddescr>
- <description>Paste your server certificate in X.509 format here.</description>
- <type>textarea</type>
- <encoding>base64</encoding>
- <rows>8</rows>
- <cols>40</cols>
- </field>
- <field>
- <fieldname>server_key</fieldname>
- <fielddescr>Server key</fielddescr>
- <description>Paste your server key in RSA format here.</description>
- <type>textarea</type>
- <encoding>base64</encoding>
- <rows>8</rows>
- <cols>40</cols>
- </field>
- <field>
- <fieldname>dh_params</fieldname>
- <fielddescr>DH parameters</fielddescr>
- <description>Paste your Diffie Hellman parameters in PEM format here.</description>
- <type>textarea</type>
- <encoding>base64</encoding>
- <rows>8</rows>
- <cols>40</cols>
- </field>
- <field>
- <fieldname>crl</fieldname>
- <fielddescr>CRL</fielddescr>
- <description>Paste your certificate revocation list (CRL) in PEM format here (optional).</description>
- <type>textarea</type>
- <encoding>base64</encoding>
- <rows>8</rows>
- <cols>40</cols>
- </field>
- <field>
- <fieldname>tls</fieldname>
- <fielddescr>TLS</fielddescr>
- <description>Paste your HMAC signature (TLS) here (optional).</description>
- <type>textarea</type>
- <encoding>base64</encoding>
- <rows>8</rows>
- <cols>40</cols>
- </field>
+ <fieldname>cipher</fieldname>
+ <fielddescr>Certificates to apply<fielddescr>
+ <description>Certificates generated from the certificate generation tab.</description>
+ <type>select</type>
+ <options>
+ <option>
+ <value>none</value>
+ <name>none</name>
+ </option>
+ </options>
+ </field>
<field>
<fieldname>dhcp_domainname</fieldname>
<fielddescr>DHCP-Opt.: DNS-Domainname</fielddescr>
diff --git a/usr/local/pkg/openvpn_cli.xml b/usr/local/pkg/openvpn_cli.xml
index d942403..129b86f 100644
--- a/usr/local/pkg/openvpn_cli.xml
+++ b/usr/local/pkg/openvpn_cli.xml
@@ -146,7 +146,7 @@
<cols>40</cols>
</field>
<field>
- <fieldname>ca_cert</fieldname>
+ <fieldname>ca.crt</fieldname>
<fielddescr>CA certificate</fielddescr>
<description>Paste the server's CA certificate in X.509 format here.</description>
<type>textarea</type>
@@ -155,7 +155,7 @@
<cols>40</cols>
</field>
<field>
- <fieldname>client_cert</fieldname>
+ <fieldname>client.crt</fieldname>
<fielddescr>Client certificate</fielddescr>
<description>Paste your client certificate in X.509 format here.</description>
<type>textarea</type>
@@ -164,7 +164,7 @@
<cols>40</cols>
</field>
<field>
- <fieldname>client_key</fieldname>
+ <fieldname>client.key</fieldname>
<fielddescr>Client key</fielddescr>
<description>Paste your client key in RSA format here.</description>
<type>textarea</type>
OpenPOWER on IntegriCloud