cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 5.80

Browse Source
This commit is contained in:
naddy 2019-12-29 11:52:10 +00:00
parent 0099224d2e
commit 61d1a052b4
3 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archivers/unrar/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.78 2019/07/12 20:43:30 sthen Exp $
# $OpenBSD: Makefile,v 1.79 2019/12/29 11:52:10 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.71
PKGNAME= unrar-5.80
EPOCH= 2
DISTNAME= unrarsrc-5.7.5
DISTNAME= unrarsrc-5.8.5
CATEGORIES= archivers
HOMEPAGE= https://www.rarlab.com/

4
archivers/unrar/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (unrarsrc-5.7.5.tar.gz) = 4cL92qh6iLFTW/wQykhPPFr05aVfu5M/iBniYgO74u4=
SIZE (unrarsrc-5.7.5.tar.gz) = 228818
SHA256 (unrarsrc-5.8.5.tar.gz) = pyWSOmJ7yLPdZwo0e1dwHhrWH19Oe3idCSRPtLf5eyk=
SIZE (unrarsrc-5.8.5.tar.gz) = 229641

47
archivers/unrar/patches/patch-rijndael_cpp
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-rijndael_cpp,v 1.5 2019/03/09 22:57:53 naddy Exp $
$OpenBSD: patch-rijndael_cpp,v 1.6 2019/12/29 11:52:10 naddy Exp $
Index: rijndael.cpp
--- rijndael.cpp.orig
+++ rijndael.cpp
@@ -11,6 +11,8 @@
#include <wmmintrin.h>
#endif
@@ -7,6 +7,8 @@
***************************************************************************/
#include "rar.hpp"
+#ifndef OPENSSL_AES
+
static byte S[256],S5[256],rcon[30];
static byte T1[256][4],T2[256][4],T3[256][4],T4[256][4];
static byte T5[256][4],T6[256][4],T7[256][4],T8[256][4];
#ifdef USE_SSE
#include <wmmintrin.h>
#endif
@@ -56,6 +58,7 @@ inline void Copy128(byte *dest,const byte *src)
#endif
}
@ -55,7 +55,7 @@ Index: rijndael.cpp
#ifdef USE_SSE
// Check SSE here instead of constructor, so if object is a part of some
// structure memset'ed before use, this variable is not lost.
@@ -114,6 +138,7 @@ void Rijndael::Init(bool Encrypt,const byte *key,uint
@@ -120,6 +144,7 @@ void Rijndael::Init(bool Encrypt,const byte *key,uint
if(!Encrypt)
keyEncToDec();
@ -63,7 +63,7 @@ Index: rijndael.cpp
}
void Rijndael::blockEncrypt(const byte *input,size_t inputLen,byte *outBuffer)
@@ -121,6 +146,11 @@ void Rijndael::blockEncrypt(const byte *input,size_t i
@@ -127,6 +152,11 @@ void Rijndael::blockEncrypt(const byte *input,size_t i
if (inputLen <= 0)
return;
@ -75,7 +75,7 @@ Index: rijndael.cpp
size_t numBlocks = inputLen/16;
#ifdef USE_SSE
if (AES_NI)
@@ -179,6 +209,7 @@ void Rijndael::blockEncrypt(const byte *input,size_t i
@@ -185,9 +215,11 @@ void Rijndael::blockEncrypt(const byte *input,size_t i
input += 16;
}
Copy128(m_initVector,prevBlock);
@ -83,7 +83,19 @@ Index: rijndael.cpp
}
@@ -220,6 +251,11 @@ void Rijndael::blockDecrypt(const byte *input, size_t
+#ifndef OPENSSL_AES
#ifdef USE_SSE
void Rijndael::blockEncryptSSE(const byte *input,size_t numBlocks,byte *outBuffer)
{
@@ -219,6 +251,7 @@ void Rijndael::blockEncryptSSE(const byte *input,size_
_mm_storeu_si128((__m128i*)m_initVector,v);
}
#endif
+#endif // OPENSSL_AES
void Rijndael::blockDecrypt(const byte *input, size_t inputLen, byte *outBuffer)
@@ -226,6 +259,11 @@ void Rijndael::blockDecrypt(const byte *input, size_t
if (inputLen <= 0)
return;
@ -95,7 +107,7 @@ Index: rijndael.cpp
size_t numBlocks=inputLen/16;
#ifdef USE_SSE
if (AES_NI)
@@ -282,6 +318,7 @@ void Rijndael::blockDecrypt(const byte *input, size_t
@@ -288,9 +326,11 @@ void Rijndael::blockDecrypt(const byte *input, size_t
}
memcpy(m_initVector,iv,16);
@ -103,15 +115,22 @@ Index: rijndael.cpp
}
@@ -318,6 +355,7 @@ void Rijndael::blockDecryptSSE(const byte *input, size
+#ifndef OPENSSL_AES
#ifdef USE_SSE
void Rijndael::blockDecryptSSE(const byte *input, size_t numBlocks, byte *outBuffer)
{
@@ -322,8 +362,10 @@ void Rijndael::blockDecryptSSE(const byte *input, size
_mm_storeu_si128((__m128i*)m_initVector,initVector);
}
#endif
+#endif // OPENSSL_AES
+#ifndef OPENSSL_AES
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// ALGORITHM
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -458,6 +496,7 @@ void Rijndael::GenerateTables()
@@ -464,6 +506,7 @@ void Rijndael::GenerateTables()
}
}