diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2014-07-31 15:11:55 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2014-07-31 15:11:55 +0000 |
| commit | 1d16cf243a212499ae3ee66630392c003e09e69a (patch) | |
| tree | 7b1c933444f922d08491d3d53842f84df95c6456 /archivers/unrar/files/patch-rijndael.hpp | |
| parent | net/py-s3cmd: update to 1.5.0 (diff) | |
- Update to 5.10 (5.1.6)
Notes
Notes:
svn path=/head/; revision=363593
Diffstat (limited to 'archivers/unrar/files/patch-rijndael.hpp')
| -rw-r--r-- | archivers/unrar/files/patch-rijndael.hpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/archivers/unrar/files/patch-rijndael.hpp b/archivers/unrar/files/patch-rijndael.hpp index 816a0c91aad3..d37dc6620330 100644 --- a/archivers/unrar/files/patch-rijndael.hpp +++ b/archivers/unrar/files/patch-rijndael.hpp @@ -1,5 +1,5 @@ ---- rijndael.hpp.orig 2013-12-01 16:10:14.000000000 +0800 -+++ rijndael.hpp 2014-02-04 08:48:42.137144316 +0800 +--- rijndael.hpp.orig 2014-06-11 01:14:06.000000000 +0800 ++++ rijndael.hpp 2014-07-31 22:47:47.292079919 +0800 @@ -16,6 +16,9 @@ class Rijndael { @@ -7,10 +7,20 @@ +#ifdef OPENSSL_AES + EVP_CIPHER_CTX ctx; +#else // OPENSSL_AES + #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 @@ void keySched(byte key[_MAX_KEY_COLUMNS][4]); void keyEncToDec(); - void encrypt(const byte a[16], byte b[16]); -@@ -25,6 +28,7 @@ + void GenerateTables(); ++#endif // OPENSSL_AES + + // 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]; |