diff --git a/Benchmark/BinSearch.hs b/Benchmark/BinSearch.hs --- a/Benchmark/BinSearch.hs +++ b/Benchmark/BinSearch.hs @@ -34,7 +34,6 @@ import Data.Time.Clock -- Not in 6.10 import Data.List import Data.IORef -import System import System.IO import System.Cmd import System.Exit diff --git a/Codec/Crypto/ConvertRNG.hs b/Codec/Crypto/ConvertRNG.hs --- a/Codec/Crypto/ConvertRNG.hs +++ b/Codec/Crypto/ConvertRNG.hs @@ -149,12 +149,12 @@ genSeedLength = Tagged 128 -- If this is called for less than blockSize data there's some waste but it should work. - genBytes req (BCtoCRG (bcgen :: k) counter) = + genBytes req (BCtoCRG (bcgen :: x) counter) = -- What's the most efficient way to do this? unsafePerformIO $ do -- Potentially heavyweight... not allowing dupable. -- unsafeDupablePerformIO $ do -- Number of times to stamp out the counter: - let bsize = untag (blockSizeBytes :: Tagged k ByteLength) + let bsize = untag (blockSizeBytes :: Tagged x ByteLength) numstamps = (req + 7) `quot` 8 numblocks = (req + bsize - 1) `quot` bsize total = max (numstamps * 8) (numblocks * bsize) diff --git a/Codec/Encryption/AES.hs b/Codec/Encryption/AES.hs --- a/Codec/Encryption/AES.hs +++ b/Codec/Encryption/AES.hs @@ -1,6 +1,6 @@ -- RRN: TEMPORARILY DUPLICATED FROM Crypto PACKAGE!!! -{-# LANGUAGE TypeSynonymInstances, PackageImports #-} +{-# LANGUAGE TypeSynonymInstances, PackageImports, FlexibleInstances #-} ----------------------------------------------------------------------------- -- | -- Module : Codec.Encryption.AES diff --git a/Setup.hs b/Setup.hs --- a/Setup.hs +++ b/Setup.hs @@ -118,7 +118,7 @@ putStrLn$ " [intel-aes] Using prebuilt dynamic library: "++ cached_so copyFile cached_so dest putStrLn$ " [intel-aes] Done copying into position: "++ dest - else do + else do putStrLn$ " [intel-aes] Running Makefile to build C/asm source..." rootdir <- getCurrentDirectory setCurrentDirectory "./cbits/" diff --git a/System/Random/AES.hs b/System/Random/AES.hs --- a/System/Random/AES.hs +++ b/System/Random/AES.hs @@ -21,7 +21,7 @@ -} {-# OPTIONS_GHC -fwarn-unused-imports #-} -{-# LANGUAGE ForeignFunctionInterface, CPP, ScopedTypeVariables #-} +{-# LANGUAGE ForeignFunctionInterface, CPP, ScopedTypeVariables #-} module System.Random.AES ( diff --git a/cbits/Intel_AESNI_Sample_Library_v1.0/intel_aes_lib/where_files_come_from_and_lice b/cbits/Intel_AESNI_Sample_Library_v1.0/intel_aes_lib/where_files_come_from_and_lice deleted file mode 100644 --- a/cbits/Intel_AESNI_Sample_Library_v1.0/intel_aes_lib/where_files_come_from_and_lice +++ /dev/null @@ -1,34 +0,0 @@ -/* intel_aes_lib source files come from Intel. - * Modified by Patrick Fay - * -Copyright (c) 2010, Intel Corporation -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - --------------------------------------------------------------------------- - Issue Date: Aug 6, 2010 - */ - -Other source code files use the license shown in the source code file. diff --git a/cbits/Intel_AESNI_Sample_Library_v1.0/intel_aes_lib/where_files_come_from_and_license.txt b/cbits/Intel_AESNI_Sample_Library_v1.0/intel_aes_lib/where_files_come_from_and_license.txt new file mode 100644 --- /dev/null +++ b/cbits/Intel_AESNI_Sample_Library_v1.0/intel_aes_lib/where_files_come_from_and_license.txt @@ -0,0 +1,34 @@ +/* intel_aes_lib source files come from Intel. + * Modified by Patrick Fay + * +Copyright (c) 2010, Intel Corporation +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + --------------------------------------------------------------------------- + Issue Date: Aug 6, 2010 + */ + +Other source code files use the license shown in the source code file. diff --git a/cbits/prebuilt/libintel_aes_darwin_x86_64.dylib b/cbits/prebuilt/libintel_aes_darwin_x86_64.dylib new file mode 100644 Binary files /dev/null and b/cbits/prebuilt/libintel_aes_darwin_x86_64.dylib differ diff --git a/cbits/prebuilt/libintel_aes_linux_x86_64.so b/cbits/prebuilt/libintel_aes_linux_x86_64.so new file mode 100644 Binary files /dev/null and b/cbits/prebuilt/libintel_aes_linux_x86_64.so differ diff --git a/intel-aes.cabal b/intel-aes.cabal --- a/intel-aes.cabal +++ b/intel-aes.cabal @@ -1,8 +1,9 @@ Name: intel-aes -Version: 0.2.0.0 +Version: 0.2.1.0 -- 0.1.2.4 -- minor bump for David (dmpots) Mac OS support -- 0.2.0.0 -- major bump for API reorg +-- 0.2.1.0 -- include prebuilts and tested with 6.12, 7.0, 7.2 License: BSD3 License-file: LICENSE @@ -11,7 +12,7 @@ Author: Ryan Newton , Svein Ove Aas , Thomas M. DuBuisson Copyright: Copyright (c) 2011 Intel Corporation -Synopsis: Hardware accelerated AES encryption and RNG. +Synopsis: Hardware accelerated AES encryption and Random Number Generation. HomePage: https://github.com/rrnewton/intel-aes/wiki Description: AES encryption with optional hardware acceleration. Plus, @@ -32,7 +33,7 @@ problems. A manually built copy of the documentation can be found at: - + -- Here are some example results from an Intel X5680 processor. @@ -79,7 +80,12 @@ , cbits/gladman/brg_endian.h, cbits/gladman/brg_types.h, cbits/gladman/aes.txt , cbits/gladman/aes_via_ace.h, cbits/gladman/ctr_inc.h + , benchmark-intel-aes-rng.hs + , cbits/prebuilt/libintel_aes_linux_x86_64.so + , cbits/prebuilt/libintel_aes_darwin_x86_64.dylib + + source-repository head type: git location: git://github.com/rrnewton/intel-aes.git @@ -87,7 +93,7 @@ ---------------------------------------------------------------------------------------------------- library - build-depends: base >= 4 && < 5, random, DRBG, split, process, haskell98, time, + build-depends: base >= 4 && < 5, random, DRBG, split, process, time, crypto-api >= 0.5, bytestring, cereal, tagged, largeword, -- For AES.Tests only: