Security update to 5.50 beta 4 to fix the VMSF_DELTA filter signedness
error and unspecified other issues.
This commit is contained in:
naddy
parent
97d04a1417
commit
54be5b61ab
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.66 2017/04/10 11:45:22 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.67 2017/06/21 21:19:05 naddy Exp $
|
||||
|
||||
COMMENT= extract, list, and test RAR archives
|
||||
|
||||
@ -9,9 +9,9 @@ COMMENT= extract, list, and test RAR archives
|
||||
# to 0 for a non-beta release, e.g., "5.00 beta 8" was succeeded
|
||||
# by "5.00".
|
||||
|
||||
PKGNAME= unrar-5.40
|
||||
PKGNAME= unrar-5.50beta4
|
||||
EPOCH= 1
|
||||
DISTNAME= unrarsrc-5.4.5
|
||||
DISTNAME= unrarsrc-5.5.5
|
||||
CATEGORIES= archivers
|
||||
|
||||
HOMEPAGE= http://www.rarlab.com/
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (unrarsrc-5.4.5.tar.gz) = 5HDFhDMkIok/tS4Enyy9meJNxsbalxAItOKuQoT4eWw=
|
||||
SIZE (unrarsrc-5.4.5.tar.gz) = 226320
|
||||
SHA256 (unrarsrc-5.5.5.tar.gz) = pFU4OcsvAl0NnFYzgWqDpyPjk4IJ8XYgyMFdoG7QYe8=
|
||||
SIZE (unrarsrc-5.5.5.tar.gz) = 220377
|
||||
|
||||
@ -1,20 +1,22 @@
|
||||
$OpenBSD: patch-makefile,v 1.3 2016/11/03 15:20:14 naddy Exp $
|
||||
--- makefile.orig Tue May 10 11:51:35 2016
|
||||
+++ makefile Thu Nov 3 12:59:14 2016
|
||||
@@ -5,10 +5,11 @@
|
||||
$OpenBSD: patch-makefile,v 1.4 2017/06/21 21:19:05 naddy Exp $
|
||||
Index: makefile
|
||||
--- makefile.orig
|
||||
+++ makefile
|
||||
@@ -5,11 +5,12 @@
|
||||
CXX=c++
|
||||
CXXFLAGS=-O2
|
||||
LIBFLAGS=-fPIC
|
||||
-DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
|
||||
+DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP -DOPENSSL_AES
|
||||
STRIP=strip
|
||||
AR=ar
|
||||
LDFLAGS=-pthread
|
||||
DESTDIR=/usr
|
||||
+LIBS=-lcrypto
|
||||
|
||||
# Linux using LCC
|
||||
#CXX=lcc
|
||||
@@ -105,6 +106,8 @@ OBJECTS=rar.o strlist.o strfn.o pathfn.o smallfn.o glo
|
||||
@@ -127,6 +128,8 @@ OBJECTS=rar.o strlist.o strfn.o pathfn.o smallfn.o glo
|
||||
resource.o match.o timefn.o rdwrfn.o consio.o options.o errhnd.o rarvm.o secpassword.o \
|
||||
rijndael.o getbits.o sha1.o sha256.o blake2s.o hash.o extinfo.o extract.o volume.o \
|
||||
list.o find.o unpack.o headers.o threadpool.o rs16.o cmddata.o ui.o
|
||||
|
||||
@ -1,15 +1,16 @@
|
||||
$OpenBSD: patch-os_hpp,v 1.12 2015/04/03 11:58:51 naddy Exp $
|
||||
--- os.hpp.orig Sun Feb 15 09:02:48 2015
|
||||
+++ os.hpp Fri Apr 3 13:57:04 2015
|
||||
@@ -137,6 +137,7 @@
|
||||
#endif
|
||||
#endif
|
||||
#if defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined(__APPLE__)
|
||||
$OpenBSD: patch-os_hpp,v 1.13 2017/06/21 21:19:05 naddy Exp $
|
||||
Index: os.hpp
|
||||
--- os.hpp.orig
|
||||
+++ os.hpp
|
||||
@@ -119,6 +119,7 @@
|
||||
|
||||
#define NM 2048
|
||||
|
||||
+#include <machine/endian.h>
|
||||
#endif
|
||||
#include <pwd.h>
|
||||
#include <grp.h>
|
||||
@@ -156,6 +157,10 @@
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
@@ -150,6 +151,10 @@
|
||||
#include <locale.h>
|
||||
|
||||
|
||||
@ -20,7 +21,7 @@ $OpenBSD: patch-os_hpp,v 1.12 2015/04/03 11:58:51 naddy Exp $
|
||||
#ifdef S_IFLNK
|
||||
#define SAVE_LINKS
|
||||
#endif
|
||||
@@ -242,7 +247,7 @@
|
||||
@@ -245,7 +250,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
$OpenBSD: patch-rijndael_cpp,v 1.3 2014/09/08 18:54:30 naddy Exp $
|
||||
--- rijndael.cpp.orig Tue Jun 10 19:14:06 2014
|
||||
+++ rijndael.cpp Tue Sep 2 22:58:36 2014
|
||||
$OpenBSD: patch-rijndael_cpp,v 1.4 2017/06/21 21:19:05 naddy Exp $
|
||||
Index: rijndael.cpp
|
||||
--- rijndael.cpp.orig
|
||||
+++ rijndael.cpp
|
||||
@@ -11,6 +11,8 @@
|
||||
#include <wmmintrin.h>
|
||||
#endif
|
||||
@ -61,8 +62,28 @@ $OpenBSD: patch-rijndael_cpp,v 1.3 2014/09/08 18:54:30 naddy Exp $
|
||||
+#endif // OPENSSL_AES
|
||||
}
|
||||
|
||||
void Rijndael::blockEncrypt(const byte *input,size_t inputLen,byte *outBuffer)
|
||||
@@ -118,6 +143,11 @@ void Rijndael::blockEncrypt(const byte *input,size_t i
|
||||
if (inputLen <= 0)
|
||||
return;
|
||||
|
||||
@@ -120,6 +145,11 @@ void Rijndael::blockDecrypt(const byte *input, size_t
|
||||
+#ifdef OPENSSL_AES
|
||||
+ int outLen;
|
||||
+ EVP_CipherUpdate(&ctx, outBuffer, &outLen, input, inputLen);
|
||||
+ return;
|
||||
+#else // OPENSSL_AES
|
||||
size_t numBlocks = inputLen/16;
|
||||
#ifdef USE_SSE
|
||||
if (AES_NI)
|
||||
@@ -176,6 +206,7 @@ void Rijndael::blockEncrypt(const byte *input,size_t i
|
||||
input += 16;
|
||||
}
|
||||
Copy128(m_initVector,prevBlock);
|
||||
+#endif // OPENSSL_AES
|
||||
}
|
||||
|
||||
|
||||
@@ -217,6 +248,11 @@ void Rijndael::blockDecrypt(const byte *input, size_t
|
||||
if (inputLen <= 0)
|
||||
return;
|
||||
|
||||
@ -74,7 +95,7 @@ $OpenBSD: patch-rijndael_cpp,v 1.3 2014/09/08 18:54:30 naddy Exp $
|
||||
size_t numBlocks=inputLen/16;
|
||||
#ifdef USE_SSE
|
||||
if (AES_NI)
|
||||
@@ -182,6 +212,7 @@ void Rijndael::blockDecrypt(const byte *input, size_t
|
||||
@@ -279,6 +315,7 @@ void Rijndael::blockDecrypt(const byte *input, size_t
|
||||
}
|
||||
|
||||
memcpy(m_initVector,iv,16);
|
||||
@ -82,7 +103,7 @@ $OpenBSD: patch-rijndael_cpp,v 1.3 2014/09/08 18:54:30 naddy Exp $
|
||||
}
|
||||
|
||||
|
||||
@@ -218,6 +249,7 @@ void Rijndael::blockDecryptSSE(const byte *input, size
|
||||
@@ -315,6 +352,7 @@ void Rijndael::blockDecryptSSE(const byte *input, size
|
||||
#endif
|
||||
|
||||
|
||||
@ -90,7 +111,7 @@ $OpenBSD: patch-rijndael_cpp,v 1.3 2014/09/08 18:54:30 naddy Exp $
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// ALGORITHM
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
@@ -358,6 +390,7 @@ void Rijndael::GenerateTables()
|
||||
@@ -455,6 +493,7 @@ void Rijndael::GenerateTables()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user