cleanup
added support for RFC 2440 and RFC 2633 signed and encrypted messages