summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-03-30 16:52:34 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-03-30 16:52:34 +0200
commit631fa5250443f5441549bf3184830bc34b0c042e (patch)
tree78fbc8dcfbe36b7f3499c4dc5c3017435d6fb2a1 /lib
parent09863e30b4f27257be0299024d5a0de255f8ea84 (diff)
parentdf5450149923efb0366001947c1456ed442bc4bb (diff)
Merge branch 'release/3.0.8-1'3.0.8-1
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile30
-rw-r--r--lib/lanplus/lanplus_crypt_impl.c25
-rw-r--r--lib/libipmiutil.pc2
3 files changed, 39 insertions, 18 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 93b57de..f56f858 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-3.0.7/missing --run aclocal-1.11
-AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.7/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.0.8/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.8/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.7/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.7/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.7/missing --run automake-1.11
+AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.8/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.8/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.8/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-3.0.7/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.0.8/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
NM = /usr/bin/nm -B
NMEDIT =
OBJDUMP = objdump
OBJEXT = o
-OS_CFLAGS = -DLINUX -fPIC -Wno-pointer-sign -Wno-sign-conversion -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2
+OS_CFLAGS = -DLINUX -fPIC -Wno-pointer-sign -Wno-sign-conversion -fno-strict-aliasing -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 3.0.7
+PACKAGE_STRING = ipmiutil 3.0.8
PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 3.0.7
+PACKAGE_VERSION = 3.0.8
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 = 3.0.7
-abs_builddir = /usr/dev/ipmiutil-3.0.7/lib
-abs_srcdir = /usr/dev/ipmiutil-3.0.7/lib
-abs_top_builddir = /usr/dev/ipmiutil-3.0.7
-abs_top_srcdir = /usr/dev/ipmiutil-3.0.7
+VERSION = 3.0.8
+abs_builddir = /usr/dev/ipmiutil-3.0.8/lib
+abs_srcdir = /usr/dev/ipmiutil-3.0.8/lib
+abs_top_builddir = /usr/dev/ipmiutil-3.0.8
+abs_top_srcdir = /usr/dev/ipmiutil-3.0.8
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-3.0.7/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-3.0.8/install-sh
libdir = $(iprefix)/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
diff --git a/lib/lanplus/lanplus_crypt_impl.c b/lib/lanplus/lanplus_crypt_impl.c
index 1daf230..389a436 100644
--- a/lib/lanplus/lanplus_crypt_impl.c
+++ b/lib/lanplus/lanplus_crypt_impl.c
@@ -41,7 +41,27 @@
#include <openssl/err.h>
#include <assert.h>
-
+#ifdef WIN32
+/* win_rand_filename
+ Custom RAND_file_name routine to use better path than C:\
+ Use: %USERPROFILE%, %HOME%, %HOMEPATH%,
+ USERPROFILE=C:\Users\acress
+ HOMEDRIVE=C:
+ HOMEPATH=\Users\acress
+ */
+char *win_rand_filename(char *buffer, int bufsz)
+{
+ char *root = "C:\\";
+ char *envpath = NULL;
+
+ envpath = getenv("USERPROFILE");
+ if ((envpath == NULL) || (envpath[0] == '\0')) {
+ envpath = root;
+ }
+ snprintf(buffer,bufsz,"%s\\.rnd",envpath);
+ return(buffer);
+}
+#endif
/*
* lanplus_seed_prng
@@ -60,7 +80,8 @@ int lanplus_seed_prng(uint32_t bytes)
char buffer[200];
static FILE *fp = NULL;
size_t i;
- randfile = RAND_file_name(buffer, sizeof buffer); /* usu C:\.rnd */
+ // randfile = RAND_file_name(buffer, sizeof buffer); /* usu C:\.rnd */
+ randfile = win_rand_filename(buffer, sizeof buffer);
if ((randfile != NULL) && (fp == NULL)) {
fp = fopen(randfile,"r"); /*check the randfile*/
if (fp == NULL) { /*does not exist, create it*/
diff --git a/lib/libipmiutil.pc b/lib/libipmiutil.pc
index 53f78b8..81d8d4e 100644
--- a/lib/libipmiutil.pc
+++ b/lib/libipmiutil.pc
@@ -8,6 +8,6 @@ nutuser=@RUN_AS_USER@
Name: libipmiutil
Description: Library for ipmiutil
-Version: 3.0.7
+Version: 3.0.8
Libs: -L${libdir} -lipmi_lanplus
Cflags: -I${includedir}