From: Florin Peter <github@florin-peter.de>
Date: Mon, 29 Apr 2013 23:54:19 +0000 (+0200)
Subject: improved key length tests
X-Git-Tag: v6.0.0alpha2~743^2~139
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b1c4464eda73d0c6674a1635c7f8c8629414ecaa;p=nextcloud-server.git

improved key length tests
---

diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 7fe37838a42..81034be54b1 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -64,9 +64,13 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
 	function testGetPrivateKey() {
 	
 		$key = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
-		 
+
+        $privateKey = Encryption\Crypt::symmetricDecryptFileContent( $key, $this->pass);
+
 		// Will this length vary? Perhaps we should use a range instead
-		$this->assertEquals( 4388, strlen( $key ) );
+		$this->assertGreaterThan( 27, strlen( $privateKey ) );
+
+        $this->assertEquals( '-----BEGIN PRIVATE KEY-----', substr( $privateKey, 0, 27 ) );
 	
 	}
 	
@@ -74,7 +78,7 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
 
 		$key = Encryption\Keymanager::getPublicKey( $this->view, $this->userId );
 		
-		$this->assertEquals( 800, strlen( $key ) );
+		$this->assertGreaterThan( 26, strlen( $key ) );
 		
 		$this->assertEquals( '-----BEGIN PUBLIC KEY-----', substr( $key, 0, 26 ) );
 	}
@@ -122,9 +126,15 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
 	
 		$keys = Encryption\Keymanager::getUserKeys( $this->view, $this->userId );
 		
-		$this->assertEquals( 800, strlen( $keys['publicKey'] ) );
+		$this->assertGreaterThan( 26, strlen( $keys['publicKey'] ) );
+
 		$this->assertEquals( '-----BEGIN PUBLIC KEY-----', substr( $keys['publicKey'], 0, 26 ) );
-		$this->assertEquals( 4388, strlen( $keys['privateKey'] ) );
+
+        $privateKey = Encryption\Crypt::symmetricDecryptFileContent( $keys['privateKey'], $this->pass);
+
+        $this->assertGreaterThan( 27, strlen( $keys['privateKey'] ) );
+
+        $this->assertEquals( '-----BEGIN PRIVATE KEY-----', substr( $privateKey, 0, 27 ) );
 	
 	}