Merge pull request #26249 from mseri/pbkdf

mseri · web-flow · commit 69a33ee43bc2 · 2024-07-16T16:28:46.000+02:00
scrypt-kdf &lt; 1 needs upper bound on new pbkdf
diff --git a/packages/scrypt-kdf/scrypt-kdf.0.1.0/opam b/packages/scrypt-kdf/scrypt-kdf.0.1.0/opam
@@ -31,7 +31,7 @@ depends: [
   "cstruct" {>= "1.7.0" & < "6.0.1"}
   "cstruct" {with-test & < "3.2.0"}
   "nocrypto" {>= "0.5.0"}
-  "pbkdf" {>= "0.1.0"}
+  "pbkdf" {>= "0.1.0" & < "2.0.0"}
   "alcotest" {with-test}
   "ocamlbuild" {build}
 ]
diff --git a/packages/scrypt-kdf/scrypt-kdf.0.2.0/opam b/packages/scrypt-kdf/scrypt-kdf.0.2.0/opam
@@ -21,7 +21,7 @@ depends: [
   "topkg" {build}
   "cstruct" {>= "1.7.0" & < "6.0.1"}
   "nocrypto" {>= "0.5.3"}
-  "pbkdf" {>= "0.1.0"}
+  "pbkdf" {>= "0.1.0" & < "2.0.0"}
   "alcotest" {with-test}
 ]
 synopsis: "The scrypt Password-Based Key Derivation Function in pure OCaml"
diff --git a/packages/scrypt-kdf/scrypt-kdf.0.3.0/opam b/packages/scrypt-kdf/scrypt-kdf.0.3.0/opam
@@ -21,7 +21,7 @@ depends: [
   "topkg" {build}
   "cstruct" {>= "1.7.0" & < "6.0.1"}
   "nocrypto" {>= "0.5.3"}
-  "pbkdf" {>= "0.1.0"}
+  "pbkdf" {>= "0.1.0" & < "2.0.0"}
   "alcotest" {with-test}
 ]
 synopsis: "The scrypt Password-Based Key Derivation Function in pure OCaml"
diff --git a/packages/scrypt-kdf/scrypt-kdf.0.4.0/opam b/packages/scrypt-kdf/scrypt-kdf.0.4.0/opam
@@ -19,7 +19,7 @@ depends: [
   "topkg" {build}
   "cstruct" {>= "1.7.0" & < "6.0.1"}
   "nocrypto" {>= "0.5.3"}
-  "pbkdf" {>= "0.1.0"}
+  "pbkdf" {>= "0.1.0" & < "2.0.0"}
   "salsa20-core" {>= "0.1.0" & < "2.0.0"}
   "alcotest" {with-test}
 ]
diff --git a/packages/scrypt-kdf/scrypt-kdf.1.0.0/opam b/packages/scrypt-kdf/scrypt-kdf.1.0.0/opam
@@ -17,7 +17,7 @@ depends: [
   "dune" {>= "1.8"}
   "cstruct" {>= "1.7.0"}
   "nocrypto" {>= "0.5.3"}
-  "pbkdf" {>= "0.1.0"}
+  "pbkdf" {>= "0.1.0" & < "2.0.0"}
   "salsa20-core" {>= "0.1.0" & < "2.0.0"}
   "alcotest" {with-test}
 ]

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ depends: [`
`31`	`31`	`"cstruct" {>= "1.7.0" & < "6.0.1"}`
`32`	`32`	`"cstruct" {with-test & < "3.2.0"}`
`33`	`33`	`"nocrypto" {>= "0.5.0"}`
`34`		`- "pbkdf" {>= "0.1.0"}`
	`34`	`+ "pbkdf" {>= "0.1.0" & < "2.0.0"}`
`35`	`35`	`"alcotest" {with-test}`
`36`	`36`	`"ocamlbuild" {build}`
`37`	`37`	`]`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ depends: [`
`21`	`21`	`"topkg" {build}`
`22`	`22`	`"cstruct" {>= "1.7.0" & < "6.0.1"}`
`23`	`23`	`"nocrypto" {>= "0.5.3"}`
`24`		`- "pbkdf" {>= "0.1.0"}`
	`24`	`+ "pbkdf" {>= "0.1.0" & < "2.0.0"}`
`25`	`25`	`"alcotest" {with-test}`
`26`	`26`	`]`
`27`	`27`	`synopsis: "The scrypt Password-Based Key Derivation Function in pure OCaml"`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ depends: [`
`19`	`19`	`"topkg" {build}`
`20`	`20`	`"cstruct" {>= "1.7.0" & < "6.0.1"}`
`21`	`21`	`"nocrypto" {>= "0.5.3"}`
`22`		`- "pbkdf" {>= "0.1.0"}`
	`22`	`+ "pbkdf" {>= "0.1.0" & < "2.0.0"}`
`23`	`23`	`"salsa20-core" {>= "0.1.0" & < "2.0.0"}`
`24`	`24`	`"alcotest" {with-test}`
`25`	`25`	`]`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ depends: [`
`17`	`17`	`"dune" {>= "1.8"}`
`18`	`18`	`"cstruct" {>= "1.7.0"}`
`19`	`19`	`"nocrypto" {>= "0.5.3"}`
`20`		`- "pbkdf" {>= "0.1.0"}`
	`20`	`+ "pbkdf" {>= "0.1.0" & < "2.0.0"}`
`21`	`21`	`"salsa20-core" {>= "0.1.0" & < "2.0.0"}`
`22`	`22`	`"alcotest" {with-test}`
`23`	`23`	`]`