From 9ee8a22efba97ae446cbdc474985349e83fd623f Mon Sep 17 00:00:00 2001 From: Mendel Mobach Date: Wed, 21 Sep 2011 14:32:36 +0000 Subject: [PATCH] Fix for https://bugs.cacert.org/view.php?id=940 --- pages/account/40.php | 2 +- pages/help/0.php | 19 ++++------- pages/help/2.php | 69 ++++----------------------------------- pages/help/3.php | 78 ++++---------------------------------------- pages/help/4.php | 35 ++++---------------- pages/help/5.php | 8 ++++- pages/help/6.php | 18 ++++------ pages/help/7.php | 16 ++++----- pages/help/8.php | 10 ++++-- pages/help/9.php | 51 +++-------------------------- pages/index/11.php | 2 +- 11 files changed, 62 insertions(+), 246 deletions(-) diff --git a/pages/account/40.php b/pages/account/40.php index 1b76f9c..8391903 100644 --- a/pages/account/40.php +++ b/pages/account/40.php @@ -23,7 +23,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s

", "");?>

-

-

+

-

diff --git a/pages/help/0.php b/pages/help/0.php index 83f97bd..7aa9d3b 100644 --- a/pages/help/0.php +++ b/pages/help/0.php @@ -15,15 +15,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> -

-

- - +

+', ''); +?> +

diff --git a/pages/help/2.php b/pages/help/2.php index 5dd86c4..a03a773 100644 --- a/pages/help/2.php +++ b/pages/help/2.php @@ -15,65 +15,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> - -
-

-

.

-

.... .)

-

- -

-

-

. ().

-

- -

-

-

-

- -

-

- -

-

- -

-

- -

-

- -

-

- -

-


-

-

-

-

-

- -

-

-

-

- http://www.counterpane.com/pki-risks.pdf

-

- http://www.webtrust.org/certauth.htm

-

- http://www.microsoft.com/technet/treeview/default.asp?url=/technet/security/bulletin/MS01-017.asp

-

- http://www.microsoft.com/technet/treeview/default.asp?url=/technet/security/news/rootcert.asp

-

('Snooping Bill' official gov site, UK)")?> - http://www.homeoffice.gov.uk/crimpol/crimreduc/regulation/index.html

-

(UK) - http://www.cnn.com/2000/TECH/computing/07/28/uk.surveillance.idg/

-

-

CAcert.org", "", "")?>

+

+', ''); +?> +

diff --git a/pages/help/3.php b/pages/help/3.php index b56823e..8cdeb08 100644 --- a/pages/help/3.php +++ b/pages/help/3.php @@ -15,74 +15,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> -

-

-
    -

  1. -
    - <?=_(" />
    - <?=_(" />
    2. -

  2. -
    - <?=_(" />
    3. -

  3. -
    - <?=_(" />
    4. -

  4. -
    - <?=_(" />
    5. -

  5. -
    - <?=_(" />
    -
    -
    -
    -

    ! @ # $ % ^ * ( ) ~ ? > < & / \

    -
    6. -

  6. -
    -
    -
    - <?=_(" />
    7. -

  7. -
    - <?=_(" />
    8. -

  8. -
    - <?=_(" />
    9. -

  9. -
    - <?=_(" />
    10. -
    11. -
-

- -

-

-
    -

  1. - - -----BEGIN CERTIFICATE----- - -----END CERTIFICATE-----

    - <?=_(" />
    2. -

  2. -
    - <?=_(" />
    3. -

  3. -
    - <?=_(" />
    4. -

  4. -
    - <?=_(" />
    5. -

  5. -
    - <?=_(" />
    6. -

  6. -
    - <?=_(" />
    7. -

  7. -
    - <?=_(" />
    8. -
-

-

.

+

+', ''); +?> +

diff --git a/pages/help/4.php b/pages/help/4.php index 428c934..248564c 100644 --- a/pages/help/4.php +++ b/pages/help/4.php @@ -15,31 +15,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> -

-

# openssl req -nodes -new -keyout private.key -out server.csr

-

-


- ...++++++
- ....++++++
-

-

-

AU
- NSW
- Sydney
- CAcert Inc.
-
- www.cacert.org
- []:no-returns@cacert.org

-

-

-

-----BEGIN CERTIFICATE REQUEST-----
- MIIBezCB5QIBADA8MRcwFQYDVQQDEw53d3cuY2FjZXJ0Lm9yZzEhMB8GCSqGSIb3
- DQEJARYSc3VwcG9ydEBjYWNlcnQub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
- iQKBgQDQd1+ut4TJLWZf5A9r3D17Kob+CNwz/jfCOYrH0P6q1uw4jfSyrWUeSaVc
- 59Xjpov8gRctlAuWM9KavkLSF6vcNdDEbvUYnL/+ixdmVE9tlXuSFEGz0GAF5faf
- QZe30wk+2hnC6P+rwclypOhkTXtWgvSHPZg9Cos8xqDyv589QwIDAQABoAAwDQYJ
- KoZIhvcNAQEEBQADgYEAJruzBZr4inqaeidn1m2q47lXZUWjgsrp3k3bFJ/HCb3S
- 2SgVqHFrOisItrr7H0Dw2EcPhIrRokRdjIAwwlxG9v21eFaksZUiaP5Yrmf89Njk
- HV+MZXxbC71NIKrnZsDhHibZslICh/XjdPP7zfKMlHuaaz1oVAmu9BlsS6ZXkVA=
------END CERTIFICATE REQUEST-----

-

+

+', ''); +?> +

diff --git a/pages/help/5.php b/pages/help/5.php index d59e3dc..604febc 100644 --- a/pages/help/5.php +++ b/pages/help/5.php @@ -15,4 +15,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> - +

+', ''); +?> +

diff --git a/pages/help/6.php b/pages/help/6.php index adbd656..5308e93 100644 --- a/pages/help/6.php +++ b/pages/help/6.php @@ -15,14 +15,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> -

- -

- -

- -

- -

- -

+

+', ''); +?> +

diff --git a/pages/help/7.php b/pages/help/7.php index 842a4cf..73e18da 100644 --- a/pages/help/7.php +++ b/pages/help/7.php @@ -15,12 +15,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> -

-

-

-

-

-

-

-

-

+

+', ''); +?> +

diff --git a/pages/help/8.php b/pages/help/8.php index 8ee4974..41c4959 100644 --- a/pages/help/8.php +++ b/pages/help/8.php @@ -15,6 +15,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> -

-

- +

+', ''); +?> +

diff --git a/pages/help/9.php b/pages/help/9.php index 8a538fe..d6fdc39 100644 --- a/pages/help/9.php +++ b/pages/help/9.php @@ -15,53 +15,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> +

', ''); ?> -

- -

- -

- -


-<VirtualHost 127.0.0.1:443>
-SSLEngine on
-SSLVerifyClient require
-SSLVerifyDepth 2
-SSLCACertificateFile /etc/ssl/cacert.crt
-SSLCertificateFile /etc/ssl/certs/cacert.crt
-SSLCertificateKeyFile /etc/ssl/private/cacert.pem
-SSLOptions +StdEnvVars
-
-ServerName secure.cacert.org
-DocumentRoot /www
-</VirtualHost>

-

- -

- -

- -


-if($_SERVER['HTTP_HOST'] == "secure.cacert.org")
-{
-$query = "select * from `users` where `email`='$_SERVER[SSL_CLIENT_S_DN_Email]'";
-$res = mysql_query($query);
-if(mysql_num_rows($res) > 0)
-{
-$_SESSION['profile']['loggedin'] = 1;
-header("location: https://secure.cacert.org/account.php");
-exit;
-}
-}

diff --git a/pages/index/11.php b/pages/index/11.php index 1b76f9c..8391903 100644 --- a/pages/index/11.php +++ b/pages/index/11.php @@ -23,7 +23,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s

", "");?>

-

-

+

-