diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 30 | ||||
| -rw-r--r-- | lib/lanplus/lanplus.c | 10 | ||||
| -rw-r--r-- | lib/libipmiutil.pc | 2 |
3 files changed, 20 insertions, 22 deletions
diff --git a/lib/Makefile b/lib/Makefile index e32afa5..3ec415c 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -47,12 +47,12 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run aclocal-1.11 -AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run tar +ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.9/missing --run aclocal-1.11 +AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.9/missing --run tar AR = ar -AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run autoconf -AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run autoheader -AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run automake-1.11 +AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.9/missing --run autoconf +AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.9/missing --run autoheader +AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.9/missing --run automake-1.11 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -101,13 +101,13 @@ LIB_DIR = /usr/lib64 LIPO = LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run makeinfo +MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.9/missing --run makeinfo MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = OBJDUMP = objdump OBJEXT = o -OS_CFLAGS = -DLINUX -fPIC -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 +OS_CFLAGS = -DLINUX -fPIC -Wno-pointer-sign -Wno-sign-conversion -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 OS_DRIVERS = imbapi.c ipmimv.c ipmild.c ipmidir.c OS_LFLAGS = OTOOL = @@ -115,9 +115,9 @@ OTOOL64 = PACKAGE = ipmiutil PACKAGE_BUGREPORT = PACKAGE_NAME = ipmiutil -PACKAGE_STRING = ipmiutil 2.9.8 +PACKAGE_STRING = ipmiutil 2.9.9 PACKAGE_TARNAME = ipmiutil -PACKAGE_VERSION = 2.9.8 +PACKAGE_VERSION = 2.9.9 PATH_SEPARATOR = : PKG_DIR = /root/rpmbuild RANLIB = ranlib @@ -129,11 +129,11 @@ SHR_LINK = libipmiutil.so.1 STRIP = strip SUBDIR_S = doc scripts lib util SYSTEMD_DIR = /usr/share/ipmiutil -VERSION = 2.9.8 -abs_builddir = /usr/dev/ipmiutil-2.9.8/lib -abs_srcdir = /usr/dev/ipmiutil-2.9.8/lib -abs_top_builddir = /usr/dev/ipmiutil-2.9.8 -abs_top_srcdir = /usr/dev/ipmiutil-2.9.8 +VERSION = 2.9.9 +abs_builddir = /usr/dev/ipmiutil-2.9.9/lib +abs_srcdir = /usr/dev/ipmiutil-2.9.9/lib +abs_top_builddir = /usr/dev/ipmiutil-2.9.9 +abs_top_srcdir = /usr/dev/ipmiutil-2.9.9 ac_ct_CC = gcc ac_ct_DUMPBIN = am__include = include @@ -161,7 +161,7 @@ host_vendor = redhat htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /usr/dev/ipmiutil-2.9.8/install-sh +install_sh = ${SHELL} /usr/dev/ipmiutil-2.9.9/install-sh libdir = $(iprefix)/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff --git a/lib/lanplus/lanplus.c b/lib/lanplus/lanplus.c index 2fab966..e423ede 100644 --- a/lib/lanplus/lanplus.c +++ b/lib/lanplus/lanplus.c @@ -325,25 +325,23 @@ int lanplus_get_requested_ciphers(int cipher_suite_id, *integrity_alg = IPMI_INTEGRITY_MD5_128; *crypt_alg = IPMI_CRYPT_XRC4_40; break; -#if 0 - case 15: // Note: Cipher Suite ID not (yet) confirmed in IPMI Spec or Errata 4 +#ifdef HAVE_SHA256 + case 15: // Note: Cipher Suite ID 15 is in in IPMI Spec or Errata 7 *auth_alg = IPMI_AUTH_RAKP_HMAC_SHA256; *integrity_alg = IPMI_INTEGRITY_NONE; *crypt_alg = IPMI_CRYPT_NONE; break; - case 16: // Note: Cipher Suite ID not (yet) confirmed in IPMI Spec or Errata 4 + case 16: // Note: Cipher Suite ID 16 is in in IPMI Spec or Errata 7 *auth_alg = IPMI_AUTH_RAKP_HMAC_SHA256; *integrity_alg = IPMI_INTEGRITY_HMAC_SHA256_128; *crypt_alg = IPMI_CRYPT_NONE; break; -#endif -#ifdef HAVE_SHA256 - /* based on an MD5_SHA256 patch from Holger Liebig */ case 17: // Note: Cipher Suite Id from DCMI 1.1 Spec *auth_alg = IPMI_AUTH_RAKP_HMAC_SHA256; *integrity_alg = IPMI_INTEGRITY_HMAC_SHA256_128; *crypt_alg = IPMI_CRYPT_AES_CBC_128; break; + /* HAVE_SHA256: based on an MD5_SHA256 patch from Holger Liebig */ #endif default: lprintf(LOG_ERR, "invalid cipher suite id %d",cipher_suite_id); diff --git a/lib/libipmiutil.pc b/lib/libipmiutil.pc index b6e9013..e0a9bc0 100644 --- a/lib/libipmiutil.pc +++ b/lib/libipmiutil.pc @@ -8,6 +8,6 @@ nutuser=@RUN_AS_USER@ Name: libipmiutil Description: Library for ipmiutil -Version: 2.9.8 +Version: 2.9.9 Libs: -L${libdir} -lipmi_lanplus Cflags: -I${includedir} |