diff --git a/Codec/Encryption/OpenPGP/ASCIIArmor.hs b/Codec/Encryption/OpenPGP/ASCIIArmor.hs --- a/Codec/Encryption/OpenPGP/ASCIIArmor.hs +++ b/Codec/Encryption/OpenPGP/ASCIIArmor.hs @@ -1,6 +1,6 @@ -- ASCIIArmor.hs: OpenPGP (RFC4880) ASCII armor implementation -- Copyright © 2012 Clint Adams --- This software is released under the terms of the ISC license. +-- This software is released under the terms of the Expat license. -- (See the LICENSE file). module Codec.Encryption.OpenPGP.ASCIIArmor ( diff --git a/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs b/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs --- a/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs +++ b/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs @@ -1,7 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} -- ASCIIArmor/Decode.hs: OpenPGP (RFC4880) ASCII armor implementation -- Copyright © 2012-2018 Clint Adams --- This software is released under the terms of the ISC license. +-- This software is released under the terms of the Expat license. -- (See the LICENSE file). module Codec.Encryption.OpenPGP.ASCIIArmor.Decode ( diff --git a/Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs b/Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs --- a/Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs +++ b/Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs @@ -1,6 +1,6 @@ -- ASCIIArmor/Encode.hs: OpenPGP (RFC4880) ASCII armor implementation -- Copyright © 2012-2018 Clint Adams --- This software is released under the terms of the ISC license. +-- This software is released under the terms of the Expat license. -- (See the LICENSE file). module Codec.Encryption.OpenPGP.ASCIIArmor.Encode ( diff --git a/Codec/Encryption/OpenPGP/ASCIIArmor/Multipart.hs b/Codec/Encryption/OpenPGP/ASCIIArmor/Multipart.hs --- a/Codec/Encryption/OpenPGP/ASCIIArmor/Multipart.hs +++ b/Codec/Encryption/OpenPGP/ASCIIArmor/Multipart.hs @@ -1,6 +1,6 @@ -- ASCIIArmor/Multipart.hs: OpenPGP (RFC4880) ASCII armor implementation -- Copyright © 2012 Clint Adams --- This software is released under the terms of the ISC license. +-- This software is released under the terms of the Expat license. -- (See the LICENSE file). module Codec.Encryption.OpenPGP.ASCIIArmor.Multipart ( diff --git a/Codec/Encryption/OpenPGP/ASCIIArmor/Types.hs b/Codec/Encryption/OpenPGP/ASCIIArmor/Types.hs --- a/Codec/Encryption/OpenPGP/ASCIIArmor/Types.hs +++ b/Codec/Encryption/OpenPGP/ASCIIArmor/Types.hs @@ -1,6 +1,6 @@ -- ASCIIArmor/Decode.hs: OpenPGP (RFC4880) ASCII armor implementation -- Copyright © 2012 Clint Adams --- This software is released under the terms of the ISC license. +-- This software is released under the terms of the Expat license. -- (See the LICENSE file). module Codec.Encryption.OpenPGP.ASCIIArmor.Types ( diff --git a/Codec/Encryption/OpenPGP/ASCIIArmor/Utils.hs b/Codec/Encryption/OpenPGP/ASCIIArmor/Utils.hs --- a/Codec/Encryption/OpenPGP/ASCIIArmor/Utils.hs +++ b/Codec/Encryption/OpenPGP/ASCIIArmor/Utils.hs @@ -1,6 +1,6 @@ -- ASCIIArmor/Utils.hs: OpenPGP (RFC4880) ASCII armor implementation -- Copyright © 2012 Clint Adams --- This software is released under the terms of the ISC license. +-- This software is released under the terms of the Expat license. -- (See the LICENSE file). module Codec.Encryption.OpenPGP.ASCIIArmor.Utils ( diff --git a/Data/Digest/CRC24.hs b/Data/Digest/CRC24.hs --- a/Data/Digest/CRC24.hs +++ b/Data/Digest/CRC24.hs @@ -1,6 +1,6 @@ -- CRC24.hs: OpenPGP (RFC4880) CRC24 implementation --- Copyright © 2012 Clint Adams --- This software is released under the terms of the ISC license. +-- Copyright © 2012-2019 Clint Adams +-- This software is released under the terms of the Expat license. -- (See the LICENSE file). module Data.Digest.CRC24 ( @@ -27,4 +27,4 @@ crc24 bs = crc24Lazy . BL.fromChunks $ [bs] crc24Lazy :: ByteString -> Word32 -crc24Lazy = BL.foldl crc24Update crc24Init +crc24Lazy = BL.foldl' crc24Update crc24Init diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,15 +1,20 @@ -Copyright © 2012 Clint Adams +Copyright © 2012-2019 Clint Adams -Permission to use, copy, modify, and/or distribute this software -for any purpose with or without fee is hereby granted, provided -that the above copyright notice and this permission notice appear -in all copies. +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL -WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE -AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/bench/mark.hs b/bench/mark.hs --- a/bench/mark.hs +++ b/bench/mark.hs @@ -1,6 +1,6 @@ -- mark.hs: openpgp-asciiarmor benchmark suite --- Copyright © 2018 Clint Adams --- This software is released under the terms of the ISC license. +-- Copyright © 2018-2019 Clint Adams +-- This software is released under the terms of the Expat license. -- (See the LICENSE file). {-# LANGUAGE FlexibleContexts, OverloadedStrings #-} @@ -11,6 +11,8 @@ main :: IO () main = defaultMain [ - bgroup "crc" [ bench "crc24" $ whnf crc24 "test" + bgroup "crc" [ + bench "crc24" $ whnf crc24 "test" + , bench "crc24Lazy" $ whnf crc24Lazy "test" ] ] diff --git a/openpgp-asciiarmor.cabal b/openpgp-asciiarmor.cabal --- a/openpgp-asciiarmor.cabal +++ b/openpgp-asciiarmor.cabal @@ -1,13 +1,13 @@ Name: openpgp-asciiarmor -Version: 0.1.1 +Version: 0.1.2 Synopsis: OpenPGP (RFC4880) ASCII Armor codec Description: OpenPGP (RFC4880) ASCII Armor codec Homepage: http://floss.scru.org/openpgp-asciiarmor -License: ISC +License: MIT License-file: LICENSE Author: Clint Adams Maintainer: Clint Adams -Copyright: 2012-2018 Clint Adams +Copyright: 2012-2019 Clint Adams Category: Codec, Data Build-type: Simple Extra-source-files: tests/suite.hs