Software / code / prosody
Changeset
6924:c37ad3e1fdd9
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 17 Nov 2015 17:04:04 +0000 |
| parents | 6921:45fa2e554c79 (current diff) 6923:f755e0bdc60a (diff) |
| children | 6925:3c4799467dae 6926:d96b2aa7a11d |
| files | plugins/muc/muc.lib.lua |
| diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/certs/openssl.cnf Mon Nov 16 15:24:36 2015 +0100 +++ b/certs/openssl.cnf Tue Nov 17 17:04:04 2015 +0000 @@ -13,8 +13,8 @@ default_bits = 4096 default_keyfile = example.com.key distinguished_name = distinguished_name -req_extensions = v3_extensions -x509_extensions = v3_extensions +req_extensions = certrequest +x509_extensions = selfsigned # ask about the DN? prompt = no @@ -28,16 +28,22 @@ organizationalUnitName = XMPP Department emailAddress = xmpp@example.com -[ v3_extensions ] +[ certrequest ] # for certificate requests (req_extensions) -# and self-signed certificates (x509_extensions) basicConstraints = CA:FALSE keyUsage = digitalSignature,keyEncipherment extendedKeyUsage = serverAuth,clientAuth subjectAltName = @subject_alternative_name +[ selfsigned ] + +# and self-signed certificates (x509_extensions) + +basicConstraints = CA:TRUE +subjectAltName = @subject_alternative_name + [ subject_alternative_name ] # See http://tools.ietf.org/html/rfc6120#section-13.7.1.2 for more info.
--- a/plugins/muc/muc.lib.lua Mon Nov 16 15:24:36 2015 +0100 +++ b/plugins/muc/muc.lib.lua Tue Nov 17 17:04:04 2015 +0000 @@ -361,7 +361,7 @@ end local function deconstruct_stanza_id(room, stanza) local from_jid_possiblybare, to_nick = stanza.attr.from, stanza.attr.to; - local from_jid, id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(.+)%z(.*)%z(.+)$"); + local from_jid, id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(%Z+)%z(%Z*)%z(.+)$"); local from_nick = room._jid_nick[from_jid]; if not(from_nick) then return; end
