Disable DES if Net-SNMP doesn't have it (#220) (#258)

Cacti · Apr 11, 2022 · 4e46f9e · 4e46f9e
1 parent 8d8f5f0
commit 4e46f9e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,8 @@
 The Cacti Group | spine
 
+1.2.21
+-issue#258: Disable DES if Net-SNMP doesn't have it
+
 1.2.20
 -issue#233: Add support for newer versions of MySQL/MariaDB
 -issue#238: When checking for uptime of device, don't assume a non-responce is always fatal

diff --git a/snmp.c b/snmp.c
@@ -283,7 +283,7 @@ void *snmp_host_init(int host_id, char *hostname, int snmp_version, char *snmp_c
 			}
 		} else {
 			if (strcmp(snmp_priv_protocol, "DES") == 0) {
-				#if defined(USM_PRIV_PROTO_DES_LEN)
+				#if defined(USM_PRIV_PROTO_DES_LEN) && !defined(NETSNMP_DISABLE_DES)
 				session.securityPrivProto    = snmp_duplicate_objid(usmDESPrivProtocol, USM_PRIV_PROTO_DES_LEN);
 				session.securityPrivProtoLen = USM_PRIV_PROTO_DES_LEN;
 				session.securityPrivKeyLen   = USM_PRIV_KU_LEN;