X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Finterfaces%2Fcrypto%2Fclass_Cryptable.php;h=908002567ce3b2df45c99a355f60c10b31d86661;hb=202f8c1c1d46d1292918b7110547952446a53391;hp=9bb607587d9ee0b9e212714f0cab056ce885a3f4;hpb=c6d73b0e3246efc824cb98338d4be7ee5bc9f308;p=core.git

diff --git a/inc/classes/interfaces/crypto/class_Cryptable.php b/inc/classes/interfaces/crypto/class_Cryptable.php
index 9bb60758..90800256 100644
--- 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, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2013 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