Changeset 22 for trunk/lib/Utilities.inc.php

Timestamp:

Nov 23, 2005 9:29:33 PM (19 years ago)

Author:

scdev

Message:

More bugs and shifting things about.

File:

• trunk/lib/Utilities.inc.php (modified) (3 diffs)

trunk/lib/Utilities.inc.php

@@ -532 +532 @@
  * @access  public
  * @param   string  $val    The string to sign.
- * @param   string  $key    (Optional) A text key to use for computing the signature.
+ * @param   string  $seed_key   (Optional) A text key to use for computing the signature.
  * @return  string  The original value with a signature appended.
  */
-function addSignature($val, $key=null)
+function addSignature($val, $seed_key=null)
 {
     if ('' == $val) {
@@ -541 +541 @@
     }
     
-    if (!isset($key)) {
-        $key = App::getParam('signing_key');
-    }
-
-    return $val . '-' . substr(md5($val . $key), 0, 18);
+    if (!isset($seed_key)) {
+        $seed_key = App::getParam('signing_key');
+    }
+
+    return $val . '-' . substr(md5($val . $seed_key), 0, 18);
 }
 
@@ -566 +566 @@
  * @access  public
  * @param   string  $signed_val A value with appended signature.
- * @param   string  $key        (Optional) A text key to use for computing the signature.
+ * @param   string  $seed_key       (Optional) A text key to use for computing the signature.
  * @return  bool    True if the signature matches the var.
  */
-function verifySignature($signed_val, $key=null)
+function verifySignature($signed_val, $seed_key=null)
 {
     // Strip the value from the signed value.
-    $val = substr($signed_val, 0, strrpos($signed_val, '-'));
+    $val = removeSignature($signed_val);
     // If the signed value matches the original signed value we consider the value safe.
-    if ($signed_val == addSignature($val, $key)) {
+    if ($signed_val == addSignature($val, $seed_key)) {
         // Signature verified.
         return true;