diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-03-06 11:56:50 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-07-17 17:46:13 +0100 |
| commit | 0afa0b1f8328db0d37426134e84b64ba2490191e (patch) | |
| tree | 1aeb6935345207d2e934ab87f44f3703ff5df2d3 | |
| parent | 98514f96c98227afb606cc8f2d5845a5676635e9 (diff) | |
| download | php-git-0afa0b1f8328db0d37426134e84b64ba2490191e.tar.gz | |
The DSS1 is not available in OpenSSL 1.1
| -rw-r--r-- | ext/openssl/openssl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 4e4065b345..251453cfce 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -72,7 +72,9 @@ #ifdef HAVE_OPENSSL_MD2_H #define OPENSSL_ALGO_MD2 4 #endif +#if OPENSSL_VERSION_NUMBER < 0x10100000L #define OPENSSL_ALGO_DSS1 5 +#endif #define OPENSSL_ALGO_SHA224 6 #define OPENSSL_ALGO_SHA256 7 #define OPENSSL_ALGO_SHA384 8 @@ -1167,9 +1169,11 @@ static EVP_MD * php_openssl_get_evp_md_from_algo(zend_long algo) { /* {{{ */ mdtype = (EVP_MD *) EVP_md2(); break; #endif +#if OPENSSL_VERSION_NUMBER < 0x10100000L case OPENSSL_ALGO_DSS1: mdtype = (EVP_MD *) EVP_dss1(); break; +#endif case OPENSSL_ALGO_SHA224: mdtype = (EVP_MD *) EVP_sha224(); break; @@ -1291,7 +1295,9 @@ PHP_MINIT_FUNCTION(openssl) #ifdef HAVE_OPENSSL_MD2_H REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD2", OPENSSL_ALGO_MD2, CONST_CS|CONST_PERSISTENT); #endif +#if OPENSSL_VERSION_NUMBER < 0x10100000L REGISTER_LONG_CONSTANT("OPENSSL_ALGO_DSS1", OPENSSL_ALGO_DSS1, CONST_CS|CONST_PERSISTENT); +#endif REGISTER_LONG_CONSTANT("OPENSSL_ALGO_SHA224", OPENSSL_ALGO_SHA224, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("OPENSSL_ALGO_SHA256", OPENSSL_ALGO_SHA256, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("OPENSSL_ALGO_SHA384", OPENSSL_ALGO_SHA384, CONST_CS|CONST_PERSISTENT); |