diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile index a618d03edb40..20561cf32ca5 100644 --- a/archivers/unrar/Makefile +++ b/archivers/unrar/Makefile @@ -1,43 +1,43 @@ PORTNAME= unrar -PORTVERSION= 7.00 +PORTVERSION= 7.01 PORTEPOCH= 6 CATEGORIES= archivers MASTER_SITES= https://www.rarlab.com/rar/ -DISTNAME= unrarsrc-7.0.7 +DISTNAME= unrarsrc-7.0.9 MAINTAINER?= sunpoet@FreeBSD.org COMMENT= Extract, view & test RAR archives WWW= https://www.rarlab.com/ LICENSE= UNRAR LICENSE_NAME= UnRAR license LICENSE_FILE= ${WRKSRC}/license.txt LICENSE_PERMS= auto-accept dist-mirror pkg-mirror USES= compiler:c++11-lang cpe LDFLAGS+= -lpthread MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" STRIP="${STRIP_CMD}" MAKEFILE= makefile WRKSRC= ${WRKDIR}/unrar PLIST_FILES= bin/unrar SLAVEDIRS= archivers/unrar-iconv CONFLICTS_INSTALL= unrar-iconv CPE_VENDOR= rarlab OPTIONS_DEFINE= OPENSSL_AES OPTIONS_DEFAULT=OPENSSL_AES OPENSSL_AES_DESC= Use OpenSSL implementation of AES OPENSSL_AES_CPPFLAGS= -DOPENSSL_AES -I${OPENSSLINC} OPENSSL_AES_LDFLAGS= ${${OPENSSLLIB} == /usr/lib :? :-L${OPENSSLLIB}} -lcrypto OPENSSL_AES_USES= ssl do-install: ${INSTALL_PROGRAM} ${WRKSRC}/unrar ${STAGEDIR}${PREFIX}/bin/ .include diff --git a/archivers/unrar/distinfo b/archivers/unrar/distinfo index 4103e4a3a998..a5deeaa4fa2f 100644 --- a/archivers/unrar/distinfo +++ b/archivers/unrar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1709390346 -SHA256 (unrarsrc-7.0.7.tar.gz) = da95829c7e66fe461c06eb4bea8145e58d88d76909432d0875cd1ff86669f728 -SIZE (unrarsrc-7.0.7.tar.gz) = 258219 +TIMESTAMP = 1716448638 +SHA256 (unrarsrc-7.0.9.tar.gz) = 505c13f9e4c54c01546f2e29b2fcc2d7fabc856a060b81e5cdfe6012a9198326 +SIZE (unrarsrc-7.0.9.tar.gz) = 258287 diff --git a/archivers/unrar/files/patch-rijndael.cpp b/archivers/unrar/files/patch-rijndael.cpp index 5a4d38cb0abf..87a02086af3c 100644 --- a/archivers/unrar/files/patch-rijndael.cpp +++ b/archivers/unrar/files/patch-rijndael.cpp @@ -1,159 +1,160 @@ ---- rijndael.cpp.orig 2024-02-26 09:03:53 UTC +--- rijndael.cpp.orig 2024-05-12 10:19:02 UTC +++ rijndael.cpp @@ -3,6 +3,7 @@ **************************************************************************/ #include "rar.hpp" +#if !defined(OPENSSL_AES) #ifdef USE_SSE #include #endif @@ -74,6 +75,7 @@ inline void Copy128(byte *dest,const byte *src) dest[I]=src[I]; #endif } +#endif // OPENSSL_AES ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -@@ -82,20 +84,49 @@ Rijndael::Rijndael() +@@ -82,21 +84,50 @@ Rijndael::Rijndael() Rijndael::Rijndael() { +#if !defined(OPENSSL_AES) if (S5[0]==0) GenerateTables(); +#endif // OPENSSL_AES + m_uRounds = 0; CBCMode = true; // Always true for RAR. +#if !defined(OPENSSL_AES) #ifdef USE_SSE AES_NI=false; #endif #ifdef USE_NEON_AES AES_Neon=false; #endif +#endif // OPENSSL_AES } void Rijndael::Init(bool Encrypt,const byte *key,uint keyLen,const byte * initVector) { +#if defined(OPENSSL_AES) + const EVP_CIPHER *cipher; + switch(keyLen) + { + case 128: + cipher = EVP_aes_128_cbc(); + break; + case 192: + cipher = EVP_aes_192_cbc(); + break; + case 256: + cipher = EVP_aes_256_cbc(); + break; + } + +#if OPENSSL_VERSION_NUMBER < 0x10100000L + EVP_CIPHER_CTX_init(&ctx); + EVP_CipherInit_ex(&ctx, cipher, NULL, key, initVector, Encrypt); + EVP_CIPHER_CTX_set_padding(&ctx, 0); +#else // OPENSSL_VERSION_NUMBER + EVP_CIPHER_CTX_init(ctx); + EVP_CipherInit_ex(ctx, cipher, NULL, key, initVector, Encrypt); + EVP_CIPHER_CTX_set_padding(ctx, 0); +#endif // OPENSSL_VERSION_NUMBER +#else // OPENSSL_AES // Check SIMD here instead of constructor, so if object is a part of some // structure memset'ed before use, these variables are not lost. #if defined(USE_SSE) -@@ -165,6 +196,7 @@ void Rijndael::Init(bool Encrypt,const byte *key,uint +@@ -166,6 +197,7 @@ void Rijndael::Init(bool Encrypt,const byte *key,uint if(!Encrypt) keyEncToDec(); +#endif // OPENSSL_AES } -@@ -173,6 +205,15 @@ void Rijndael::blockEncrypt(const byte *input,size_t i +@@ -174,6 +206,15 @@ void Rijndael::blockEncrypt(const byte *input,size_t i if (inputLen <= 0) return; +#if defined(OPENSSL_AES) + int outLen; +#if OPENSSL_VERSION_NUMBER < 0x10100000L + EVP_CipherUpdate(&ctx, outBuffer, &outLen, input, inputLen); +#else // OPENSSL_VERSION_NUMBER + EVP_CipherUpdate(ctx, outBuffer, &outLen, input, inputLen); +#endif // OPENSSL_VERSION_NUMBER + return; +#else // OPENSSL_AES size_t numBlocks = inputLen/16; #if defined(USE_SSE) if (AES_NI) -@@ -237,9 +278,11 @@ void Rijndael::blockEncrypt(const byte *input,size_t i +@@ -238,9 +279,11 @@ void Rijndael::blockEncrypt(const byte *input,size_t i input += 16; } Copy128(m_initVector,prevBlock); +#endif // OPENSSL_AES } +#if !defined(OPENSSL_AES) #ifdef USE_SSE void Rijndael::blockEncryptSSE(const byte *input,size_t numBlocks,byte *outBuffer) { -@@ -305,6 +348,7 @@ void Rijndael::blockEncryptNeon(const byte *input,size +@@ -306,6 +349,7 @@ void Rijndael::blockEncryptNeon(const byte *input,size return; } #endif +#endif // OPENSSL_AES void Rijndael::blockDecrypt(const byte *input, size_t inputLen, byte *outBuffer) -@@ -312,6 +356,15 @@ void Rijndael::blockDecrypt(const byte *input, size_t +@@ -313,6 +357,15 @@ void Rijndael::blockDecrypt(const byte *input, size_t if (inputLen <= 0) return; +#if defined(OPENSSL_AES) + int outLen; +#if OPENSSL_VERSION_NUMBER < 0x10100000L + EVP_CipherUpdate(&ctx, outBuffer, &outLen, input, inputLen); +#else // OPENSSL_VERSION_NUMBER + EVP_CipherUpdate(ctx, outBuffer, &outLen, input, inputLen); +#endif // OPENSSL_VERSION_NUMBER + return; +#else // OPENSSL_AES size_t numBlocks=inputLen/16; #if defined(USE_SSE) if (AES_NI) -@@ -380,9 +433,11 @@ void Rijndael::blockDecrypt(const byte *input, size_t +@@ -381,9 +434,11 @@ void Rijndael::blockDecrypt(const byte *input, size_t } memcpy(m_initVector,iv,16); +#endif // OPENSSL_AES } +#if !defined(OPENSSL_AES) #ifdef USE_SSE void Rijndael::blockDecryptSSE(const byte *input, size_t numBlocks, byte *outBuffer) { -@@ -449,8 +504,10 @@ void Rijndael::blockDecryptNeon(const byte *input, siz +@@ -450,8 +505,10 @@ void Rijndael::blockDecryptNeon(const byte *input, siz memcpy(m_initVector,iv,16); } #endif +#endif // OPENSSL_AES +#if !defined(OPENSSL_AES) ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // ALGORITHM ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -@@ -579,6 +636,7 @@ void Rijndael::GenerateTables() +@@ -580,6 +637,7 @@ void Rijndael::GenerateTables() U1[b][0]=U2[b][1]=U3[b][2]=U4[b][3]=T5[I][0]=T6[I][1]=T7[I][2]=T8[I][3]=gmul(b,0xe); } } +#endif // OPENSSL_AES #if 0