archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3' into PHP-7.4

Browse source 
* PHP-7.3:
  Fix #70461: disable md5 code when it is not supported in net-snmp
This commit is contained in:
Christoph M. Becker 2020-11-02 11:39:16 +01:00
commit 0123f75b5d
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -52,6 +52,10 @@ PHP NEWS
. Fixed bug #65825 (PDOStatement::fetch() does not throw exception on broken . Fixed bug #65825 (PDOStatement::fetch() does not throw exception on broken
server connection). (Nikita) server connection). (Nikita)
- SNMP:
. Fixed bug #70461 (disable md5 code when it is not supported in net-snmp).
(Alexander Bergmann, cmb)
29 Oct 2020, PHP 7.4.12 29 Oct 2020, PHP 7.4.12
- Core: - Core:

5
ext/snmp/snmp.c
View file

@ -1204,10 +1204,13 @@ static int netsnmp_session_set_sec_level(struct snmp_session *s, char *level)
Set the authentication protocol in the snmpv3 session */ Set the authentication protocol in the snmpv3 session */
static int netsnmp_session_set_auth_protocol(struct snmp_session *s, char *prot) static int netsnmp_session_set_auth_protocol(struct snmp_session *s, char *prot)
{ {
#ifndef DISABLE_MD5
if (!strcasecmp(prot, "MD5")) { if (!strcasecmp(prot, "MD5")) {
s->securityAuthProto = usmHMACMD5AuthProtocol; s->securityAuthProto = usmHMACMD5AuthProtocol;
s->securityAuthProtoLen = USM_AUTH_PROTO_MD5_LEN; s->securityAuthProtoLen = USM_AUTH_PROTO_MD5_LEN;
} else if (!strcasecmp(prot, "SHA")) { } else
#endif
if (!strcasecmp(prot, "SHA")) {
s->securityAuthProto = usmHMACSHA1AuthProtocol; s->securityAuthProto = usmHMACSHA1AuthProtocol;
s->securityAuthProtoLen = USM_AUTH_PROTO_SHA_LEN; s->securityAuthProtoLen = USM_AUTH_PROTO_SHA_LEN;
} else { } else {