Skip to content

Commit

Permalink
Add support for OpenSSL security level
Browse files Browse the repository at this point in the history
  • Loading branch information
bukka committed Jul 17, 2017
1 parent d9d3b2c commit 26982e3
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 0 deletions.
2 changes: 2 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ PHP NEWS
(Nikita, Dmitry)

- OpenSSL:
. Add ssl security_level stream option to support OpenSSL security levels.
(Jakub Zelenka).
. Allow setting SNI cert and private key in separate files. (Jakub Zelenka)
. Fixed bug #74651 (negative-size-param (-1) in memcpy in zif_openssl_seal()).
(Stas)
Expand Down
48 changes: 48 additions & 0 deletions ext/openssl/tests/stream_security_level.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
--TEST--
security_level setting to prohibit cert
--SKIPIF--
<?php
if (!extension_loaded("openssl")) die("skip openssl not loaded");
if (OPENSSL_VERSION_NUMBER < 0x10100000) die("skip OpenSSL >= v1.1.0 required");
if (!function_exists("proc_open")) die("skip no proc_open");
--FILE--
<?php
$serverCode = <<<'CODE'
$serverUri = "ssl://127.0.0.1:64322";
$serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
$serverCtx = stream_context_create(['ssl' => [
'local_cert' => __DIR__ . '/bug54992.pem'
]]);

$server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
phpt_notify();

@stream_socket_accept($server, 1);
CODE;

$clientCode = <<<'CODE'
$serverUri = "ssl://127.0.0.1:64322";
$clientFlags = STREAM_CLIENT_CONNECT;
$clientCtx = stream_context_create(['ssl' => [
'security_level' => 3,
'verify_peer' => true,
'cafile' => __DIR__ . '/bug54992-ca.pem',
'verify_peer_name' => false
]]);
phpt_wait();
$client = stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx);
var_dump($client);
CODE;

include 'ServerClientTestCase.inc';
ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
--EXPECTF--
Warning: stream_socket_client(): SSL operation failed with code 1. OpenSSL Error messages:
error:1416F086:SSL routines:tls_process_server_certificate:certificate verify failed in %s : eval()'d code on line %d

Warning: stream_socket_client(): Failed to enable crypto in %s : eval()'d code on line %d

Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64322 (Unknown error) in %s : eval()'d code on line %d
bool(false)
17 changes: 17 additions & 0 deletions ext/openssl/xp_ssl.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@
#endif
#endif

#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
#define HAVE_SEC_LEVEL 1
#endif

/* Flags for determining allowed stream crypto methods */
#define STREAM_CRYPTO_IS_CLIENT (1<<0)
Expand Down Expand Up @@ -1613,6 +1616,20 @@ int php_openssl_setup_crypto(php_stream *stream,
}
}

if (GET_VER_OPT("security_level")) {
#ifdef HAVE_SEC_LEVEL
convert_to_long(val);
if (Z_LVAL_P(val) < 0 || Z_LVAL_P(val) > 5) {
php_error_docref(NULL, E_WARNING, "Security level must be between 0 and 5");
}
SSL_CTX_set_security_level(sslsock->ctx, Z_LVAL_P(val));
#else
php_error_docref(NULL, E_WARNING,
"security_level is not supported by the linked OpenSSL library "
"- it is supported from version 1.1.0");
#endif
}

GET_VER_OPT_STRING("alpn_protocols", alpn_protocols);
if (alpn_protocols) {
#ifdef HAVE_TLS_ALPN
Expand Down

1 comment on commit 26982e3

@kelunik
Copy link
Member

@kelunik kelunik commented on 26982e3 Aug 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we should let it default it to 1 in PHP 7.2? /cc @sgolemon

Please sign in to comment.