Merge pull request #1659 from reaperhulk/move-cipher-interfaces

Move cipher and mode interfaces