Merge branch 'master' into fix-naked-pointer-cipher

.github/workflows/build.yml

@@ -35,7 +35,10 @@ jobs:
       run: opam install .
     - name: Build and test
       if: ${{ matrix.setup.runtest }}
-      run: opam install -t .
+      run: |
+        opam install -t .
+        eval $(opam env)
+        dune build @github_action_tests
 
   nix-build:
     runs-on: ${{ matrix.setup.os }}

CHANGES.md

@@ -1,5 +1,5 @@
-Unreleased
-===
+0.7.0 (2023-07-12)
+=====
 
 - Bump OpenSSL minimum requirement to 1.1.0 and stop using deprecated functions
   (#121).

dune-project

@@ -1,11 +1,12 @@
 (lang dune 2.7)
 
 (name ssl)
+(version 0.7.0)
 
 (generate_opam_files true)
 
 (source
- (github melange-re/melange))
+ (github savonet/ocaml-ssl))
 
 (maintainers "Antonio Monteiro <[email protected]>")
 
@@ -23,6 +24,7 @@
  (depends
   (ocaml
    (>= "4.03.0"))
+  (ocaml (and :with_test (>= "4.08.0")))
   dune-configurator
   conf-libssl
   (alcotest :with-test)

nix/default.nix

@@ -25,4 +25,7 @@ buildDunePackage {
   checkInputs = [ alcotest ];
 
   inherit doCheck;
+  checkPhase = ''
+    dune build -p ssl @runtest @github_action_tests ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
+  '';
 }

ssl.opam

@@ -1,5 +1,6 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
+version: "0.7.0"
 synopsis: "Bindings for OpenSSL"
 maintainer: ["Antonio Monteiro <[email protected]>"]
 authors: ["Samuel Mimram <[email protected]>"]
@@ -9,6 +10,7 @@ bug-reports: "https://github.com/savonet/ocaml-ssl/issues"
 depends: [
   "dune" {>= "2.7"}
   "ocaml" {>= "4.03.0"}
+  "ocaml" {with_test & >= "4.08.0"}
   "dune-configurator"
   "conf-libssl"
   "alcotest" {with-test}
@@ -29,5 +31,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
-dev-repo: "git+https://github.com/melange-re/melange.git"
-depexts: [ "openssl" { with-test } ]
+dev-repo: "git+https://github.com/savonet/ocaml-ssl.git"

tests/dune

@@ -1,3 +1,8 @@
+(alias
+ (name github_action_tests)
+ (deps
+  (alias_rec runtest)))
+
 (library
  (name util)
  (modules util)
@@ -14,6 +19,16 @@
  (modules ssl_comm)
  (libraries ssl alcotest))
 
+(executable
+ (name ssl_version)
+ (modules ssl_version)
+ (libraries ssl alcotest))
+
+(rule
+ (alias github_action_tests)
+ (action
+  (run ./ssl_version.exe)))
+
 (test
  (name ssl_context)
  (modules ssl_context)

tests/ssl_comm.ml

@@ -25,23 +25,11 @@ let test_error_queue () =
     check string "Library string" "SSL routines" (Option.get err.lib);
     check string "Reason string" "system lib" (Option.get err.reason)
 
-let test_version () =
-  let ch = Unix.open_process_in "openssl version" in
-  let m, n, p =
-    Scanf.(bscanf (Scanning.from_channel ch)) "OpenSSL %d.%d.%d" (fun x y z ->
-        x, y, z)
-  in
-  Unix.close_process_in ch |> ignore;
-  check int "major" m Ssl.native_library_version.major;
-  check int "minor" n Ssl.native_library_version.minor;
-  check int "patch" p Ssl.native_library_version.patch
-
 let () =
   Alcotest.run
     "Ssl communication"
     [ ( "Communication"
       , [ test_case "Test init" `Quick test_init
-        ; test_case "Test version" `Quick test_version
         ; test_case "Test error queue" `Quick test_error_queue
         ] )
     ]

tests/ssl_version.ml

@@ -0,0 +1,27 @@
+open Alcotest
+open Ssl
+
+let test_init () = init () |> ignore
+
+(* This test is not super robust b/c `openssl` might not be installed or
+   installed but linked to a different shared libary. For this reason, this test
+   is only run in our internal github action CI. *)
+let test_version () =
+  let ch = Unix.open_process_in "openssl version" in
+  let m, n, p =
+    Scanf.(bscanf (Scanning.from_channel ch)) "OpenSSL %d.%d.%d" (fun x y z ->
+        x, y, z)
+  in
+  Unix.close_process_in ch |> ignore;
+  check int "major" m Ssl.native_library_version.major;
+  check int "minor" n Ssl.native_library_version.minor;
+  check int "patch" p Ssl.native_library_version.patch
+
+let () =
+  Alcotest.run
+    "Ssl version"
+    [ ( "Version"
+      , [ test_case "Test init" `Quick test_init
+        ; test_case "Test version" `Quick test_version
+        ] )
+    ]