From owner-svn-ports-head@FreeBSD.ORG Mon Aug 4 17:37:58 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B5CF8E14 for ; Mon, 4 Aug 2014 17:37:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8B287210B for ; Mon, 4 Aug 2014 17:37:58 +0000 (UTC) Received: from sunpoet (uid 1240) (envelope-from sunpoet@FreeBSD.org) id 504e by svn.freebsd.org (DragonFly Mail Agent v0.9+); Mon, 04 Aug 2014 17:37:58 +0000 From: Sunpoet Po-Chuan Hsieh Date: Mon, 4 Aug 2014 17:37:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364033 - head/archivers/unrar/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53dfc4f6.504e.2fba4c@svn.freebsd.org> X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Aug 2014 17:37:58 -0000 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 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);