com php-src: Added two more test cases for CN matching.: ext/openssl/tests/bug65729.phpt
| From: | Michael Wallner | Date: | Mon, 07 Oct 2013 14:10:05 +0000 |
| Subject: | com php-src: Added two more test cases for CN matching.: ext/openssl/tests/bug65729.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73393@lists.php.net to get a copy of this message | ||
Commit: 674dd73f8c34b9faf1e777a301e5302348b48b9d
Author: Tjerk Meesters <datibbaw@php.net> Mon, 7 Oct 2013 22:10:05 +0800
Parents: a820c3d6baac945ead4a5fe6e54d0a04b02620de
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=674dd73f8c34b9faf1e777a301e5302348b48b9d
Log:
Added two more test cases for CN matching.
Changed paths:
M ext/openssl/tests/bug65729.phpt
Diff:
diff --git a/ext/openssl/tests/bug65729.phpt b/ext/openssl/tests/bug65729.phpt
index d4645d9..7008f3c 100644
--- a/ext/openssl/tests/bug65729..phpt
+++ b/ext/openssl/tests/bug65729.phpt
@@ -13,24 +13,28 @@ stream_context_set_option($context, 'ssl',
'allow_self_signed', true);
$server = stream_socket_server('ssl://127.0.0.1:64321', $errno, $errstr,
STREAM_SERVER_BIND|STREAM_SERVER_LISTEN, $context);
+$expected_names = array('foo.test.com.sg', 'foo.test.com',
'foo.bar.test.com');
+
$pid = pcntl_fork();
if ($pid == -1) {
die('could not fork');
} else if ($pid) {
- $contextC = stream_context_create(
- array(
+ foreach ($expected_names as $expected_name) {
+ $contextC = stream_context_create(array(
'ssl' => array(
'verify_peer' => true,
'allow_self_signed' => true,
- 'CN_match' => 'foo.test.com.sg',
+ 'CN_match' => $expected_name,
)
- )
- );
- var_dump(stream_socket_client("ssl://127.0.0.1:64321", $errno, $errstr, 1,
+ ));
+ var_dump(stream_socket_client("ssl://127.0.0.1:64321", $errno, $errstr, 1,
STREAM_CLIENT_CONNECT, $contextC));
+ }
} else {
@pcntl_wait($status);
- @stream_socket_accept($server, 1);
+ foreach ($expected_names as $name) {
+ @stream_socket_accept($server, 1);
+ }
}
--EXPECTF--
Warning: stream_socket_client(): Peer certificate CN=
*.test.com' did not match expected
CN=foo.test.com.sg' in %s on line %d
@@ -39,4 +43,11 @@ Warning: stream_socket_client(): Failed to enable crypto in %s on line %d
Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s
on line %d
bool(false)
+resource(%d) of type (stream)
+
+Warning: stream_socket_client(): Peer certificate CN=*.test.com' did not match expected
CN=foo.bar.test.com' in %s on line %d
+
+Warning: stream_socket_client(): Failed to enable crypto in %s on line %d
+Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s
on line %d
+bool(false)