Merge pull request #49 from djs55/release-v1.14

Prepare to release v1.14 (a small update)

CHANGES.md

@@ -1,3 +1,8 @@
+## v1.14
+
+- Handle `safe-string` by @olafhering, reviewed by @nojb (#47)
+- Remove `--dev` option from `dune` invocation by @arthurteisseire (#48)
+
 ## v1.13
 
 - Update to dune2, fix Windows compilation, make C fns static @nojb (#42)

dune

@@ -7,6 +7,7 @@
  (wrapped false)
  (modules sha1 sha256 sha512)
  (flags -warn-error -3)
+ (libraries stdlib-shims)
  (foreign_stubs
   (language c)
   (flags (:include c_flags.sexp))

dune-project

@@ -13,12 +13,22 @@
          "Florent Monnier"
          "Forrest L Norvell"
          "Vincent Bernadoff"
-         "David Scott")
+         "David Scott"
+         "Olaf Hering"
+         "Arthur Teisseire"
+         "Nicolás Ojeda Bär"
+         "Christopher Zimmermann"
+         "Thomas Leonard"
+)
 
 (maintainers [email protected])
 
 (package
  (name sha)
- (depends (dune (>= 2.0)) (ounit :with-test)))
+ (synopsis "Binding to the SHA cryptographic functions")
+ (description "This is the binding for SHA interface code in OCaml. Offering the same
+interface than the MD5 digest included in the OCaml standard library.
+It's currently providing SHA1, SHA256 and SHA512 hash functions.")
+ (depends (dune (>= 2.0)) (stdlib-shims (>= 0.3.0)) (ounit :with-test)))
 
 (generate_opam_files true)

sha.opam

@@ -1,5 +1,10 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
+synopsis: "Binding to the SHA cryptographic functions"
+description: """
+This is the binding for SHA interface code in OCaml. Offering the same
+interface than the MD5 digest included in the OCaml standard library.
+It's currently providing SHA1, SHA256 and SHA512 hash functions."""
 maintainer: ["[email protected]"]
 authors: [
   "Vincent Hanquez"
@@ -10,12 +15,18 @@ authors: [
   "Forrest L Norvell"
   "Vincent Bernadoff"
   "David Scott"
+  "Olaf Hering"
+  "Arthur Teisseire"
+  "Nicolás Ojeda Bär"
+  "Christopher Zimmermann"
+  "Thomas Leonard"
 ]
 license: "ISC"
 homepage: "https://github.com/djs55/ocaml-sha"
 bug-reports: "https://github.com/djs55/ocaml-sha/issues"
 depends: [
   "dune" {>= "2.0"}
+  "stdlib-shims" {>= "0.3.0"}
   "ounit" {with-test}
 ]
 build: [
@@ -32,9 +43,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
-synopsis: "Binding to the SHA cryptographic functions"
-description: """
-This is the binding for SHA interface code in OCaml. Offering the same
-interface than the MD5 digest included in the OCaml standard library.
-It's currently providing SHA1, SHA256 and SHA512 hash functions."""
 dev-repo: "git+https://github.com/djs55/ocaml-sha.git"

sha1.ml

@@ -62,7 +62,7 @@ let channel chan len =
 	while (!left == -1 || !left > 0) && not !eof
 	do
 		let len = if !left < 0 then blksize else (min !left blksize) in
-		let readed = Pervasives.input chan buf 0 len in
+		let readed = Stdlib.input chan buf 0 len in
 		if readed = 0 then
 			eof := true
 		else (

sha256.ml

@@ -66,7 +66,7 @@ let channel chan len =
 	while (!left == -1 || !left > 0) && not !eof
 	do
 		let len = if !left < 0 then blksize else (min !left blksize) in
-		let readed = Pervasives.input chan buf 0 len in
+		let readed = Stdlib.input chan buf 0 len in
 		if readed = 0 then
 			eof := true
 		else (

sha512.ml

@@ -66,7 +66,7 @@ let channel chan len =
 	while (!left == -1 || !left > 0) && not !eof
 	do
 		let len = if !left < 0 then blksize else (min !left blksize) in
-		let readed = Pervasives.input chan buf 0 len in
+		let readed = Stdlib.input chan buf 0 len in
 		if readed = 0 then
 			eof := true
 		else (