commit 695d3193614c65e644bfb8d3e05d22bd55aab3d7
parent f57238108ff1feaa1b7ec95bee3953a5a0236cf7
Author: Jared Tobin <jared@jtobin.io>
Date: Sun, 28 Dec 2025 12:27:35 -0330
release: v0.2.1
Diffstat:
5 files changed, 40 insertions(+), 33 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,8 @@
# Changelog
+- 0.2.1 (2025-12-28)
+ * Adds an 'llvm' build flag and tests with GHC 9.10.3.
+
- 0.2.0 (2025-06-21)
* The 'derive' function is now total, returning 'Nothing' when supplied
with bad inputs.
diff --git a/README.md b/README.md
@@ -39,16 +39,16 @@ Current benchmark figures on an M4 Silicon MacBook Air look like (use
```
benchmarking ppad-pbkdf/PBKDF-SHA256/derive (outlen 32)
- time 58.19 μs (58.14 μs .. 58.25 μs)
+ time 47.13 μs (47.11 μs .. 47.16 μs)
1.000 R² (1.000 R² .. 1.000 R²)
- mean 58.39 μs (58.35 μs .. 58.44 μs)
- std dev 155.6 ns (130.8 ns .. 193.7 ns)
+ mean 47.17 μs (47.15 μs .. 47.20 μs)
+ std dev 90.60 ns (76.55 ns .. 106.6 ns)
benchmarking ppad-pbkdf/PBKDF-SHA512/derive (outlen 32)
- time 44.01 μs (43.92 μs .. 44.14 μs)
+ time 32.71 μs (32.69 μs .. 32.75 μs)
1.000 R² (1.000 R² .. 1.000 R²)
- mean 44.09 μs (44.02 μs .. 44.19 μs)
- std dev 270.4 ns (209.1 ns .. 345.1 ns)
+ mean 32.80 μs (32.76 μs .. 32.85 μs)
+ std dev 144.0 ns (96.49 ns .. 207.1 ns)
```
## Security
diff --git a/flake.lock b/flake.lock
@@ -5,11 +5,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+ "lastModified": 1731533236,
+ "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1725910328,
- "narHash": "sha256-n9pCtzGZ0httmTwMuEbi5E78UQ4ZbQMr1pzi5N0LAG8=",
+ "lastModified": 1766840161,
+ "narHash": "sha256-Ss/LHpJJsng8vz1Pe33RSGIWUOcqM1fjrehjUkdrWio=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "5775c2583f1801df7b790bf7f7d710a19bac66f4",
+ "rev": "3edc4a30ed3903fdf6f90c837f961fa6b49582d1",
"type": "github"
},
"original": {
@@ -51,11 +51,11 @@
]
},
"locked": {
- "lastModified": 1741625558,
- "narHash": "sha256-ZBDXRD5fsVqA5bGrAlcnhiu67Eo50q0M9614nR3NBwY=",
+ "lastModified": 1766934151,
+ "narHash": "sha256-BUFpuLfrGXE2xi3Wa9TYCEhhRhFp175Ghxnr0JRbG2I=",
"ref": "master",
- "rev": "fb63457f2e894eda28250dfe65d0fcd1d195ac2f",
- "revCount": 24,
+ "rev": "58dfb7922401a60d5de76825fcd5f6ecbcd7afe0",
+ "revCount": 26,
"type": "git",
"url": "git://git.ppad.tech/base16.git"
},
@@ -71,11 +71,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1737297101,
- "narHash": "sha256-EnXnq+JLflbWt+DvaGGnY2gfAqsGNOm5vPgHh3hkfwQ=",
+ "lastModified": 1766932084,
+ "narHash": "sha256-GvVsbTfW+B7IQ9K/QP2xcXJAm1lhBin1jYZWNjOzT+o=",
"ref": "master",
- "rev": "f29823875250bc99b3891f7373535ccde9a29a44",
- "revCount": 1,
+ "rev": "353e61763b959b960a55321a85423501e3e9ed7a",
+ "revCount": 2,
"type": "git",
"url": "git://git.ppad.tech/nixpkgs.git"
},
@@ -105,11 +105,11 @@
]
},
"locked": {
- "lastModified": 1766435555,
- "narHash": "sha256-ysN0iRuBLSQrgWU3rCFUyq0NvRpug6DTBRZSlWbmI1A=",
+ "lastModified": 1766934663,
+ "narHash": "sha256-QFHvRxg/AN9/FHF9EyVui1os0sTxpawzsmxcHqcdhoc=",
"ref": "master",
- "rev": "a4c17689cd66e1ef35c667914765cb24c9a4b305",
- "revCount": 96,
+ "rev": "0d9a7a2f83fc95bf3ac1d335d1c0237d397e44bc",
+ "revCount": 98,
"type": "git",
"url": "git://git.ppad.tech/sha256.git"
},
@@ -139,11 +139,11 @@
]
},
"locked": {
- "lastModified": 1766437426,
- "narHash": "sha256-vn0nUVrMqux2PorMOZlx3RAqylf88BTw+jRMXC0gIz8=",
+ "lastModified": 1766934908,
+ "narHash": "sha256-39ElMaWIjMW0BbHqINaHDjzpL8PsWNyvZn14QAKgPOo=",
"ref": "master",
- "rev": "669c4ffd1cc7826876af2d67661738c2081ea6a9",
- "revCount": 31,
+ "rev": "4bb34de9a798e1954e09ec3b6d8d8b8db645e5d7",
+ "revCount": 32,
"type": "git",
"url": "git://git.ppad.tech/sha512.git"
},
diff --git a/flake.nix b/flake.nix
@@ -40,9 +40,13 @@
pkgs = import nixpkgs { inherit system; };
hlib = pkgs.haskell.lib;
- llvm = pkgs.llvmPackages_15.llvm;
+ llvm = pkgs.llvmPackages_19.llvm;
base16 = ppad-base16.packages.${system}.default;
+ base16-llvm =
+ hlib.addBuildTools
+ (hlib.enableCabalFlag base16 "llvm")
+ [ llvm ];
sha256 = ppad-sha256.packages.${system}.default;
sha256-llvm =
@@ -56,8 +60,8 @@
(hlib.enableCabalFlag sha512 "llvm")
[ llvm ];
- hpkgs = pkgs.haskell.packages.ghc981.extend (new: old: {
- ppad-base16 = base16;
+ hpkgs = pkgs.haskell.packages.ghc910.extend (new: old: {
+ ppad-base16 = base16-llvm;
ppad-sha256 = sha256-llvm;
ppad-sha512 = sha512-llvm;
${lib} = new.callCabal2nix lib ./. {
diff --git a/ppad-pbkdf.cabal b/ppad-pbkdf.cabal
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: ppad-pbkdf
-version: 0.2.0
+version: 0.2.1
synopsis: A password-based key derivation function
license: MIT
license-file: LICENSE
@@ -8,7 +8,7 @@ author: Jared Tobin
maintainer: jared@ppad.tech
category: Cryptography
build-type: Simple
-tested-with: GHC == { 9.8.1 }
+tested-with: GHC == 9.10.3
extra-doc-files: CHANGELOG
description:
A pure implementation of the password-based key derivation function PBKDF2,
