rugk / threema-msgapi-sdk-php

source/Threema/MsgApi/Tools/CryptTool.php

Doc Comments +15 added lines, -3 removed lines

@@ -142,6 +142,11 @@ 
 		return $this->makeBox($message, $nonce, $senderPrivateKey, $recipientPublicKey);
 	}
 
+	/**
+	 * @param string $senderPrivateKey
+	 * @param string $recipientPublicKey
+	 * @param string $nonce
+	 */
 	final public function encryptFileMessage(UploadFileResult $uploadFileResult,
 											 EncryptResult $encryptResult,
 											 UploadFileResult $thumbnailUploadFileResult = null,
@@ -190,9 +195,9 @@ 
 	 * make a secret box
 	 *
 	 * @param $data
-	 * @param $nonce
+	 * @param string $nonce
 	 * @param $key
-	 * @return mixed
+	 * @return string
 	 */
 	abstract protected function makeSecretBox($data, $nonce, $key);
 
@@ -334,6 +339,9 @@ 
 		return hash_hmac('sha256', $phoneNoClean, self::PHONENO_HMAC_KEY);
 	}
 
+	/**
+	 * @return string
+	 */
 	abstract protected function createRandom($size);
 
 	/**
@@ -376,7 +384,7 @@ 
 	abstract public function validate();
 
 	/**
-	 * @param $data
+	 * @param string $data
 	 * @return EncryptResult
 	 */
 	public final function encryptFile($data) {
@@ -405,6 +413,10 @@ 
 		return new EncryptResult($box, $key,  self::FILE_THUMBNAIL_NONCE, strlen($box));
 	}
 
+	/**
+	 * @param string $data
+	 * @param string $key
+	 */
 	public final function decryptFileThumbnail($data, $key) {
 		$result = $this->openSecretBox($data, self::FILE_THUMBNAIL_NONCE, $key);
 		return false === $result ? null : $result;

Indentation +2 added lines, -2 removed lines

@@ -524,8 +524,8 @@
 			# partly taken from https://github.com/symfony/polyfill-php56/blob/master/Php56.php#L45-L51
 			$ret = 0;
 			for ($i = 0; $i < strlen($str1); ++$i) {
-	            $ret |= ord($str1[$i]) ^ ord($str2[$i]);
-	        }
+				$ret |= ord($str1[$i]) ^ ord($str2[$i]);
+			}
 			return 0 === $result;
 		}
 	}