MFH: - Fixed bug #37564 (AES privacy encryption not possible due to net-snmp 5.2...

diff --git a/NEWS b/NEWS
index 17f35c85e3951bcd1fe1581282564ed9ee42b32a..808eb20c4fa253fe55e519e552e5779a17ef26e5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,8 @@ PHP                                                                        NEWS
   itself). (Ilia)
 - Fixed bug #38132 (ReflectionClass::getStaticProperties() retains \0 in key
   names). (Ilia)
+- Fixed bug #37564 (AES privacy encryption not possible due to net-snmp 5.2
+  compatibility issue). (Jani, patch by scott dot moynes+php at gmail dot com)
 
 24 Jul 2006, PHP 5.2.0RC1
 - Updated bundled MySQL client library to version 5.0.22 in the Windows

diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index 49648907226f9ba3116d22b03b548f6e197e5ac7..e0568cec183522449c56bcc2597215652137f3cc 100644 (file)
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -834,10 +834,14 @@ static int netsnmp_session_set_sec_protocol(struct snmp_session *s, char *prot T
 * 
 * As we want this extension to compile on both versions, we use the latter
 * symbol on purpose, as it's defined to be the same as the former.
+*
+* However, in 5.2 the type of usmAES128PrivProtocol is a pointer, not an
+* array, so we cannot use the OIDSIZE macro because it uses sizeof().
+*
 */
                        || !strcasecmp(prot, "AES")) {
                        s->securityPrivProto = usmAES128PrivProtocol;
-                       s->securityPrivProtoLen = OIDSIZE(usmAES128PrivProtocol);
+                       s->securityPrivProtoLen = USM_PRIV_PROTO_AES128_LEN;
                        return (0);
 #else                  
                ) {