Merge pull request #871 from prbprbprb/bytebuf_switch

Add a boolean to OpenSSLAeadCipher to control optimisations.

common/src/main/java/org/conscrypt/OpenSSLAeadCipher.java

@@ -32,6 +32,11 @@
 
 @Internal
 public abstract class OpenSSLAeadCipher extends OpenSSLCipher {
+    /**
+     * Controls whether no-copy optimizations for direct ByteBuffers are enabled.
+     */
+    private static final boolean ENABLE_BYTEBUFFER_OPTIMIZATIONS = true;
+
     /**
      * The default tag size when one is not specified. Default to
      * full-length tags (128-bits or 16 octets).
@@ -223,6 +228,9 @@ boolean allowsNonceReuse() {
     @Override
     protected int engineDoFinal(ByteBuffer input, ByteBuffer output) throws ShortBufferException,
             IllegalBlockSizeException, BadPaddingException {
+        if (!ENABLE_BYTEBUFFER_OPTIMIZATIONS) {
+            return super.engineDoFinal(input, output);
+        }
         if (input == null || output == null) {
             throw new NullPointerException("Null ByteBuffer Error");
         }