Merge pull request #219 from BoulangerV/OX6-104-Oxid6.4_Tests

OX6-104 : Fix encryption method handling for direct debit

Author: jvarelmann

extend/application/controllers/fcPayOnePaymentView.php

@@ -794,17 +794,26 @@ public function fcpoGetActiveThemePath() {
      */
     public function getHashELVWithChecktype() 
     {
-        $sHash = md5(
+        $oConfig = $this->_oFcpoHelper->fcpoGetConfig();
+        $sFCPOHashMethod = $oConfig->getConfigParam('sFCPOHashMethod');
+        $sKey = $this->getPortalKey();
+
+        $sData =
             $this->getSubAccountId() .
-                $this->getChecktype() .
-                $this->getEncoding() .
-                $this->getMerchantId() .
-                $this->_getOperationModeELV() .
-                $this->getPortalId() .
-                'bankaccountcheck' .
-                'JSON' .
-                $this->getPortalKey()
-        );
+            $this->getChecktype() .
+            $this->getEncoding() .
+            $this->getMerchantId() .
+            $this->_getOperationModeELV() .
+            $this->getPortalId() .
+            'bankaccountcheck' .
+            'JSON';
+
+        $sHashMD5 = md5($sData.$sKey);
+        $sHashSha2 = hash_hmac('sha384', $sData, $sKey);
+
+        $sHash = ($sFCPOHashMethod == 'sha2-384')
+            ? $sHashSha2 : $sHashMD5;
+
         return $sHash;
     }
 
@@ -815,16 +824,25 @@ public function getHashELVWithChecktype()
      */
     public function getHashELVWithoutChecktype() 
     {
-        $sHash = md5(
+        $oConfig = $this->_oFcpoHelper->fcpoGetConfig();
+        $sFCPOHashMethod = $oConfig->getConfigParam('sFCPOHashMethod');
+        $sKey = $this->getPortalKey();
+
+        $sData =
             $this->getSubAccountId() .
-                $this->getEncoding() .
-                $this->getMerchantId() .
-                $this->_getOperationModeELV() .
-                $this->getPortalId() .
-                'bankaccountcheck' .
-                'JSON' .
-                $this->getPortalKey()
-        );
+            $this->getEncoding() .
+            $this->getMerchantId() .
+            $this->_getOperationModeELV() .
+            $this->getPortalId() .
+            'bankaccountcheck' .
+            'JSON';
+
+        $sHashMD5 = md5($sData.$sKey);
+        $sHashSha2 = hash_hmac('sha384', $sData, $sKey);
+
+        $sHash = ($sFCPOHashMethod == 'sha2-384')
+            ? $sHashSha2 : $sHashMD5;
+
         return $sHash;
     }