From 6dd3f1583a3de06504fa3aa54f56dd7bcf60d496 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 10 Feb 2009 11:34:31 -0700
Subject: [PATCH] Don't have crypt lib check for secure connection

---
 framework/Crypt/lib/Horde/Crypt/pgp.php   | 24 ------------------------
 framework/Crypt/lib/Horde/Crypt/smime.php | 12 ------------
 2 files changed, 36 deletions(-)

diff --git a/framework/Crypt/lib/Horde/Crypt/pgp.php b/framework/Crypt/lib/Horde/Crypt/pgp.php
index 82b80f003..db144b141 100644
--- a/framework/Crypt/lib/Horde/Crypt/pgp.php
+++ b/framework/Crypt/lib/Horde/Crypt/pgp.php
@@ -169,12 +169,6 @@ class Horde_Crypt_pgp extends Horde_Crypt
     public function generateKey($realname, $email, $passphrase, $comment = '',
                                 $keylength = 1024)
     {
-        /* Check for secure connection. */
-        $secure_check = $this->requireSecureConnection();
-        if (is_a($secure_check, 'PEAR_Error')) {
-            return $secure_check;
-        }
-
         /* Create temp files to hold the generated keys. */
         $pub_file = $this->_createTempFile('horde-pgp');
         $secret_file = $this->_createTempFile('horde-pgp');
@@ -631,12 +625,6 @@ class Horde_Crypt_pgp extends Horde_Crypt
      */
     public function verifyPassphrase($public_key, $private_key, $passphrase)
     {
-        /* Check for secure connection. */
-        $secure_check = $this->requireSecureConnection();
-        if (is_a($secure_check, 'PEAR_Error')) {
-            return $secure_check;
-        }
-
         /* Encrypt a test message. */
         $result = $this->encrypt('Test', array('type' => 'message', 'pubkey' => $public_key));
         if (is_a($result, 'PEAR_Error')) {
@@ -1136,12 +1124,6 @@ class Horde_Crypt_pgp extends Horde_Crypt
      */
     protected function _encryptSignature($text, $params)
     {
-        /* Check for secure connection. */
-        $secure_check = $this->requireSecureConnection();
-        if (is_a($secure_check, 'PEAR_Error')) {
-            return $secure_check;
-        }
-
         /* Check for required parameters. */
         if (!isset($params['pubkey']) ||
             !isset($params['privkey']) ||
@@ -1215,12 +1197,6 @@ class Horde_Crypt_pgp extends Horde_Crypt
      */
     protected function _decryptMessage($text, $params)
     {
-        /* Check for secure connection. */
-        $secure_check = $this->requireSecureConnection();
-        if (is_a($secure_check, 'PEAR_Error')) {
-            return $secure_check;
-        }
-
         $good_sig_flag = false;
 
         /* Check for required parameters. */
diff --git a/framework/Crypt/lib/Horde/Crypt/smime.php b/framework/Crypt/lib/Horde/Crypt/smime.php
index 64528a749..44d4eca20 100644
--- a/framework/Crypt/lib/Horde/Crypt/smime.php
+++ b/framework/Crypt/lib/Horde/Crypt/smime.php
@@ -384,12 +384,6 @@ class Horde_Crypt_smime extends Horde_Crypt
      */
     protected function _encryptSignature($text, $params)
     {
-        /* Check for secure connection. */
-        $secure_check = $this->requireSecureConnection();
-        if (is_a($secure_check, 'PEAR_Error')) {
-            return $secure_check;
-        }
-
         /* Check for required parameters. */
         if (!isset($params['pubkey']) ||
             !isset($params['privkey']) ||
@@ -454,12 +448,6 @@ class Horde_Crypt_smime extends Horde_Crypt
      */
     protected function _decryptMessage($text, $params)
     {
-        /* Check for secure connection. */
-        $secure_check = $this->requireSecureConnection();
-        if (is_a($secure_check, 'PEAR_Error')) {
-            return $secure_check;
-        }
-
         /* Check for required parameters. */
         if (!isset($params['pubkey']) ||
             !isset($params['privkey']) ||
-- 
2.11.0