Get the encryptThenMAC setting from SecurityContext

1 files changed, 2 insertions, 5 deletions

diff --git a/core/src/main/java/org/bouncycastle/crypto/tls/TlsBlockCipher.java b/core/src/main/java/org/bouncycastle/crypto/tls/TlsBlockCipher.java
index 89ee4372..d02d4876 100644
--- a/core/src/main/java/org/bouncycastle/crypto/tls/TlsBlockCipher.java
+++ b/core/src/main/java/org/bouncycastle/crypto/tls/TlsBlockCipher.java
@@ -16,14 +16,10 @@ import org.bouncycastle.util.Arrays;
 public class TlsBlockCipher
     implements TlsCipher
 {
-    /*
-     * See http://tools.ietf.org/html/draft-gutmann-tls-encrypt-then-mac-05
-     */
-    private static boolean encryptThenMAC = false;
-
     protected TlsContext context;
     protected byte[] randomData;
     protected boolean useExplicitIV;
+    private boolean encryptThenMAC;
 
     protected BlockCipher encryptCipher;
     protected BlockCipher decryptCipher;
@@ -50,6 +46,7 @@ public class TlsBlockCipher
         context.getSecureRandom().nextBytes(randomData);
 
         this.useExplicitIV = TlsUtils.isTLSv11(context);
+        this.encryptThenMAC = context.getSecurityParameters().encryptThenMAC;
 
         int key_block_size = (2 * cipherKeySize) + clientWriteDigest.getDigestSize()
             + serverWriteDigest.getDigestSize();