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

Don't crash on certificates without extensions (EJAB-1724)

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2015-10-23 18:41:35 +03:00
parent 2a115a83d2
commit b2eb9f197a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ejabberd_s2s.erl
View File

@ -620,10 +620,15 @@ get_s2s_state(S2sPid) ->
[{s2s_pid, S2sPid} | Infos]. [{s2s_pid, S2sPid} | Infos].
get_cert_domains(Cert) -> get_cert_domains(Cert) ->
{rdnSequence, Subject} = TBSCert = Cert#'Certificate'.tbsCertificate,
(Cert#'Certificate'.tbsCertificate)#'TBSCertificate'.subject, Subject = case TBSCert#'TBSCertificate'.subject of
Extensions = {rdnSequence, Subj} -> lists:flatten(Subj);
(Cert#'Certificate'.tbsCertificate)#'TBSCertificate'.extensions, _ -> []
end,
Extensions = case TBSCert#'TBSCertificate'.extensions of
Exts when is_list(Exts) -> Exts;
_ -> []
end,
lists:flatmap(fun (#'AttributeTypeAndValue'{type = lists:flatmap(fun (#'AttributeTypeAndValue'{type =
?'id-at-commonName', ?'id-at-commonName',
value = Val}) -> value = Val}) ->
@ -646,7 +651,7 @@ get_cert_domains(Cert) ->
end; end;
(_) -> [] (_) -> []
end, end,
lists:flatten(Subject)) Subject)
++ ++
lists:flatmap(fun (#'Extension'{extnID = lists:flatmap(fun (#'Extension'{extnID =
?'id-ce-subjectAltName', ?'id-ce-subjectAltName',