Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md

Author: bungle

README.md

@@ -61,10 +61,15 @@ http {
 
 ## Roadmap
 
-* [ ] Add support for hmac plugins (e.g. in case where we have cipher that already supports authentication with associated data aka AEAD)
-* [ ] Add support for session id generator plugins (maybe you don't want to use random data, and want UUID or maybe some kind of database identifier instead).
-* [ ] Add support for `lua-resty-nettle` for more wide variety of encryption algorithms as a plugin.
-* [ ] Implement cookieless server-side session support using `ssl_session_id` as a `session.id` (using a server-side storage).
+* Add support for session id generator plugins (maybe you don't want to use random data, and want UUID or maybe some kind of database identifier instead).
+* Add support for different schemes:
+    * Encrypt-and-MAC: The ciphertext is generated by encrypting the plaintext and then appending a MAC of the plaintext.
+    * MAC-then-encrypt: The ciphertext is generated by appending a MAC to the plaintext and then encrypting everything.
+    * Encrypt-then-MAC: The ciphertext is generated by encrypting the plaintext and then appending a MAC of the encrypted plaintext.
+    * Authenticated Encryption with Associated Data (AEAD)
+* Add support for HMAC plugins
+* Add support for `lua-resty-nettle` for more wide variety of encryption algorithms as a plugin.
+* Implement cookieless server-side session support using `ssl_session_id` as a `session.id` (using a server-side storage).
 
 ## Installation