Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-30 16:36:29 +01:00
Code Releases Activity

* src/ejabberd_s2s_in.erl (get_cert_domains): When compiling with

Browse Source 
Erlang R12, replace the calls to deprecated module PKIX1Explicit88
with OTP-PKIX (EJAB-556)

SVN Revision: 1226
This commit is contained in:
Badlop 2008-03-11 14:25:35 +00:00
parent 78ce676e81
commit 07454d8f1a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-03-11 Badlop <badlop@process-one.net>
* 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)
2008-03-10 Badlop <badlop@process-one.net> 2008-03-10 Badlop <badlop@process-one.net>
* src/ejabberd_update.erl: Fix crash when browsing the Update * src/ejabberd_update.erl: Fix crash when browsing the Update

8
src/ejabberd_s2s_in.erl
View File

@ -50,9 +50,13 @@
-include("jlib.hrl"). -include("jlib.hrl").
-ifdef(SSL39). -ifdef(SSL39).
-include_lib("ssl/include/ssl_pkix.hrl"). -include_lib("ssl/include/ssl_pkix.hrl").
-define(PKIXEXPLICIT, 'OTP-PKIX').
-define(PKIXIMPLICIT, 'OTP-PKIX').
-else. -else.
-include_lib("ssl/include/PKIX1Explicit88.hrl"). -include_lib("ssl/include/PKIX1Explicit88.hrl").
-include_lib("ssl/include/PKIX1Implicit88.hrl"). -include_lib("ssl/include/PKIX1Implicit88.hrl").
-define(PKIXEXPLICIT, 'PKIX1Explicit88').
-define(PKIXIMPLICIT, 'PKIX1Implicit88').
-endif. -endif.
-include("XmppAddr.hrl"). -include("XmppAddr.hrl").
@ -603,7 +607,7 @@ get_cert_domains(Cert) ->
lists:flatmap( lists:flatmap(
fun(#'AttributeTypeAndValue'{type = ?'id-at-commonName', fun(#'AttributeTypeAndValue'{type = ?'id-at-commonName',
value = Val}) -> value = Val}) ->
case 'PKIX1Explicit88':decode('X520CommonName', Val) of case ?PKIXEXPLICIT:decode('X520CommonName', Val) of
{ok, {_, D1}} -> {ok, {_, D1}} ->
D = if D = if
is_list(D1) -> D1; is_list(D1) -> D1;
@ -637,7 +641,7 @@ get_cert_domains(Cert) ->
is_binary(Val) -> Val; is_binary(Val) -> Val;
true -> Val true -> Val
end, end,
case 'PKIX1Implicit88':decode('SubjectAltName', BVal) of case ?PKIXIMPLICIT:decode('SubjectAltName', BVal) of
{ok, SANs} -> {ok, SANs} ->
lists:flatmap( lists:flatmap(
fun({otherName, fun({otherName,