From 76bebbf666aa6b0a38e7fda7317ee29fe02577d2 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Tue, 31 May 2016 16:46:07 +0200
Subject: [PATCH] [BUGFIX] Always execute pbkdf2 tests
The test annotation "@requires function hash_pbkdf2" doesn't
work for whatever reason, those tests are always skipped.
Since PHP7 always comes with hash_pbkdf2() built-in, the patch
now just drops the annotation.
Change-Id: Ice3adcebbeadf2c01e81960144c842bc4af268d2
Resolves: #76404
Releases: master
Reviewed-on: https://review.typo3.org/48422
Reviewed-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Tested-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Reviewed-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
Tested-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
---
.../Tests/Unit/Salt/Pbkdf2SaltTest.php | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php
index d5b455522a09..e69c993ab49b 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php
@@ -74,7 +74,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
/**
* @test
- * @requires function hash_pbkdf2
*/
public function nonEmptyPasswordResultsInNonNullSaltedPassword()
{
@@ -84,7 +83,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
/**
* @test
- * @requires function hash_pbkdf2
*/
public function createdSaltedHashOfProperStructure()
{
@@ -95,7 +93,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
/**
* @test
- * @requires function hash_pbkdf2
*/
public function createdSaltedHashOfProperStructureForCustomSaltWithoutSetting()
{
@@ -110,7 +107,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
/**
* @test
- * @requires function hash_pbkdf2
*/
public function createdSaltedHashOfProperStructureForMinimumHashCount()
{
@@ -130,7 +126,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
* same "salted password hash" when using the same salt.
*
* @test
- * @requires function hash_pbkdf2
*/
public function authenticationWithValidAlphaCharClassPassword()
{
@@ -146,7 +141,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
* same "salted password hash" when using the same salt.
*
* @test
- * @requires function hash_pbkdf2
*/
public function authenticationWithValidNumericCharClassPassword()
{
@@ -162,7 +156,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
* same "salted password hash" when using the same salt.
*
* @test
- * @requires function hash_pbkdf2
*/
public function authenticationWithValidAsciiSpecialCharClassPassword()
{
@@ -178,7 +171,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
* same "salted password hash" when using the same salt.
*
* @test
- * @requires function hash_pbkdf2
*/
public function authenticationWithValidLatin1SpecialCharClassPassword()
{
@@ -198,7 +190,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
* same "salted password hash" when using the same salt.
*
* @test
- * @requires function hash_pbkdf2
*/
public function authenticationWithValidLatin1UmlautCharClassPassword()
{
@@ -218,7 +209,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
/**
* @test
- * @requires function hash_pbkdf2
*/
public function authenticationWithNonValidPassword()
{
@@ -230,7 +220,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
/**
* @test
- * @requires function hash_pbkdf2
*/
public function passwordVariationsResultInDifferentHashes()
{
@@ -292,7 +281,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
/**
* @test
- * @requires function hash_pbkdf2
*/
public function updateNecessityForValidSaltedPassword()
{
@@ -318,7 +306,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
/**
* @test
- * @requires function hash_pbkdf2
*/
public function updateNecessityForDecreasedHashcount()
{
@@ -334,7 +321,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
/**
* @test
- * @requires function hash_pbkdf2
*/
public function isCompatibleWithPythonPasslibHashes()
{
--
GitLab