aboutsummaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2014-08-04 17:37:58 +0000
committerSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2014-08-04 17:37:58 +0000
commit5bcd83db63db175308a0fccda30a95c8c5c6415e (patch)
tree105def9f03fafeb858cea96b27896d06eb14e076 /archivers
parent84204fa15af90cc2aafc7607af4826b8dc1c6def (diff)
downloadports-5bcd83db63db175308a0fccda30a95c8c5c6415e.tar.gz
ports-5bcd83db63db175308a0fccda30a95c8c5c6415e.zip
- Fix build without OPENSSL_AES
PR: ports/192371 Submitted by: Zsolt Udvari <udvzsolt@gmail.com>
Notes
Notes: svn path=/head/; revision=364033
Diffstat (limited to 'archivers')
-rw-r--r--archivers/unrar/files/patch-rijndael.hpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/archivers/unrar/files/patch-rijndael.hpp b/archivers/unrar/files/patch-rijndael.hpp
index d37dc6620330..b1468473a557 100644
--- a/archivers/unrar/files/patch-rijndael.hpp
+++ b/archivers/unrar/files/patch-rijndael.hpp
@@ -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);