Merge pull request #173 from ocsigen/ssl-api-change

Adapt to ssl package API change

Author: Jan Rochel

opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ocsigenserver"
-version: "2.11.0"
+version: "2.11.1"
 maintainer: "[email protected]"
 synopsis: "A full-featured and extensible Web server."
 description: "Ocsigen Server implements most features of the HTTP protocol, and has a very powerful extension mechanism that makes it very easy to plug your own OCaml modules for generating pages. Many extensions are already implemented, like a reverse proxy, content compression, access control, authentication, etc."
@@ -51,7 +51,7 @@ depends: [
   "base-unix"
   "base-threads"
   "react"
-  "ssl"
+  "ssl" {>= "0.5.8"}
   "lwt" {>= "3.0.0"}
   "lwt_ssl"
   "lwt_react"

src/server/ocsigen_server.ml

@@ -1025,8 +1025,8 @@ let errmsg = function
   | (Unix.Unix_error _) as e ->
     (("Fatal - "^(Printexc.to_string e)),
      9)
-  | Ssl.Private_key_error ->
-    (("Fatal - bad password"),
+  | Ssl.Private_key_error msg ->
+    (("Fatal - bad password: " ^ msg),
      10)
   | Ocsigen_config.Config_file_error msg
   | Ocsigen_extensions.Error_in_config_file msg ->