am 110054e9: OpenSSLCipher: refactor in preparation for AEAD

* commit '110054e9931e167e32ec0f31bf00b58a8ad3882c':
  OpenSSLCipher: refactor in preparation for AEAD