cvs: /php4/ext/cybercash cyberlib.php test.php

evan Mon Dec 6 21:27:22 1999 EDT Modified files: /php4/ext/cybercash cyberlib.php test.php Log: More clean up. Index: php4/ext/cybercash/cyberlib.php diff -u php4/ext/cybercash/cyberlib.php:1.2 php4/ext/cybercash/cyberlib.php:1.3 --- php4/ext/cybercash/cyberlib.php:1.2 Mon Dec 6 20:17:25 1999 +++ php4/ext/cybercash/cyberlib.php Mon Dec 6 21:26:51 1999 @@ -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"]) Index: php4/ext/cybercash/test.php diff -u php4/ext/cybercash/test.php:1.1 php4/ext/cybercash/test.php:1.2 --- php4/ext/cybercash/test.php:1.1 Mon Dec 6 19:56:25 1999 +++ php4/ext/cybercash/test.php Mon Dec 6 21:26:51 1999 @@ -1,5 +1,5 @@ <?php - require "cyberlib.php3"; + require "cyberlib.php"; $merchant=""; /* Your merchant ID goes here. */ $merchant_key=""; /* Your merchant key goes here. */