Skip to content

drivers/snmp-ups.c: usmAESPrivProtocol is not an array to properly use a sizeof() #850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jimklimov merged 3 commits into from
Nov 15, 2020
Merged

drivers/snmp-ups.c: usmAESPrivProtocol is not an array to properly use a sizeof() #850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bcaa25
drivers/snmp-ups.c: comment about issue found by pedantic compiler
jimklimov Nov 8, 2020
c7cf507
drivers/snmp-ups.c: fix the warning about how we get the size of usmA…
jimklimov Nov 15, 2020
f8667a4
Merge branch 'master' into fightwarn-snmpups-aes
jimklimov Nov 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions drivers/snmp-ups.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,27 @@
#include "hpe-pdu-mib.h"

/* Address API change */
#ifndef usmAESPrivProtocol
#if ( ! NUT_HAVE_LIBNETSNMP_usmAESPrivProtocol ) && ( ! defined usmAESPrivProtocol )
#define usmAESPrivProtocol usmAES128PrivProtocol
#endif

#ifdef USM_PRIV_PROTO_AES_LEN
# define NUT_securityPrivProtoLen USM_PRIV_PROTO_AES_LEN
#else
# ifdef USM_PRIV_PROTO_AES128_LEN
# define NUT_securityPrivProtoLen USM_PRIV_PROTO_AES128_LEN
# else
/* FIXME: Find another way to get the size of array(?) to avoid:
* error: division 'sizeof (oid * {aka long unsigned int *}) / sizeof (oid {aka long unsigned int})' does not compute the number of array elements [-Werror=sizeof-pointer-div]
* See also https://bugs.php.net/bug.php?id=37564 for context
* which is due to most values in /usr/include/net-snmp/librarytransform_oids.h
* being defined as "oid[10]" or similar arrays, and "backwards compatibility"
* usmAESPrivProtocol name is an "oid *" pointer.
*/
# define NUT_securityPrivProtoLen (sizeof(usmAESPrivProtocol)/sizeof(oid))
# endif
#endif

static mib2nut_info_t *mib2nut[] = {
&apc,
&mge,
Expand Down Expand Up @@ -593,7 +610,7 @@ void nut_snmp_init(const char *type, const char *hostname)
}
else if (strcmp(privProtocol, "AES") == 0) {
g_snmp_sess.securityPrivProto = usmAESPrivProtocol;
g_snmp_sess.securityPrivProtoLen = sizeof(usmAESPrivProtocol)/sizeof(oid);
g_snmp_sess.securityPrivProtoLen = NUT_securityPrivProtoLen;
}
else
fatalx(EXIT_FAILURE, "Bad SNMPv3 authProtocol: %s", authProtocol);
Expand Down
16 changes: 16 additions & 0 deletions m4/nut_check_libnetsnmp.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,22 @@ if test -z "${nut_have_libnetsnmp_seen}"; then
if test "${nut_have_libnetsnmp}" = "yes"; then
LIBNETSNMP_CFLAGS="${CFLAGS}"
LIBNETSNMP_LIBS="${LIBS}"

AC_MSG_CHECKING([for defined usmAESPrivProtocol])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
#include <net-snmp/net-snmp-config.h>
#include <net-snmp/net-snmp-includes.h>
oid * pProto = usmAESPrivProtocol;
],
[]
)],
[AC_MSG_RESULT([yes])
AC_DEFINE_UNQUOTED(NUT_HAVE_LIBNETSNMP_usmAESPrivProtocol, 1, [Variable or macro by this name is resolvable])
],
[AC_MSG_RESULT([no])
AC_DEFINE_UNQUOTED(NUT_HAVE_LIBNETSNMP_usmAESPrivProtocol, 0, [Variable or macro by this name is not resolvable])
])

fi

dnl restore original CFLAGS and LIBS
Expand Down