sniper Wed Jul 26 23:57:44 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/snmp snmp.c
/php-src NEWS
Log:
MFH: - Fixed bug #37564 (AES privacy encryption not possible due to net-snmp
5.2 compatibility issue)
http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/snmp.c?r1=1.106.2.2.2.1&r2=1.106.2.2.2.2&diff_format=u
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.106.2.2.2.1
php-src/ext/snmp/snmp.c:1.106.2.2.2.2
--- php-src/ext/snmp/snmp.c:1.106.2.2.2.1 Thu Jun 15 18:33:08 2006
+++ php-src/ext/snmp/snmp.c Wed Jul 26 23:57:43 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: snmp.c,v 1.106.2.2.2.1 2006/06/15 18:33:08 dmitry Exp $ */
+/* $Id: snmp.c,v 1.106.2.2.2.2 2006/07/26 23:57:43 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -834,10 +834,14 @@
*
* 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
) {
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.151&r2=1.2027.2.547.2.152&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.151 php-src/NEWS:1.2027.2.547.2.152
--- php-src/NEWS:1.2027.2.547.2.151 Wed Jul 26 15:29:27 2006
+++ php-src/NEWS Wed Jul 26 23:57:43 2006
@@ -21,6 +21,8 @@
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
