Skip to content

Commit 72b3987

Browse files
committed
Generate certificates for bug69215.phpt
1 parent 58ca47a commit 72b3987

File tree

4 files changed

+22
-86
lines changed

4 files changed

+22
-86
lines changed

ext/openssl/tests/bug69215-ca.pem

Lines changed: 0 additions & 16 deletions
This file was deleted.

ext/openssl/tests/bug69215-client.pem

Lines changed: 0 additions & 32 deletions
This file was deleted.

ext/openssl/tests/bug69215-server.pem

Lines changed: 0 additions & 32 deletions
This file was deleted.

ext/openssl/tests/bug69215.phpt

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@ if (!function_exists("proc_open")) die("skip no proc_open");
77
?>
88
--FILE--
99
<?php
10+
$caCertFile = __DIR__ . DIRECTORY_SEPARATOR . 'bug69215-ca.pem.tmp';
11+
$clientCertFile = __DIR__ . DIRECTORY_SEPARATOR . 'bug69215-client.pem.tmp';
12+
$serverCertFile = __DIR__ . DIRECTORY_SEPARATOR . 'bug69215-server.pem.tmp';
13+
1014
$serverCode = <<<'CODE'
1115
$serverUri = "ssl://127.0.0.1:64321";
1216
$serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
1317
$serverCtx = stream_context_create(['ssl' => [
14-
'local_cert' => __DIR__ . '/bug69215-server.pem',
15-
'passphrase' => 'elephpant',
16-
'cafile' => __DIR__ . '/bug69215-ca.pem',
18+
'local_cert' => '%s',
19+
'cafile' => '%s',
1720
'verify_peer' => true,
1821
'verify_peer_name' => true,
1922
'peer_name' => 'bug69215-client',
@@ -24,14 +27,14 @@ $serverCode = <<<'CODE'
2427
2528
stream_socket_accept($server, 30);
2629
CODE;
30+
$serverCode = sprintf($serverCode, $serverCertFile, $caCertFile);
2731

2832
$clientCode = <<<'CODE'
2933
$serverUri = "ssl://127.0.0.1:64321";
3034
$clientFlags = STREAM_CLIENT_CONNECT;
3135
$clientCtx = stream_context_create(['ssl' => [
32-
'local_cert' => __DIR__ . '/bug69215-client.pem',
33-
'passphrase' => 'elephpant',
34-
'cafile' => __DIR__ . '/bug69215-ca.pem',
36+
'local_cert' => '%s',
37+
'cafile' => '%s',
3538
'verify_peer' => true,
3639
'verify_peer_name' => true,
3740
'peer_name' => 'bug69215-server',
@@ -41,9 +44,22 @@ $clientCode = <<<'CODE'
4144
4245
var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));
4346
CODE;
47+
$clientCode = sprintf($clientCode, $clientCertFile, $caCertFile);
48+
49+
include 'CertificateGenerator.inc';
50+
$certificateGenerator = new CertificateGenerator();
51+
$certificateGenerator->saveCaCert($caCertFile);
52+
$certificateGenerator->saveNewCertAsFileWithKey('bug69215-client', $clientCertFile);
53+
$certificateGenerator->saveNewCertAsFileWithKey('bug69215-server', $serverCertFile);
4454

4555
include 'ServerClientTestCase.inc';
4656
ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
4757
?>
58+
--CLEAN--
59+
<?php
60+
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'bug69215-ca.pem.tmp');
61+
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'bug69215-client.pem.tmp');
62+
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'bug69215-server.pem.tmp');
63+
?>
4864
--EXPECTF--
4965
resource(%d) of type (stream)

0 commit comments

Comments
 (0)