From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Fri, 12 May 2017 14:51:17 +0000 (+0300)
Subject: Only validate certfiles if public_key:short_name_hash/1 is available
X-Git-Tag: 17.06-beta~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d17a2850c0d5fd61465c30c8430596b9071ffde;p=ejabberd

Only validate certfiles if public_key:short_name_hash/1 is available
---

diff --git a/src/ejabberd_pkix.erl b/src/ejabberd_pkix.erl
index ffdc0cea4..f99a2c12e 100644
--- a/src/ejabberd_pkix.erl
+++ b/src/ejabberd_pkix.erl
@@ -152,7 +152,10 @@ init([]) ->
     ejabberd_hooks:add(route_registered, ?MODULE, route_registered, 50),
     Validate = case os:type() of
 		   {win32, _} -> false;
-		   _ -> true
+		   _ ->
+		       code:ensure_loaded(public_key),
+		       erlang:function_exported(
+			 public_key, short_name_hash, 1)
 	       end,
     if Validate -> check_ca_dir();
        true -> ok