diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-03-20 20:34:38 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-03-20 20:34:38 +0000 |
commit | 74531442db8df026d362695700a9ff23345dde96 (patch) | |
tree | d2c50b12dcf99d03ae30b92a7b72a9ea2203b31b /certs | |
parent | 58049837e7a14744f37d0250c3a854bc312d9106 (diff) | |
parent | 0c46e400afa7fef669b2f3a9ea2ed76633e8652b (diff) | |
download | prosody-74531442db8df026d362695700a9ff23345dde96.tar.gz prosody-74531442db8df026d362695700a9ff23345dde96.zip |
Merge 0.9->trunk
Diffstat (limited to 'certs')
-rw-r--r-- | certs/openssl.cnf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/certs/openssl.cnf b/certs/openssl.cnf index db1640b9..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,7 +40,7 @@ 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;FORMAT:UTF8,UTF8:example.com |