Date: Mon, 4 Aug 2014 17:37:58 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364033 - head/archivers/unrar/files Message-ID: <53dfc4f6.504e.2fba4c@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Mon Aug 4 17:37:58 2014 New Revision: 364033 URL: http://svnweb.freebsd.org/changeset/ports/364033 QAT: https://qat.redports.org/buildarchive/r364033/ Log: - Fix build without OPENSSL_AES PR: ports/192371 Submitted by: Zsolt Udvari <udvzsolt@gmail.com> Modified: head/archivers/unrar/files/patch-rijndael.hpp Modified: head/archivers/unrar/files/patch-rijndael.hpp ============================================================================== --- head/archivers/unrar/files/patch-rijndael.hpp Mon Aug 4 17:31:14 2014 (r364032) +++ head/archivers/unrar/files/patch-rijndael.hpp Mon Aug 4 17:37:58 2014 (r364033) @@ -1,5 +1,5 @@ --- rijndael.hpp.orig 2014-06-11 01:14:06.000000000 +0800 -+++ rijndael.hpp 2014-07-31 22:47:47.292079919 +0800 ++++ rijndael.hpp 2014-08-05 01:31:59.971584264 +0800 @@ -16,6 +16,9 @@ class Rijndael { @@ -10,7 +10,7 @@ #ifdef USE_SSE void blockEncryptSSE(const byte *input,size_t numBlocks,byte *outBuffer); void blockDecryptSSE(const byte *input, size_t numBlocks, byte *outBuffer); -@@ -25,14 +28,17 @@ +@@ -25,6 +28,7 @@ void keySched(byte key[_MAX_KEY_COLUMNS][4]); void keyEncToDec(); void GenerateTables(); @@ -18,13 +18,3 @@ // RAR always uses CBC, but we may need to turn it off when calling // this code from other archive formats with CTR and other modes. - bool CBCMode; - -+#ifdef OPENSSL_AES - int m_uRounds; - byte m_initVector[MAX_IV_SIZE]; - byte m_expandedKey[_MAX_ROUNDS+1][4][4]; -+#endif // OPENSSL_AES - public: - Rijndael(); - void Init(bool Encrypt,const byte *key,uint keyLen,const byte *initVector);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53dfc4f6.504e.2fba4c>