diff options
| author | Remi Collet <remi@remirepo.net> | 2021-11-09 14:52:47 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2021-11-09 14:52:47 +0100 |
| commit | c62ca0226d31dc42e90f5ba3f46d574b206e663f (patch) | |
| tree | 681641d5a88e62e22708e5587360b2854cfcb29c /php-net-snmp.patch | |
| parent | 44a3553d84f16206fcfe80093741cf93f01b7efb (diff) | |
add patch for OpenSSL 3.0, backported from 8.1
Diffstat (limited to 'php-net-snmp.patch')
| -rw-r--r-- | php-net-snmp.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/php-net-snmp.patch b/php-net-snmp.patch deleted file mode 100644 index e7ee193..0000000 --- a/php-net-snmp.patch +++ /dev/null @@ -1,38 +0,0 @@ -Backported from 8.0 for 7.4 by Remi - - -From f9fd3595ecb36c8dc6add0515782a18f15216d77 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Thu, 27 May 2021 14:20:07 +0200 -Subject: [PATCH] Fix snmp build without DES - ---- - ext/snmp/snmp.c | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c -index 35d19c8738828..d31995827880d 100644 ---- a/ext/snmp/snmp.c -+++ b/ext/snmp/snmp.c -@@ -1225,15 +1225,19 @@ static int netsnmp_session_set_auth_prot - Set the security protocol in the snmpv3 session */ - static int netsnmp_session_set_sec_protocol(struct snmp_session *s, char *prot) - { -+#ifndef NETSNMP_DISABLE_DES - if (!strcasecmp(prot, "DES")) { - s->securityPrivProto = usmDESPrivProtocol; - s->securityPrivProtoLen = USM_PRIV_PROTO_DES_LEN; -+ } else -+#endif - #ifdef HAVE_AES -- } else if (!strcasecmp(prot, "AES128") || !strcasecmp(prot, "AES")) { -+ if (!strcasecmp(prot, "AES128") || !strcasecmp(prot, "AES")) { - s->securityPrivProto = usmAESPrivProtocol; - s->securityPrivProtoLen = USM_PRIV_PROTO_AES_LEN; -+ } else - #endif -- } else { -+ { - php_error_docref(NULL, E_WARNING, "Unknown security protocol '%s'", prot); - return (-1); - } |