rugk / threema-msgapi-sdk-php

source/Threema/MsgApi/Tools/CryptTool.php

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;
 		}
 	}

Spacing +19 added lines, -19 removed lines

@@ -42,8 +42,8 @@ 
 	 * @return CryptTool
 	 */
 	public static function getInstance() {
-		if(null === self::$instance) {
-			foreach(array(
+		if (null === self::$instance) {
+			foreach (array(
 				function() {
 					return self::createInstance(self::TYPE_SODIUM);
 				},
@@ -51,7 +51,7 @@ 
 					return self::createInstance(self::TYPE_SALT);
 				}) as $instanceGenerator) {
 				$i = $instanceGenerator->__invoke();
-				if(null !== $i) {
+				if (null !== $i) {
 					self::$instance = $i;
 					break;
 				}
@@ -66,18 +66,18 @@ 
 	 * @return null|CryptTool null on unknown type
 	 */
 	public static function createInstance($type) {
-		switch($type) {
+		switch ($type) {
 			case self::TYPE_SODIUM:
 				$instance = new CryptToolSodium();
-				if(false === $instance->isSupported()) {
+				if (false === $instance->isSupported()) {
 					//try to instance old version of sodium wrapper
 					/** @noinspection PhpDeprecationInspection */
 					$instance = new CryptToolSodiumDep();
 				}
-				return $instance->isSupported() ? $instance :null;
+				return $instance->isSupported() ? $instance : null;
 			case self::TYPE_SALT:
 				$instance = new CryptToolSalt();
-				return $instance->isSupported() ? $instance :null;
+				return $instance->isSupported() ? $instance : null;
 			default:
 				return null;
 		}
@@ -104,7 +104,7 @@ 
 	 */
 	final public function encryptMessageText($text, $senderPrivateKey, $recipientPublicKey, $nonce) {
 		/* prepend type byte (0x01) to message data */
-		$textBytes = "\x01" . $text;
+		$textBytes = "\x01".$text;
 
 		/* determine random amount of PKCS7 padding */
 		$padbytes = $this->generatePadBytes();
@@ -129,7 +129,7 @@ 
 			$senderPrivateKey,
 			$recipientPublicKey,
 			$nonce) {
-		$message = "\x02" . $this->hex2bin($uploadFileResult->getBlobId());
+		$message = "\x02".$this->hex2bin($uploadFileResult->getBlobId());
 		$message .= pack('V', $encryptResult->getSize());
 		$message .= $encryptResult->getNonce();
 
@@ -160,11 +160,11 @@ 
 			'i' => 0
 		);
 
-		if($thumbnailUploadFileResult != null && strlen($thumbnailUploadFileResult->getBlobId()) > 0) {
+		if ($thumbnailUploadFileResult != null && strlen($thumbnailUploadFileResult->getBlobId()) > 0) {
 			$messageContent['t'] = $thumbnailUploadFileResult->getBlobId();
 		}
 
-		$message = "\x17" . json_encode($messageContent);
+		$message = "\x17".json_encode($messageContent);
 
 		/* determine random amount of PKCS7 padding */
 		$padbytes = $this->generatePadBytes();
@@ -237,7 +237,7 @@ 
 
 		/* remove padding */
 		$padbytes = ord($data[strlen($data)-1]);
-		$realDataLength = strlen($data) - $padbytes;
+		$realDataLength = strlen($data)-$padbytes;
 		if ($realDataLength < 1) {
 			throw new BadMessageException();
 		}
@@ -263,7 +263,7 @@ 
 				return new TextMessage(substr($data, 1));
 			case DeliveryReceipt::TYPE_CODE:
 				/* Delivery receipt */
-				if ($realDataLength < (self::MESSAGE_ID_LEN-2) || (($realDataLength - 2) % self::MESSAGE_ID_LEN) != 0)  {
+				if ($realDataLength < (self::MESSAGE_ID_LEN-2) || (($realDataLength-2)%self::MESSAGE_ID_LEN) != 0) {
 					throw new BadMessageException();
 				}
 
@@ -273,7 +273,7 @@ 
 				return new DeliveryReceipt($receiptType, $messageIds);
 			case ImageMessage::TYPE_CODE:
 				/* Image Message */
-				if ($realDataLength != 1 + self::BLOB_ID_LEN + self::IMAGE_FILE_SIZE_LEN + self::IMAGE_NONCE_LEN)  {
+				if ($realDataLength != 1+self::BLOB_ID_LEN+self::IMAGE_FILE_SIZE_LEN+self::IMAGE_NONCE_LEN) {
 					throw new BadMessageException();
 				}
 
@@ -284,12 +284,12 @@ 
 			case FileMessage::TYPE_CODE:
 				/* Image Message */
 				$decodeResult = json_decode(substr($data, 1), true);
-				if(null === $decodeResult || false === $decodeResult) {
+				if (null === $decodeResult || false === $decodeResult) {
 					throw new BadMessageException();
 				}
 
 				$values = AssocArray::byJsonString(substr($data, 1), array('b', 't', 'k', 'm', 'n', 's'));
-				if(null === $values) {
+				if (null === $values) {
 					throw new BadMessageException();
 				}
 
@@ -391,7 +391,7 @@ 
 	 * @return null|string
 	 */
 	public final function decryptFile($data, $key) {
-		$result =  $this->openSecretBox($data, self::FILE_NONCE, $key);
+		$result = $this->openSecretBox($data, self::FILE_NONCE, $key);
 		return false === $result ? null : $result;
 	}
 
@@ -402,7 +402,7 @@ 
 	 */
 	public final function encryptFileThumbnail($data, $key) {
 		$box = $this->makeSecretBox($data, self::FILE_THUMBNAIL_NONCE, $key);
-		return new EncryptResult($box, $key,  self::FILE_THUMBNAIL_NONCE, strlen($box));
+		return new EncryptResult($box, $key, self::FILE_THUMBNAIL_NONCE, strlen($box));
 	}
 
 	public final function decryptFileThumbnail($data, $key) {
@@ -449,7 +449,7 @@ 
 	 */
 	private function generatePadBytes() {
 		$padbytes = 0;
-		while($padbytes < 1 || $padbytes > 255) {
+		while ($padbytes < 1 || $padbytes > 255) {
 			$padbytes = ord($this->createRandom(1));
 		}
 		return $padbytes;

source/Threema/Console/Command/GenerateKeyPair.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 namespace Threema\Console\Command;
 
 use Threema\Console\Common;
-use Threema\MsgApi\Tools\CryptTool;
 
 class GenerateKeyPair extends Base {
 	function __construct() {

source/Threema/MsgApi/Tests/CryptToolTest.php

Spacing +10 added lines, -10 removed lines

@@ -56,7 +56,7 @@ 
 
 			$this->assertNotNull($message);
 			$this->assertTrue($message instanceof TextMessage);
-			if($message instanceof TextMessage) {
+			if ($message instanceof TextMessage) {
 				$this->assertEquals($message->getText(), 'Dies ist eine Testnachricht. äöü');
 			}
 		});
@@ -92,7 +92,7 @@ 
 
 
 	public function testDerivePublicKey() {
-		$this->doTest(function(CryptTool $cryptTool, $prefix){
+		$this->doTest(function(CryptTool $cryptTool, $prefix) {
 			$publicKey = $cryptTool->derivePublicKey($cryptTool->hex2bin(Common::getPrivateKey(Constants::myPrivateKey)));
 			$myPublicKey = $cryptTool->hex2bin(Common::getPublicKey(Constants::myPublicKey));
 
@@ -165,15 +165,15 @@ 
 
 				// test different strings when comparing and get time needed
 				$result = [];
-				foreach(array(
-					'length' => [$string1, $string1 . 'a'],
+				foreach (array(
+					'length' => [$string1, $string1.'a'],
 					'diff' => [$string1, $string2],
 					'same' => [$string1, $string1]
 				) as $testName => $strings) {
 					$timeStart = microtime(true);
 					$comparisonResult = $cryptTool->stringCompare($strings[0], $strings[1]);
 					$timeEnd = microtime(true);
-					$timeElapsed = $timeEnd - $timeStart;
+					$timeElapsed = $timeEnd-$timeStart;
 
 					// echo $prefix.': '.$humanDescr[$testName].': '.$timeElapsed.'; result: '.$comparisonResult.PHP_EOL;
 					$result[$testName] = [$timeElapsed, $comparisonResult];
@@ -188,8 +188,8 @@ 
 
 				// check timings
 				echo 'Timing test results with '.$prefix.':'.PHP_EOL;
-				$timingRatio = 2 - ($result['diff'][0] / $result['same'][0]);
-				$absoluteDifference = abs($result['diff'][0] - $result['same'][0]);
+				$timingRatio = 2-($result['diff'][0]/$result['same'][0]);
+				$absoluteDifference = abs($result['diff'][0]-$result['same'][0]);
 				echo 'timing ratio: '.$timingRatio.PHP_EOL;
 				echo 'absolute difference: '.$absoluteDifference.PHP_EOL;
 
@@ -208,7 +208,7 @@ 
 	 */
 	public function testRemoveVar() {
 		$this->doTest(function(CryptTool $cryptTool, $prefix) {
-			foreach(array(
+			foreach (array(
 						'hex' => Constants::myPrivateKeyExtract,
 						'bin' => $cryptTool->hex2bin(Constants::myPrivateKeyExtract)
 					) as $key => $testVar) {
@@ -222,12 +222,12 @@ 
 	}
 
 	private function doTest(\Closure $c) {
-		foreach(array(
+		foreach (array(
 					'Salt' => CryptTool::createInstance(CryptTool::TYPE_SALT),
 					'Sodium' => CryptTool::createInstance(CryptTool::TYPE_SODIUM)
 				) as $key => $instance) {
 
-			if($instance === null) {
+			if ($instance === null) {
 				echo $key.": could not instance crypt tool\n";
 				break;
 			}