diff --git a/hOpenPGP.cabal b/hOpenPGP.cabal --- a/hOpenPGP.cabal +++ b/hOpenPGP.cabal @@ -1,6 +1,6 @@ Cabal-version: 3.4 Name: hOpenPGP -Version: 2.10.1 +Version: 2.10.1.1 Synopsis: native Haskell implementation of OpenPGP (RFC4880) Description: native Haskell implementation of OpenPGP (RFC4880), plus Camellia (RFC5581), plus ECC (RFC6637) Homepage: https://salsa.debian.org/clint/hOpenPGP @@ -8,7 +8,7 @@ License-file: LICENSE Author: Clint Adams Maintainer: Clint Adams -Copyright: 2012-2025 Clint Adams +Copyright: 2012-2026 Clint Adams Category: Codec, Data Build-type: Simple Extra-source-files: tests/suite.hs @@ -156,7 +156,16 @@ , tests/data/ed25519.secretkey , tests/data/encryption-sym-pgcrypto.pgp , tests/data/pgcrypto-passphrase.txt + , tests/data/v6-secret.pgp.aa + , tests/data/v6.rev.aa + , tests/data/v6-encrypted-secret.pgp.aa + , tests/data/v6-encrypted.rev.aa + , tests/data/seipdv2.pgp.aa +flag use-memory + description: Use the 'memory' package instead of 'ram' + default: False + common deps build-depends: aeson , attoparsec @@ -170,14 +179,12 @@ , conduit >= 1.3.0 , conduit-extra >= 1.1 , containers - , crypton , crypto-cipher-types , errors , hashable , incremental-parser >= 0.5.1 , ixset-typed , lens >= 3.0 - , memory , monad-loops , nettle , network-uri >= 2.6 @@ -191,6 +198,10 @@ , unliftio-core , unordered-containers , zlib + if flag(use-memory) + build-depends: crypton < 1.1.0, memory + else + build-depends: crypton >= 1.1.0, ram common publicmods other-modules: Codec.Encryption.OpenPGP.Types @@ -288,4 +299,4 @@ source-repository this type: git location: https://salsa.debian.org/clint/hOpenPGP.git - tag: v2.10.1 + tag: v2.10.1.1 diff --git a/tests/data/seipdv2.pgp.aa b/tests/data/seipdv2.pgp.aa new file mode 100644 --- /dev/null +++ b/tests/data/seipdv2.pgp.aa @@ -0,0 +1,8 @@ +-----BEGIN PGP MESSAGE----- + +wW0GIQav44SnLNNBPMT5pEw1RZY8zjlKostWz+pDmoUF+5URxRkwyaitZyn0JaLC +SYnwTOoiZgF9sz6WtxJJJrT8fRJbWyiTIxpSVr0gf/BBsHqDWDma0wfYo7QI+YIC +0i291xBNy1zBewWq0U6o0moCCQIG0KgYQaeiO2e9CrpgecrqyVQdPZv2H6UMMWws +DM6crtsjhM572grlZ5Kzf55ybvQh0IOS9nQGi0naPQAI7VOrBENunE79qeW3z29r +vZMR+ZZL3TRbqFaBZJy8tORC8NVaA6sLnZ4I +-----END PGP MESSAGE----- diff --git a/tests/data/v6-encrypted-secret.pgp.aa b/tests/data/v6-encrypted-secret.pgp.aa new file mode 100644 --- /dev/null +++ b/tests/data/v6-encrypted-secret.pgp.aa @@ -0,0 +1,46 @@ +-----BEGIN PGP PRIVATE KEY BLOCK----- +Comment: 32CE C253 59F9 C8D6 3826 4B92 CBC6 1BD1 BBEC 7E9A AD89 E959 4733 8CF1 DA07 F058 +Comment: +Comment: v6 Test User + +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 +yMyuQTuXtst+Gf/pl5ztZvoojvhSleTvd6tKAA== +=AIsx +-----END PGP PRIVATE KEY BLOCK----- diff --git a/tests/data/v6-encrypted.rev.aa b/tests/data/v6-encrypted.rev.aa new file mode 100644 --- /dev/null +++ b/tests/data/v6-encrypted.rev.aa @@ -0,0 +1,13 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: Revocation certificate for +Comment: 32CE C253 59F9 C8D6 3826 4B92 CBC6 1BD1 BBEC 7E9A AD89 E959 4733 8CF1 DA07 F058 +Comment: +Comment: v6 Test User + +xioGakxBgBsAAAAg1oMAToYSbuWWtIzPm9PIKvJ6J98lqv+5ng49beQ9V/jCpgYg +GwoAAAA3BYJqTEGADR0AVW5zcGVjaWZpZWQiIQYyzsJTWfnI1jgmS5LLxhvRu+x+ +mq2J6VlHM4zx2gfwWAAAAADMiyDTZiqP5aC8G6/kziMKWSXqSiP61tmMyJAjvVRx +byJ/d/+t+1Dr5ieijm0cR+rrGSiXFKJWtkXDAjve/+frBADmfcRloNGddxgfiSp2 +Sb1r6UXgOYCo8P1+YeRQ6/mvGgw= +=XR1p +-----END PGP PUBLIC KEY BLOCK----- diff --git a/tests/data/v6-secret.pgp.aa b/tests/data/v6-secret.pgp.aa new file mode 100644 --- /dev/null +++ b/tests/data/v6-secret.pgp.aa @@ -0,0 +1,42 @@ +-----BEGIN PGP PRIVATE KEY BLOCK----- +Comment: 7106 CB6D B27E 4FC9 B050 B02B B316 4DBD 4BBD 7263 D4D2 9E78 A3BB 3BDB B022 2D19 +Comment: +Comment: v6 Test User + +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 +=AQyI +-----END PGP PRIVATE KEY BLOCK----- diff --git a/tests/data/v6.rev.aa b/tests/data/v6.rev.aa new file mode 100644 --- /dev/null +++ b/tests/data/v6.rev.aa @@ -0,0 +1,13 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: Revocation certificate for +Comment: 7106 CB6D B27E 4FC9 B050 B02B B316 4DBD 4BBD 7263 D4D2 9E78 A3BB 3BDB B022 2D19 +Comment: +Comment: v6 Test User + +xioGakxBgBsAAAAgEhCa7+BbRnpktxB2tSIBG0mJGogpIGrasQBPzaPr3enCpgYg +GwoAAAA3BYJqTEGADR0AVW5zcGVjaWZpZWQiIQZxBsttsn5PybBQsCuzFk29S71y +Y9TSnnijuzvbsCItGQAAAACfECAsbAxOTt7OS9uh9pUoCgUqzT3zpA0u000/R07W +pf9YN1eYQZPq0wpudkTUoFOdnrMFbG7qsSK9zKpsNtfBDEpMkY5XBUoBo8jBHWA0 +Hpa9Y1pzxQOq6flm84IKSZtN3go= +=lm+m +-----END PGP PUBLIC KEY BLOCK-----