jdk-sandbox: comparison src/java.base/share/classes/sun/security/ssl/SSLCipher.java

equal deleted inserted replaced

-:2d7e08d730b6
+:b152d06ed6a9
 //
 // We assume all supported ciphers are always available since they are
 // shipped with the SunJCE  provider.  However, AES/256 is unavailable
 // when the default JCE policy jurisdiction files are installed because
 // of key length restrictions.
-this.isAvailable =
+this.isAvailable = allowed && isUnlimited(keySize, transformation);
-allowed ? isUnlimited(keySize, transformation) : false;
 this.readCipherGenerators = readCipherGenerators;
 this.writeCipherGenerators = writeCipherGenerators;
 }
 if (rcg != null) {
 return rcg.createCipher(this, authenticator,
 protocolVersion, transformation, key, iv, random);
 }
 return null;
-}
-public static final String getDefaultType() {
-String prop = AccessController.doPrivileged(
-new PrivilegedAction<String>() {
-@Override
-public String run() {
-return Security.getProperty("jdk.tls.KeyLimits");
-}
-});
-return prop;
 }
 /**
 * Test if this bulk cipher is available. For use by CipherSuite.
 */
 throw new RuntimeException(
 "Unexpected number of plaintext bytes");
 }
 if (bb.position() != dup.position()) {
 throw new RuntimeException(
-"Unexpected Bytebuffer position");
+"Unexpected ByteBuffer position");
 }
 } catch (ShortBufferException sbe) {
 // catch BouncyCastle buffering error
 throw new RuntimeException("Cipher buffering error in " +
 "JCE provider " + cipher.getProvider().getName(), sbe);
 throw new RuntimeException(
 "Unexpected number of plaintext bytes");
 }
 if (bb.position() != dup.position()) {
 throw new RuntimeException(
-"Unexpected Bytebuffer position");
+"Unexpected ByteBuffer position");
 }
 } catch (ShortBufferException sbe) {
 // catch BouncyCastle buffering error
 throw new RuntimeException("Cipher buffering error in " +
 "JCE provider " + cipher.getProvider().getName(), sbe);
 "Unexpected number of plaintext bytes");
 }
 if (bb.position() != dup.position()) {
 throw new RuntimeException(
-"Unexpected Bytebuffer position");
+"Unexpected ByteBuffer position");
 }
 } catch (ShortBufferException sbe) {
 // catch BouncyCastle buffering error
 throw new RuntimeException("Cipher buffering error in " +
 "JCE provider " + cipher.getProvider().getName(), sbe);
 "Unexpected number of plaintext bytes");
 }
 if (bb.position() != dup.position()) {
 throw new RuntimeException(
-"Unexpected Bytebuffer position");
+"Unexpected ByteBuffer position");
 }
 } catch (ShortBufferException sbe) {
 // catch BouncyCastle buffering error
 throw new RuntimeException("Cipher buffering error in " +
 "JCE provider " + cipher.getProvider().getName(), sbe);
 "Unexpected number of plaintext bytes");
 }
 if (bb.position() != dup.position()) {
 throw new RuntimeException(
-"Unexpected Bytebuffer position");
+"Unexpected ByteBuffer position");
 }
 } catch (ShortBufferException sbe) {
 // catch BouncyCastle buffering error
 throw new RuntimeException("Cipher buffering error in " +
 "JCE provider " + cipher.getProvider().getName(), sbe);
 "Unexpected number of plaintext bytes");
 }
 if (bb.position() != dup.position()) {
 throw new RuntimeException(
-"Unexpected Bytebuffer position");
+"Unexpected ByteBuffer position");
 }
 } catch (ShortBufferException sbe) {
 // catch BouncyCastle buffering error
 throw new RuntimeException("Cipher buffering error in " +
 "JCE provider " + cipher.getProvider().getName(), sbe);
 sequence);
 cipher.updateAAD(aad);
 // DON'T decrypt the nonce_explicit for AEAD mode. The buffer
 // position has moved out of the nonce_explicit range.
-int len = bb.remaining();
+int len, pos = bb.position();
-int pos = bb.position();
 ByteBuffer dup = bb.duplicate();
 try {
 len = cipher.doFinal(dup, bb);
 } catch (IllegalBlockSizeException ibse) {
 // unlikely to happen
 } catch (ShortBufferException sbe) {
 // catch BouncyCastle buffering error
 throw new RuntimeException("Cipher buffering error in " +
 "JCE provider " + cipher.getProvider().getName(), sbe);
 }
-// reset the limit to the end of the decryted data
+// reset the limit to the end of the decrypted data
 bb.position(pos);
 bb.limit(pos + len);
 if (SSLLogger.isOn && SSLLogger.isOn("plaintext")) {
 SSLLogger.fine(
 // DON'T WORRY, the nonce spaces are considered already.
 bb.position(bb.position() - nonce.length);
 bb.put(nonce);
 // DON'T encrypt the nonce for AEAD mode.
-int len = bb.remaining();
+int len, pos = bb.position();
-int pos = bb.position();
 if (SSLLogger.isOn && SSLLogger.isOn("plaintext")) {
 SSLLogger.fine(
 "Plaintext before ENCRYPTION",
 bb.duplicate());
 }
 // implicit sequence number of the authenticator.
 byte[] aad = authenticator.acquireAuthenticationBytes(
 contentType, bb.remaining(), sn);
 cipher.updateAAD(aad);
-int len = bb.remaining();
+int len, pos = bb.position();
-int pos = bb.position();
 ByteBuffer dup = bb.duplicate();
 try {
 len = cipher.doFinal(dup, bb);
 } catch (IllegalBlockSizeException ibse) {
 // unlikely to happen
 } catch (ShortBufferException sbe) {
 // catch BouncyCastle buffering error
 throw new RuntimeException("Cipher buffering error in " +
 "JCE provider " + cipher.getProvider().getName(), sbe);
 }
-// reset the limit to the end of the decryted data
+// reset the limit to the end of the decrypted data
 bb.position(pos);
 bb.limit(pos + len);
 // remove inner plaintext padding
 int i = bb.limit() - 1;
 int outputSize = cipher.getOutputSize(bb.remaining());
 byte[] aad = authenticator.acquireAuthenticationBytes(
 contentType, outputSize, sn);
 cipher.updateAAD(aad);
-int len = bb.remaining();
+int len, pos = bb.position();
-int pos = bb.position();
 if (SSLLogger.isOn && SSLLogger.isOn("plaintext")) {
 SSLLogger.fine(
 "Plaintext before ENCRYPTION",
 bb.duplicate());
 }
 // the purpose of a constant-time check.
 int[] results = {0, 0};     // {missed #, matched #}
 // The caller ensures there are enough bytes available in the buffer.
 // So we won't need to check the remaining of the buffer.
-for (int i = 0; i < tag.length; i++) {
+for (byte t : tag) {
-if (bb.get() != tag[i]) {
+if (bb.get() != t) {
 results[0]++;       // mismatched bytes
 } else {
 results[1]++;       // matched bytes
 }
 }

branch	JDK-8145252-TLS13-branch
changeset 56715	b152d06ed6a9
parent 56542	56aaa6cb3693
child 56784	6210466cf1ac