diff options
| author | Badlop <badlop@process-one.net> | 2008-03-11 14:25:35 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2008-03-11 14:25:35 +0000 |
| commit | 07454d8f1a43e2e9d431d6292f17e49bc85f1aab (patch) | |
| tree | 9a9d6f2d8d91995182d668a1dba86a212f5fe6db /src | |
| parent | * src/ejabberd_update.erl: Fix crash when browsing the Update (diff) | |
* src/ejabberd_s2s_in.erl (get_cert_domains): When compiling with
Erlang R12, replace the calls to deprecated module PKIX1Explicit88
with OTP-PKIX (EJAB-556)
SVN Revision: 1226
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_s2s_in.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index 4aa87956f..623339845 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -50,9 +50,13 @@ -include("jlib.hrl"). -ifdef(SSL39). -include_lib("ssl/include/ssl_pkix.hrl"). +-define(PKIXEXPLICIT, 'OTP-PKIX'). +-define(PKIXIMPLICIT, 'OTP-PKIX'). -else. -include_lib("ssl/include/PKIX1Explicit88.hrl"). -include_lib("ssl/include/PKIX1Implicit88.hrl"). +-define(PKIXEXPLICIT, 'PKIX1Explicit88'). +-define(PKIXIMPLICIT, 'PKIX1Implicit88'). -endif. -include("XmppAddr.hrl"). @@ -603,7 +607,7 @@ get_cert_domains(Cert) -> lists:flatmap( fun(#'AttributeTypeAndValue'{type = ?'id-at-commonName', value = Val}) -> - case 'PKIX1Explicit88':decode('X520CommonName', Val) of + case ?PKIXEXPLICIT:decode('X520CommonName', Val) of {ok, {_, D1}} -> D = if is_list(D1) -> D1; @@ -637,7 +641,7 @@ get_cert_domains(Cert) -> is_binary(Val) -> Val; true -> Val end, - case 'PKIX1Implicit88':decode('SubjectAltName', BVal) of + case ?PKIXIMPLICIT:decode('SubjectAltName', BVal) of {ok, SANs} -> lists:flatmap( fun({otherName, |