summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Klinger <evan@php.net>1999-12-07 02:26:51 +0000
committerEvan Klinger <evan@php.net>1999-12-07 02:26:51 +0000
commit091c58f734f472cf96c842fc4345f5dbd9fa32f5 (patch)
treed2d46cb306003757123ad7112d5d974dc326b0eb
parent2b843e37a062aa5e8cc3c342e2cfa197b3ffcb2d (diff)
downloadphp-git-091c58f734f472cf96c842fc4345f5dbd9fa32f5.tar.gz
More clean up.
-rw-r--r--ext/cybercash/cyberlib.php12
-rw-r--r--ext/cybercash/test.php2
2 files changed, 7 insertions, 7 deletions
diff --git a/ext/cybercash/cyberlib.php b/ext/cybercash/cyberlib.php
index 44d0a58b0d..5625e92c3e 100644
--- 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 efa034f8cf..2e5f3955ee 100644
--- 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. */