1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
--- ejabberd-2.0.0/src/ejabberd_s2s_in.erl.original 2008-02-21 10:02:12.000000000 +0000
+++ ejabberd-2.0.0/src/ejabberd_s2s_in.erl 2008-04-08 18:00:04.000000000 +0100
@@ -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 @@
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 @@
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,
|
GitWeb
