public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Update list of ciphers /cc @cs278

pull/5435/head
Jordi Boggiano 2016-06-11 11:19:58 +01:00
parent 08ef916bed
commit 73d9a4717d
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Composer/Util/RemoteFilesystem.php
View File

@ -761,19 +761,24 @@ class RemoteFilesystem
'DHE-RSA-AES256-SHA', 'DHE-RSA-AES256-SHA',
'AES128-GCM-SHA256', 'AES128-GCM-SHA256',
'AES256-GCM-SHA384', 'AES256-GCM-SHA384',
'ECDHE-RSA-RC4-SHA', 'AES128-SHA256',
'ECDHE-ECDSA-RC4-SHA', 'AES256-SHA256',
'AES128', 'AES128-SHA',
'AES256', 'AES256-SHA',
'RC4-SHA', 'AES',
'HIGH', 'CAMELLIA',
'DES-CBC3-SHA',
'!aNULL', '!aNULL',
'!eNULL', '!eNULL',
'!EXPORT', '!EXPORT',
'!DES', '!DES',
'!3DES', '!RC4',
'!MD5', '!MD5',
'!PSK', '!PSK',
'!aECDH',
'!EDH-DSS-DES-CBC3-SHA',
'!EDH-RSA-DES-CBC3-SHA',
'!KRB5-DES-CBC3-SHA',
)); ));
/** /**

2
tests/Composer/Test/Util/RemoteFilesystemTest.php
View File

@ -175,7 +175,7 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase
$res = $this->callGetOptionsForUrl($io, array('example.org', array('ssl' => array('cafile' => '/some/path/file.crt'))), array(), 'http://www.example.org'); $res = $this->callGetOptionsForUrl($io, array('example.org', array('ssl' => array('cafile' => '/some/path/file.crt'))), array(), 'http://www.example.org');
$this->assertTrue(isset($res['ssl']['ciphers'])); $this->assertTrue(isset($res['ssl']['ciphers']));
$this->assertRegExp("|!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK|", $res['ssl']['ciphers']); $this->assertRegExp("|!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA|", $res['ssl']['ciphers']);
$this->assertTrue($res['ssl']['verify_peer']); $this->assertTrue($res['ssl']['verify_peer']);
$this->assertTrue($res['ssl']['SNI_enabled']); $this->assertTrue($res['ssl']['SNI_enabled']);
$this->assertEquals(7, $res['ssl']['verify_depth']); $this->assertEquals(7, $res['ssl']['verify_depth']);