Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge Tobias SCRAM-PLUS work | Kim Alvefur | 2013-09-22 | 3 | -7/+97 |
|\ | |||||
| * | Backout ae48bf828f21 | Kim Alvefur | 2013-09-22 | 2 | -6/+3 |
| | | |||||
| * | Only advertise mechanisms needing channel binding if a channel binding ↵ | Tobias Markmann | 2011-02-07 | 2 | -3/+26 |
| | | | | | | | | backend is avaliable. | ||||
| * | sasl.util.scarm: Rearrage some code so it makes more sense. | Tobias Markmann | 2011-02-06 | 1 | -5/+6 |
| | | |||||
| * | util.sasl.scram: Checking the GS2 header for valid start flag. | Tobias Markmann | 2011-02-06 | 1 | -0/+7 |
| | | |||||
| * | mod_saslauth: Check whether LuaSec supports getpeerfinished() binding. | Tobias Markmann | 2011-01-17 | 1 | -4/+8 |
| | | |||||
| * | util.sasl.scram: Remove some debugging output. | Tobias Markmann | 2011-01-17 | 1 | -6/+0 |
| | | |||||
| * | util.sasl.scram: Adding reference to RFC 5929 'Channel Bindings for TLS'. | Tobias Markmann | 2011-01-17 | 1 | -0/+4 |
| | | |||||
| * | util.sasl.scram: Validate channel binding data of client final message. | Tobias Markmann | 2011-01-17 | 1 | -3/+12 |
| | | |||||
| * | mod_saslauth: Add channel binding handler for tls-unique channel binding. | Tobias Markmann | 2011-01-17 | 1 | -1/+3 |
| | | |||||
| * | util.sasl.scram: Use self.profile.cb for detection whether channel binding ↵ | Tobias Markmann | 2011-01-17 | 1 | -3/+3 |
| | | | | | | | | is supported or not. | ||||
| * | mod_saslauth: Set secure socket as SASL object user data for secure sessions. | Tobias Markmann | 2011-01-17 | 1 | -0/+4 |
| | | |||||
| * | util.sasl: New method to add channel binding handler to a SASL instance. | Tobias Markmann | 2011-01-17 | 1 | -0/+9 |
| | | |||||
| * | Run with own LuaSec. | Tobias Markmann | 2011-01-17 | 2 | -3/+6 |
| | | |||||
| * | Check whether we support the proposed channel binding type. | Tobias Markmann | 2011-01-15 | 2 | -0/+16 |
| | | |||||
| * | Adding some code for channel binding advertising. | Tobias Markmann | 2011-01-12 | 1 | -6/+23 |
| | | |||||
* | | Merge 0.9->trunk | Matthew Wild | 2013-09-16 | 0 | -0/+0 |
|\ \ | |||||
| * | | Tagging 0.9.1 | Matthew Wild | 2013-09-09 | 0 | -0/+0 |
| | | | |||||
* | | | moduleapi: Add module:unhook() | Matthew Wild | 2013-09-16 | 1 | -0/+4 |
| | | | |||||
* | | | net.server_select: Return handler from addclient | Kim Alvefur | 2013-09-06 | 1 | -2/+2 |
| | | | |||||
* | | | net.server_select: Pass on all arguments to addclient on to wrapclient | Kim Alvefur | 2013-09-06 | 1 | -1/+1 |
| | | | |||||
* | | | certmanager: Allow for specifying the dhparam option as a path to a file ↵ | Kim Alvefur | 2013-09-03 | 1 | -2/+17 |
| | | | | | | | | | | | | instead of a callback | ||||
* | | | Merge 0.9->trunk | Kim Alvefur | 2013-09-03 | 0 | -0/+0 |
|\| | | |||||
| * | | certmanager: Fix dhparam callback, missing imports (Testing, pfft)0.9.1 | Kim Alvefur | 2013-09-03 | 1 | -3/+5 |
| | | | |||||
* | | | Merge 0.9->trunk | Matthew Wild | 2013-09-03 | 0 | -0/+0 |
|\| | | |||||
| * | | certmanager: Allow for specifying the dhparam option as a path to a file ↵ | Kim Alvefur | 2013-09-03 | 1 | -0/+11 |
| | | | | | | | | | | | | instead of a callback | ||||
| * | | certmanager: Fix for working around a bug with LuaSec 0.4.1 that causes it ↵ | Matthew Wild | 2013-09-03 | 1 | -4/+4 |
| | | | | | | | | | | | | to not honour the 'ciphers' option. This change will apply 0.9's default cipher string for LuaSec 0.4.1 users. | ||||
* | | | mod_admin_adhoc: As the only user of set:items(), update... it's now an ↵ | Matthew Wild | 2013-09-03 | 1 | -2/+2 |
| | | | | | | | | | | | | iterator, and the extra keys() iterator is now unnecessary | ||||
* | | | util.set: :items() now returns an iterator instead of the underlying table. ↵ | Matthew Wild | 2013-09-03 | 1 | -1/+1 |
| | | | | | | | | | | | | This is much more efficient than 'for item in set' (which still works for now). Current access to _items is generally done directly, this may change. | ||||
* | | | Merge 0.9->trunk | Matthew Wild | 2013-09-03 | 4 | -6/+15 |
|\| | | |||||
| * | | util.set: Fix :include() and :exclude() methods to iterate the input set ↵ | Matthew Wild | 2013-09-02 | 1 | -2/+2 |
| | | | | | | | | | | | | correctly | ||||
| * | | util.pposix: Fix building on non-Linux with glibc | Kim Alvefur | 2013-09-02 | 1 | -2/+2 |
| | | | |||||
| * | | configmanager: Fix checking of absolute paths on Windows | Kim Alvefur | 2013-08-30 | 1 | -1/+1 |
| | | | |||||
| * | | util.net: Fix s2sout on Windows (return 0.0.0.0 and :: instead of an empty list) | Kim Alvefur | 2013-08-30 | 1 | -1/+10 |
| | | | |||||
* | | | prosodyctl: check: Support for unicode (IDN) domains (thanks once again albert) | Matthew Wild | 2013-09-02 | 1 | -7/+8 |
| | | | |||||
* | | | mod_muc: Support for locking newly-created rooms until they are configured ↵ | Matthew Wild | 2013-08-30 | 2 | -0/+26 |
| | | | | | | | | | | | | (enabled with muc_room_locking = true) | ||||
* | | | mod_muc: Import util.array | Matthew Wild | 2013-08-30 | 1 | -0/+1 |
| | | | |||||
* | | | prosody.cfg.lua.dist: Set c2s_require_encryption = true | Matthew Wild | 2013-08-29 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.9->trunk | Matthew Wild | 2013-08-24 | 1 | -1/+1 |
|\| | | |||||
| * | | mod_pep: Update COMPAT comment, it seems Asterisk 1.8 also suffers from this ↵ | Matthew Wild | 2013-08-24 | 1 | -1/+1 |
| | | | | | | | | | | | | issue (thanks Lonnie Abelbeck) | ||||
| * | | Added tag 0.9.0 for changeset 6ef79af0c445 | Matthew Wild | 2013-08-19 | 0 | -0/+0 |
| | | | |||||
* | | | mod_c2s: Move another log message to debug level | Kim Alvefur | 2013-08-14 | 1 | -1/+1 |
| | | | |||||
* | | | mod_c2s, mod_s2s: Log cipher and encryption info in a more compact and ↵ | Kim Alvefur | 2013-08-14 | 2 | -4/+2 |
| | | | | | | | | | | | | (hopefully) less confusing way | ||||
* | | | mod_s2s: Captitalize log messages that begin with a stream direction | Kim Alvefur | 2013-08-14 | 1 | -2/+2 |
| | | | |||||
* | | | mod_s2s: Lower "Beginning new connection attempt" message from info to debug ↵ | Kim Alvefur | 2013-08-14 | 1 | -1/+1 |
| | | | | | | | | | | | | level | ||||
* | | | mod_s2s/s2sout.lib: Improve error message logged at 'info' level when ↵ | Matthew Wild | 2013-08-14 | 1 | -1/+1 |
| | | | | | | | | | | | | failing to connect to a host. Now 'Failed in all attempts to connect to XYZ' | ||||
* | | | util.async: Make guarder() local | Matthew Wild | 2013-08-13 | 1 | -1/+1 |
| | | | |||||
* | | | util.async: Add guarder method, to create guards to ensure only a single ↵ | Matthew Wild | 2013-08-13 | 1 | -1/+37 |
| | | | | | | | | | | | | runner can pass through a section of code at a time | ||||
* | | | usermanager: Remove unused import of pairs() | Matthew Wild | 2013-08-13 | 1 | -1/+0 |
| | | | |||||
* | | | util.async: Fix logic bug that prevented error watcher being called for runners | Matthew Wild | 2013-08-13 | 1 | -2/+6 |
| | | |