Updated copyright:

[core.git] / inc / classes / interfaces / crypto / class_Cryptable.php

diff --git a/inc/classes/interfaces/crypto/class_Cryptable.php b/inc/classes/interfaces/crypto/class_Cryptable.php
index fec45d924023881921b812c05c010557c3a6ffc2..5f30f5a83943adea3cbc0105bb156841ca06a757 100644 (file)
--- a/inc/classes/interfaces/crypto/class_Cryptable.php
+++ b/inc/classes/interfaces/crypto/class_Cryptable.php
@@ -2,11 +2,11 @@
 /**
  * A helper class for cryptographical things like hashing passwords and so on
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,17 +30,19 @@ interface Cryptable extends FrameworkInterface {
         *
         * @param       $str            Unhashed string
         * @param       $oldHash        A hash from previous hashed string
+        * @param       $withFixed      Whether to include a fixed salt (not recommended in p2p applications)
         * @return      $hashed         The hashed and salted string
         */
-       function hashString ($str, $oldHash = "");
+       function hashString ($str, $oldHash = '', $withFixed = TRUE);
 
        /**
         * Encrypt the string with fixed salt
         *
         * @param       $str            The unencrypted string
+        * @param       $key            Optional key, if none provided, a random key will be generated
         * @return      $encrypted      Encrypted string
         */
-       function encryptString ($str);
+       function encryptString ($str, $key = NULL);
 
        /**
         * Decrypt the string with fixed salt