Merge pull request #46 from paymill/tschelabaumann-remove-ca-binding

Remove ca binding
paymill · May 23, 2017 · a5f930b · a5f930b
2 parents f51e163 + def1879
commit a5f930b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v4.0.4
+ * Remove CURLOPT_CAINFO - path to Certificate Authority (CA) bundle
+ * Remove paymill.crt
+ * Change user agent info to "Paymill-Magento/4.0.4"
+
 ## v4.0.3
  * fix SUPEE-6788 related admin controller issue
  * add role managment for paymill log and webhook managment
@@ -177,4 +182,4 @@
 
 ## v3.0.0
 
- * Rewrote form scratch
+ * Rewrote form scratch
diff --git a/lib/Services/Paymill/Apiclient/Curl.php b/lib/Services/Paymill/Apiclient/Curl.php
@@ -29,7 +29,7 @@ class Services_Paymill_Apiclient_Curl implements Services_Paymill_Apiclient_Inte
      */
     private $_apiUrl = '/';
 
-    const USER_AGENT = 'Paymill-php/0.0.2';
+    const USER_AGENT = 'Paymill-Magento/4.0.4';
 
     public static $lastRawResponse;
     public static $lastRawCurlOptions;
@@ -105,8 +105,7 @@ protected function _requestApi($action = '', $params = array(), $method = 'POST'
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_CUSTOMREQUEST => $method,
             CURLOPT_USERAGENT => self::USER_AGENT,
-            CURLOPT_SSL_VERIFYPEER => true,
-            CURLOPT_CAINFO => Mage::getBaseDir() . '/lib/Services/Paymill/Apiclient/paymill.crt',
+            CURLOPT_SSL_VERIFYPEER => true
         );
 
         if (Services_Paymill_Apiclient_Interface::HTTP_GET === $method) {
@@ -156,4 +155,4 @@ public function getResponse()
         return $this->_responseArray;
     }
 
-}
+}
diff --git a/lib/Services/Paymill/Apiclient/paymill.crt b/lib/Services/Paymill/Apiclient/paymill.crt