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

equal deleted inserted replaced

-:1fa861caf840
+:2ee9017c7597
 private final boolean       isDTLS;
 byte[]                      compression_methods;
 HelloExtensions extensions = new HelloExtensions();
-private final static byte[]  NULL_COMPRESSION = new byte[] {0};
+private static final byte[]  NULL_COMPRESSION = new byte[] {0};
 ClientHello(SecureRandom generator, ProtocolVersion protocolVersion,
 SessionId sessionId, CipherSuiteList cipherSuites,
 boolean isDTLS) {
 * If a server certificate is sent, there is no anonymity.  However,
 * when a certificate is sent, ephemeral keys may still be used to
 * exchange the premaster secret.  That's how RSA_EXPORT often works,
 * as well as how the DHE_* flavors work.
 */
-static abstract class ServerKeyExchange extends HandshakeMessage
+abstract static class ServerKeyExchange extends HandshakeMessage
 {
 @Override
 int messageType() { return ht_server_key_exchange; }
 }
 */
 static final
 class DH_ServerKeyExchange extends ServerKeyExchange
 {
 // Fix message encoding, see 4348279
-private final static boolean dhKeyExchangeFix =
+private static final boolean dhKeyExchangeFix =
 Debug.getBooleanProperty("com.sun.net.ssl.dhKeyExchangeFix", true);
 private byte[]                dh_p;        // 1 to 2^16 - 1 bytes
 private byte[]                dh_g;        // 1 to 2^16 - 1 bytes
 private byte[]                dh_Ys;       // 1 to 2^16 - 1 bytes
 */
 static final
 class ECDH_ServerKeyExchange extends ServerKeyExchange {
 // constants for ECCurveType
-private final static int CURVE_EXPLICIT_PRIME = 1;
+private static final int CURVE_EXPLICIT_PRIME = 1;
-private final static int CURVE_EXPLICIT_CHAR2 = 2;
+private static final int CURVE_EXPLICIT_CHAR2 = 2;
-private final static int CURVE_NAMED_CURVE    = 3;
+private static final int CURVE_NAMED_CURVE    = 3;
 // id of the curve we are using
 private int curveId;
 // encoded public point
 private byte[] pointBytes;
 // From RFC 4492 (ECC)
 static final int    cct_ecdsa_sign       = 64;
 static final int    cct_rsa_fixed_ecdh   = 65;
 static final int    cct_ecdsa_fixed_ecdh = 66;
-private final static byte[] TYPES_NO_ECC = { cct_rsa_sign, cct_dss_sign };
+private static final byte[] TYPES_NO_ECC = { cct_rsa_sign, cct_dss_sign };
-private final static byte[] TYPES_ECC =
+private static final byte[] TYPES_ECC =
 { cct_rsa_sign, cct_dss_sign, cct_ecdsa_sign };
 byte[]                types;               // 1 to 255 types
 DistinguishedName[]   authorities;         // 3 to 2^16 - 1
 // ... "3" because that's the smallest DER-encoded X500 DN
 }
 md.update(pad2);
 md.update(temp);
 }
-private final static Class<?> delegate;
+private static final Class<?> delegate;
-private final static Field spiField;
+private static final Field spiField;
 static {
 try {
 delegate = Class.forName("java.security.MessageDigest$Delegate");
 spiField = delegate.getDeclaredField("digestSpi");
 }
 });
 }
 // ConcurrentHashMap does not allow null values, use this marker object
-private final static Object NULL_OBJECT = new Object();
+private static final Object NULL_OBJECT = new Object();
 // cache Method objects per Spi class
 // Note that this will prevent the Spi classes from being GC'd. We assume
 // that is not a problem.
-private final static Map<Class<?>,Object> methodCache =
+private static final Map<Class<?>,Object> methodCache =
 new ConcurrentHashMap<>();
 private static void digestKey(MessageDigest md, SecretKey key) {
 try {
 // Verify that md is implemented via MessageDigestSpi, not
 * connection (e.g. a previous handshake arranged one).
 */
 static final class Finished extends HandshakeMessage {
 // constant for a Finished message sent by the client
-final static int CLIENT = 1;
+static final int CLIENT = 1;
 // constant for a Finished message sent by the server
-final static int SERVER = 2;
+static final int SERVER = 2;
 // enum Sender:  "CLNT" and "SRVR"
 private static final byte[] SSL_CLIENT = { 0x43, 0x4C, 0x4E, 0x54 };
 private static final byte[] SSL_SERVER = { 0x53, 0x52, 0x56, 0x52 };

changeset 32649	2ee9017c7597
parent 32032	22badc53802f
child 34380	2b2609379881