From 9690ded288624e8ebb8f331ff305fed9a134e5e3 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 28 Oct 2020 15:30:49 +0100 Subject: Fix #70461: disable md5 code when it is not supported in net-snmp Patch contributed by Alexander Bergmann. Closes GH-6389. --- NEWS | 4 ++++ ext/snmp/snmp.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 72b47f2994..f6963784d8 100644 --- a/NEWS +++ b/NEWS @@ -25,6 +25,10 @@ PHP NEWS - ODBC: . Fixed bug #44618 (Fetching may rely on uninitialized data). (cmb) +- SNMP: + . Fixed bug #70461 (disable md5 code when it is not supported in net-snmp). + (Alexander Bergmann, cmb) + 29 Oct 2020, PHP 7.3.24 - Core: diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index ef23d1ba81..1c2bbe5e35 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -1208,10 +1208,13 @@ static int netsnmp_session_set_sec_level(struct snmp_session *s, char *level) Set the authentication protocol in the snmpv3 session */ static int netsnmp_session_set_auth_protocol(struct snmp_session *s, char *prot) { +#ifndef DISABLE_MD5 if (!strcasecmp(prot, "MD5")) { s->securityAuthProto = usmHMACMD5AuthProtocol; s->securityAuthProtoLen = USM_AUTH_PROTO_MD5_LEN; - } else if (!strcasecmp(prot, "SHA")) { + } else +#endif + if (!strcasecmp(prot, "SHA")) { s->securityAuthProto = usmHMACSHA1AuthProtocol; s->securityAuthProtoLen = USM_AUTH_PROTO_SHA_LEN; } else { -- cgit v1.2.1