X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=certs%2Fopenssl.cnf;h=091409c43893a1b4f0bf99bc9fd122aee8546fc9;hb=84c934632367eac822fb6af2663032b67fd0a596;hp=44fc042415d2154c3c6b66263c96f68782a4f586;hpb=70a82cc9e3829cfc2144fb72cc50cc2523400d64;p=prosody.git

diff --git a/certs/openssl.cnf b/certs/openssl.cnf
index 44fc0424..091409c4 100644
--- a/certs/openssl.cnf
+++ b/certs/openssl.cnf
@@ -2,7 +2,7 @@ oid_section = new_oids
 
 [ new_oids ]
 
-# RFC 3920 section 5.1.1 defines this OID
+# RFC 6120 section 13.7.1.4. defines this OID
 xmppAddr = 1.3.6.1.5.5.7.8.5
 
 # RFC 4985 defines this OID
@@ -40,13 +40,13 @@ subjectAltName   = @subject_alternative_name
 
 [ subject_alternative_name ]
 
-# See http://tools.ietf.org/html/draft-ietf-xmpp-3920bis#section-13.7.1.2 for more info.
+# See http://tools.ietf.org/html/rfc6120#section-13.7.1.2 for more info.
 
 DNS.0       =                                           example.com
-otherName.0 =                             xmppAddr;UTF8:example.com
+otherName.0 =                 xmppAddr;FORMAT:UTF8,UTF8:example.com
 otherName.1 =            SRVName;IA5STRING:_xmpp-client.example.com
 otherName.2 =            SRVName;IA5STRING:_xmpp-server.example.com
 
 DNS.1       =                                conference.example.com
-otherName.3 =                  xmppAddr;UTF8:conference.example.com
+otherName.3 =      xmppAddr;FORMAT:UTF8,UTF8:conference.example.com
 otherName.4 = SRVName;IA5STRING:_xmpp-server.conference.example.com