ipmitool: update to 1.8.19.
This commit is contained in:
@@ -1,89 +0,0 @@
|
||||
diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
|
||||
--- a/src/plugins/lanplus/lanplus_crypt_impl.c 2016-05-28 10:20:20.000000000 +0200
|
||||
+++ b/src/plugins/lanplus/lanplus_crypt_impl.c 2017-02-21 10:50:21.634873466 +0100
|
||||
@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
|
||||
uint8_t * output,
|
||||
uint32_t * bytes_written)
|
||||
{
|
||||
- EVP_CIPHER_CTX ctx;
|
||||
- EVP_CIPHER_CTX_init(&ctx);
|
||||
- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
|
||||
- EVP_CIPHER_CTX_set_padding(&ctx, 0);
|
||||
+ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
|
||||
+ EVP_CIPHER_CTX_init(ctx);
|
||||
+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
|
||||
+ EVP_CIPHER_CTX_set_padding(ctx, 0);
|
||||
|
||||
|
||||
*bytes_written = 0;
|
||||
@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
|
||||
assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
|
||||
|
||||
|
||||
- if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
|
||||
+ if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
|
||||
{
|
||||
/* Error */
|
||||
*bytes_written = 0;
|
||||
@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
|
||||
{
|
||||
uint32_t tmplen;
|
||||
|
||||
- if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
|
||||
+ if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
|
||||
{
|
||||
*bytes_written = 0;
|
||||
return; /* Error */
|
||||
@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
|
||||
{
|
||||
/* Success */
|
||||
*bytes_written += tmplen;
|
||||
- EVP_CIPHER_CTX_cleanup(&ctx);
|
||||
+ EVP_CIPHER_CTX_cleanup(ctx);
|
||||
+ EVP_CIPHER_CTX_free(ctx);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
|
||||
uint8_t * output,
|
||||
uint32_t * bytes_written)
|
||||
{
|
||||
- EVP_CIPHER_CTX ctx;
|
||||
- EVP_CIPHER_CTX_init(&ctx);
|
||||
- EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
|
||||
- EVP_CIPHER_CTX_set_padding(&ctx, 0);
|
||||
+ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
|
||||
+ EVP_CIPHER_CTX_init(ctx);
|
||||
+ EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
|
||||
+ EVP_CIPHER_CTX_set_padding(ctx, 0);
|
||||
|
||||
|
||||
if (verbose >= 5)
|
||||
@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
|
||||
assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
|
||||
|
||||
|
||||
- if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
|
||||
+ if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
|
||||
{
|
||||
/* Error */
|
||||
lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
|
||||
@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
|
||||
{
|
||||
uint32_t tmplen;
|
||||
|
||||
- if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
|
||||
+ if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
|
||||
{
|
||||
char buffer[1000];
|
||||
ERR_error_string(ERR_get_error(), buffer);
|
||||
@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
|
||||
{
|
||||
/* Success */
|
||||
*bytes_written += tmplen;
|
||||
- EVP_CIPHER_CTX_cleanup(&ctx);
|
||||
+ EVP_CIPHER_CTX_cleanup(ctx);
|
||||
+ EVP_CIPHER_CTX_free(ctx);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -56,18 +56,8 @@
|
||||
exec_prefix="$prefix"
|
||||
fi
|
||||
|
||||
-if test "x$WGET" = "x"; then
|
||||
- if test "x$CURL" = "x"; then
|
||||
- AC_MSG_WARN([** Neither wget nor curl could be found.])
|
||||
- AC_MSG_WARN([** IANA PEN database will not be installed by `make install` !])
|
||||
- else
|
||||
- DOWNLOAD="$CURL --location --progress-bar"
|
||||
- AM_CONDITIONAL([DOWNLOAD], [true])
|
||||
- fi
|
||||
-else
|
||||
- DOWNLOAD="$WGET -c -nd -O -"
|
||||
- AM_CONDITIONAL([DOWNLOAD], [true])
|
||||
-fi
|
||||
+DOWNLOAD=
|
||||
+AM_CONDITIONAL([DOWNLOAD], [false])
|
||||
|
||||
AC_MSG_WARN([** Download is:])
|
||||
AC_MSG_WARN($DOWNLOAD)
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -69,9 +69,9 @@
|
||||
|
||||
else
|
||||
|
||||
-install-pen-database:
|
||||
- @echo "*** NOT installing the IANA PEN database."
|
||||
- @echo "*** Don't know how to download it."
|
||||
+install-pen-database:
|
||||
+ mkdir -m 755 -p $(DESTDIR)$(IANADIR)
|
||||
+ $(INSTALL_DATA) enterprise-numbers $(DESTDIR)$(IANADIR)/
|
||||
|
||||
uninstall-pen-database:
|
||||
@echo "*** NOT uninstalling the IANA PEN database."
|
||||
@@ -1,19 +1,34 @@
|
||||
# Template file for 'ipmitool'
|
||||
pkgname=ipmitool
|
||||
version=1.8.18
|
||||
revision=10
|
||||
version=1.8.19
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
makedepends="openssl-devel"
|
||||
build_wrksrc="ipmitool-IPMITOOL_${version//\./_}"
|
||||
hostmakedepends="autoconf automake libtool pkg-config"
|
||||
makedepends="openssl-devel readline-devel"
|
||||
short_desc="Command-line interface to IPMI-enabled devices"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
license="BSD-3-Clause"
|
||||
homepage="http://ipmitool.sourceforge.net"
|
||||
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
|
||||
checksum=0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01
|
||||
homepage="https://github.com/ipmitool/ipmitool"
|
||||
changelog="https://github.com/ipmitool/ipmitool/raw/refs/heads/master/ChangeLog"
|
||||
distfiles="https://github.com/ipmitool/ipmitool/archive/refs/tags/IPMITOOL_${version//\./_}.tar.gz
|
||||
https://www.iana.org/assignments/enterprise-numbers.txt"
|
||||
checksum="48b010e7bcdf93e4e4b6e43c53c7f60aa6873d574cbd45a8d86fa7aaeebaff9c
|
||||
69e67e527450b75a0fe9b9ce95c9b62d7c4bce6db05e47fab63c11ab12a6a6af"
|
||||
|
||||
CFLAGS="-fcommon"
|
||||
skip_extraction="enterprise-numbers"
|
||||
|
||||
patch_args="-Np1 -d ${build_wrksrc}"
|
||||
|
||||
post_extract() {
|
||||
cp enterprise-numbers.txt "${build_wrksrc}/enterprise-numbers"
|
||||
}
|
||||
|
||||
pre_configure() {
|
||||
./bootstrap
|
||||
}
|
||||
|
||||
post_install() {
|
||||
rm -rf ${DESTDIR}/usr/share/doc
|
||||
rm -vrf "${DESTDIR}/usr/share/doc"
|
||||
vlicense COPYING
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user