Update to cryptonite-0.29

No changelogs are provided by the upstream.

6 files changed, 68 insertions, 56 deletions

diff --git a/security/hs-cryptonite/Makefile b/security/hs-cryptonite/Makefile
index ed7e1bb3d3d..67275c83f1d 100644
--- a/security/hs-cryptonite/Makefile
+++ b/security/hs-cryptonite/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2022/01/18 02:48:20 pho Exp $
+# $NetBSD: Makefile,v 1.5 2022/02/11 13:10:15 pho Exp $
 
-DISTNAME=	cryptonite-0.28
-PKGREVISION=	2
+DISTNAME=	cryptonite-0.29
 CATEGORIES=	security
 
 MAINTAINER=	pho@cielonegro.org
diff --git a/security/hs-cryptonite/PLIST b/security/hs-cryptonite/PLIST
index 8e730f27400..755bb537d9e 100644
--- a/security/hs-cryptonite/PLIST
+++ b/security/hs-cryptonite/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/04/24 12:55:43 pho Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/02/11 13:10:15 pho Exp $
 lib/cryptonite-${PKGVERSION}/${HS_VERSION}/package-description
 lib/cryptonite-${PKGVERSION}/${HS_VERSION}/package-id
 lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/Cipher/AES.dyn_hi
@@ -190,6 +190,9 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/Hash/Types.p_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/Hash/Whirlpool.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/Hash/Whirlpool.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/Hash/Whirlpool.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/Internal/Builder.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/Internal/Builder.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/Internal/Builder.p_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/Internal/ByteArray.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/Internal/ByteArray.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/Internal/ByteArray.p_hi
@@ -322,6 +325,9 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/PubKey/Ed25519.p_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/PubKey/Ed448.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/PubKey/Ed448.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/PubKey/Ed448.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/PubKey/EdDSA.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/PubKey/EdDSA.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/PubKey/EdDSA.p_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/PubKey/ElGamal.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/PubKey/ElGamal.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/PubKey/ElGamal.p_hi
@@ -470,6 +476,7 @@ share/doc/${HS_PLATFORM}/cryptonite-${PKGVERSION}/html/Crypto-PubKey-ECDSA.html
 share/doc/${HS_PLATFORM}/cryptonite-${PKGVERSION}/html/Crypto-PubKey-ECIES.html
 share/doc/${HS_PLATFORM}/cryptonite-${PKGVERSION}/html/Crypto-PubKey-Ed25519.html
 share/doc/${HS_PLATFORM}/cryptonite-${PKGVERSION}/html/Crypto-PubKey-Ed448.html
+share/doc/${HS_PLATFORM}/cryptonite-${PKGVERSION}/html/Crypto-PubKey-EdDSA.html
 share/doc/${HS_PLATFORM}/cryptonite-${PKGVERSION}/html/Crypto-PubKey-MaskGenFunction.html
 share/doc/${HS_PLATFORM}/cryptonite-${PKGVERSION}/html/Crypto-PubKey-RSA-OAEP.html
 share/doc/${HS_PLATFORM}/cryptonite-${PKGVERSION}/html/Crypto-PubKey-RSA-PKCS15.html
diff --git a/security/hs-cryptonite/buildlink3.mk b/security/hs-cryptonite/buildlink3.mk
index 3e73dc8bc82..4dfc98aee14 100644
--- a/security/hs-cryptonite/buildlink3.mk
+++ b/security/hs-cryptonite/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.4 2022/01/18 02:48:20 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2022/02/11 13:10:15 pho Exp $
 
 BUILDLINK_TREE+=	hs-cryptonite
 
 .if !defined(HS_CRYPTONITE_BUILDLINK3_MK)
 HS_CRYPTONITE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-cryptonite+=	hs-cryptonite>=0.28
-BUILDLINK_ABI_DEPENDS.hs-cryptonite+=	hs-cryptonite>=0.28nb2
+BUILDLINK_API_DEPENDS.hs-cryptonite+=	hs-cryptonite>=0.29
+BUILDLINK_ABI_DEPENDS.hs-cryptonite+=	hs-cryptonite>=0.29
 BUILDLINK_PKGSRCDIR.hs-cryptonite?=	../../security/hs-cryptonite
 
 .include "../../devel/hs-basement/buildlink3.mk"
diff --git a/security/hs-cryptonite/distinfo b/security/hs-cryptonite/distinfo
index 3a3fc1069b0..8d7225b8dc8 100644
--- a/security/hs-cryptonite/distinfo
+++ b/security/hs-cryptonite/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:17:09 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/02/11 13:10:15 pho Exp $
 
-BLAKE2s (cryptonite-0.28.tar.gz) = c822acb63b2fcbb372695cd190b3e4ddf15f403119d2e9db2dc826df9587a409
-SHA512 (cryptonite-0.28.tar.gz) = c1e485522938f94f15910a5b5a4a3e4dfecbb62df463c80faaa51e9d883c2612611b8486bd0fd13660766cfb6d62d366fbbd03df2db874d525514aae247b6242
-Size (cryptonite-0.28.tar.gz) = 616309 bytes
-SHA1 (patch-Crypto_Number_Compat.hs) = 982e568d5f7c7d2d3bf5d6453afa72302c42a383
+BLAKE2s (cryptonite-0.29.tar.gz) = 2fd21184176bc46bdcad80c9194c66d6dbecd159b1ecdcc436d854922bc435ef
+SHA512 (cryptonite-0.29.tar.gz) = 7f80268e429a9f700709ebdb00da1e2831f2edca064feaa06a9050060fea572abc2fdfee976f60b18a4085cf3a3533e70129104c82e7b050358a97e8575928f2
+Size (cryptonite-0.29.tar.gz) = 622119 bytes
+SHA1 (patch-Crypto_Internal_CompatPrim.hs) = 8828755bbae0cd36e3e934a83216876be5b93138
diff --git a/security/hs-cryptonite/patches/patch-Crypto_Internal_CompatPrim.hs b/security/hs-cryptonite/patches/patch-Crypto_Internal_CompatPrim.hs
new file mode 100644
index 00000000000..cb68b4773e4
--- /dev/null
+++ b/security/hs-cryptonite/patches/patch-Crypto_Internal_CompatPrim.hs
@@ -0,0 +1,50 @@
+$NetBSD: patch-Crypto_Internal_CompatPrim.hs,v 1.1 2022/02/11 13:10:15 pho Exp $
+
+Fix build on GHC 9.2:
+https://github.com/haskell-crypto/cryptonite/pull/354
+
+--- Crypto/Internal/CompatPrim.hs.orig	2022-02-07 13:27:20.338888456 +0000
++++ Crypto/Internal/CompatPrim.hs
+@@ -31,7 +31,11 @@ import Data.Memory.Endian (getSystemEndi
+ -- | Byteswap Word# to or from Big Endian
+ --
+ -- On a big endian machine, this function is a nop.
++#if MIN_VERSION_base(4,16,0)
++be32Prim :: Word32# -> Word32#
++#else
+ be32Prim :: Word# -> Word#
++#endif
+ #ifdef ARCH_IS_LITTLE_ENDIAN
+ be32Prim = byteswap32Prim
+ #elif defined(ARCH_IS_BIG_ENDIAN)
+@@ -43,7 +47,11 @@ be32Prim w = if getSystemEndianness == L
+ -- | Byteswap Word# to or from Little Endian
+ --
+ -- On a little endian machine, this function is a nop.
++#if MIN_VERSION_base(4,16,0)
++le32Prim :: Word32# -> Word32#
++#else
+ le32Prim :: Word# -> Word#
++#endif
+ #ifdef ARCH_IS_LITTLE_ENDIAN
+ le32Prim w = w
+ #elif defined(ARCH_IS_BIG_ENDIAN)
+@@ -54,6 +62,10 @@ le32Prim w = if getSystemEndianness == L
+ 
+ -- | Simple compatibility for byteswap the lower 32 bits of a Word#
+ -- at the primitive level
++#if MIN_VERSION_base(4,16,0)
++byteswap32Prim :: Word32# -> Word32#
++byteswap32Prim w = wordToWord32# (byteSwap32# (word32ToWord# w))
++#else
+ byteswap32Prim :: Word# -> Word#
+ #if __GLASGOW_HASKELL__ >= 708
+ byteswap32Prim w = byteSwap32# w
+@@ -65,6 +77,7 @@ byteswap32Prim w =
+         !d = and# (uncheckedShiftRL# w 24#) 0x000000ff##
+      in or# a (or# b (or# c d))
+ #endif
++#endif
+ 
+ -- | Combine 4 word8 [a,b,c,d] to a word32 representing [a,b,c,d]
+ convert4To32 :: Word# -> Word# -> Word# -> Word#
diff --git a/security/hs-cryptonite/patches/patch-Crypto_Number_Compat.hs b/security/hs-cryptonite/patches/patch-Crypto_Number_Compat.hs
deleted file mode 100644
index 8548939f4b5..00000000000
--- a/security/hs-cryptonite/patches/patch-Crypto_Number_Compat.hs
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-Crypto_Number_Compat.hs,v 1.1 2021/04/24 12:55:43 pho Exp $
-
-Fix build with GHC 9. integer-gmp is now deprecated in favor of
-ghc-bignum, and some *internal* functions have apparently been
-removed. Why does it use the internals in the first place? This is an
-upstream issue that has been reported but not fixed yet:
-
-https://github.com/haskell-crypto/cryptonite/issues/340
-
---- Crypto/Number/Compat.hs.orig	2021-04-24 12:33:16.453915356 +0000
-+++ Crypto/Number/Compat.hs
-@@ -72,7 +72,9 @@ gmpLog2 _ = GmpUnsupported
- -- | Compute the power modulus using extra security to remain constant
- -- time wise through GMP
- gmpPowModSecInteger :: Integer -> Integer -> Integer -> GmpSupported Integer
--#if MIN_VERSION_integer_gmp(1,0,2)
-+#if MIN_VERSION_integer_gmp(1,1,0)
-+gmpPowModSecInteger b e m = GmpSupported (powModInteger b e m)
-+#elif MIN_VERSION_integer_gmp(1,0,2)
- gmpPowModSecInteger b e m = GmpSupported (powModSecInteger b e m)
- #elif MIN_VERSION_integer_gmp(1,0,0)
- gmpPowModSecInteger _ _ _ = GmpUnsupported
-@@ -103,7 +105,9 @@ gmpInverse _ _ = GmpUnsupported
- 
- -- | Get the next prime from a specific value through GMP
- gmpNextPrime :: Integer -> GmpSupported Integer
--#if MIN_VERSION_integer_gmp(0,5,1)
-+#if MIN_VERSION_integer_gmp(1,1,0)
-+gmpNextPrime _ = GmpUnsupported
-+#elif MIN_VERSION_integer_gmp(0,5,1)
- gmpNextPrime n = GmpSupported (nextPrimeInteger n)
- #else
- gmpNextPrime _ = GmpUnsupported
-@@ -111,7 +115,9 @@ gmpNextPrime _ = GmpUnsupported
- 
- -- | Test if a number is prime using Miller Rabin
- gmpTestPrimeMillerRabin :: Int -> Integer -> GmpSupported Bool
--#if MIN_VERSION_integer_gmp(0,5,1)
-+#if MIN_VERSION_integer_gmp(1,1,0)
-+gmpTestPrimeMillerRabin _ _ = GmpUnsupported
-+#elif MIN_VERSION_integer_gmp(0,5,1)
- gmpTestPrimeMillerRabin (I# tries) !n = GmpSupported $
-     case testPrimeInteger n tries of
-         0# -> False