More clean up.

diff --git a/ext/cybercash/cyberlib.php b/ext/cybercash/cyberlib.php
index 44d0a58b0d31ec1fcb7a9cad8966f18242b710ab..5625e92c3e803fba277bddb51899d38cccb11888 100644 (file)
--- a/ext/cybercash/cyberlib.php
+++ b/ext/cybercash/cyberlib.php
@@ -65,9 +65,9 @@
  function CCEncrypt($merchant_key,$pairs)
  {
    $session_key=sprintf("%s #%ld",date("D M j H:i:s Y"),getmypid());
-   $enc_msg=mck_encr($merchant_key,$session_key,$pairs);
-   $pairs=mck_base64_encode($enc_msg["outbuff"]);
-   $mac=mck_base64_encode($enc_msg["macbuff"]);
+   $enc_msg=cybercash_encr($merchant_key,$session_key,$pairs);
+   $pairs=cybercash_base64_encode($enc_msg["outbuff"]);
+   $mac=cybercash_base64_encode($enc_msg["macbuff"]);
    
    /* This adds the information needed to decrypt. */
    $encrypted_pairs="message=".urlencode($pairs)."&";
@@ -136,12 +136,12 @@
    
    /* This set of variables is encoded/encrypted. */
    $vars=CCGetVars($message);
-   $vars["message"]=mck_base64_decode($vars["message"]);
-   $vars["mac"]=mck_base64_decode($vars["mac"]);
+   $vars["message"]=cybercash_base64_decode($vars["message"]);
+   $vars["mac"]=cybercash_base64_decode($vars["mac"]);
    
    /* Check for errors with the request/decryption. */
    /* message is base64 and encrypted. */
-   $dec_msg=mck_decr($merchant_key,$vars["session-key"],
+   $dec_msg=cybercash_decr($merchant_key,$vars["session-key"],
                      $vars["message"]);
 
    if($dec_msg["errcode"])

diff --git a/ext/cybercash/test.php b/ext/cybercash/test.php
index efa034f8cf93123a520931842e24812102d4281d..2e5f3955ee4867c1994bfa811146f973424b0672 100644 (file)
--- a/ext/cybercash/test.php
+++ b/ext/cybercash/test.php
@@ -1,5 +1,5 @@
 <?php
- require "cyberlib.php3";
+ require "cyberlib.php";
 
  $merchant=""; /* Your merchant ID goes here. */
  $merchant_key=""; /* Your merchant key goes here. */