# HG changeset patch # User jnimeh # Date 1528433841 25200 # Node ID 585e6d31677b5b1457c037aa9a5dcda2cc3457bd # Parent 33a2451070d3217b16bba031a00a0a29869dda2e# Parent c3ee22c3a0f6f9b91121f25e7b7cab3adb493af4 Minor nits and cleanup across SSLExtension classes Summary: Correct spelling errors in comments and variable names, remove dead code. diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/AlpnExtension.java --- a/src/java.base/share/classes/sun/security/ssl/AlpnExtension.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/AlpnExtension.java Thu Jun 07 21:57:21 2018 -0700 @@ -44,17 +44,17 @@ */ final class AlpnExtension { static final HandshakeProducer chNetworkProducer = new CHAlpnProducer(); - static final ExtensionConsumer chOnLoadConcumer = new CHAlpnConsumer(); + static final ExtensionConsumer chOnLoadConsumer = new CHAlpnConsumer(); static final HandshakeAbsence chOnLoadAbsence = new CHAlpnAbsence(); static final HandshakeProducer shNetworkProducer = new SHAlpnProducer(); - static final ExtensionConsumer shOnLoadConcumer = new SHAlpnConsumer(); + static final ExtensionConsumer shOnLoadConsumer = new SHAlpnConsumer(); static final HandshakeAbsence shOnLoadAbsence = new SHAlpnAbsence(); // Note: we reuse ServerHello operations for EncryptedExtensions for now. // Please be careful about any code or specification changes in the future. static final HandshakeProducer eeNetworkProducer = new SHAlpnProducer(); - static final ExtensionConsumer eeOnLoadConcumer = new SHAlpnConsumer(); + static final ExtensionConsumer eeOnLoadConsumer = new SHAlpnConsumer(); static final HandshakeAbsence eeOnLoadAbsence = new SHAlpnAbsence(); static final SSLStringize alpnStringize = new AlpnStringize(); @@ -238,7 +238,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; // Is it a supported and enabled extension? diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/CertSignAlgsExtension.java --- a/src/java.base/share/classes/sun/security/ssl/CertSignAlgsExtension.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/CertSignAlgsExtension.java Thu Jun 07 21:57:21 2018 -0700 @@ -38,14 +38,14 @@ final class CertSignAlgsExtension { static final HandshakeProducer chNetworkProducer = new CHCertSignatureSchemesProducer(); - static final ExtensionConsumer chOnLoadConcumer = + static final ExtensionConsumer chOnLoadConsumer = new CHCertSignatureSchemesConsumer(); static final HandshakeConsumer chOnTradeConsumer = new CHCertSignatureSchemesUpdate(); static final HandshakeProducer crNetworkProducer = new CRCertSignatureSchemesProducer(); - static final ExtensionConsumer crOnLoadConcumer = + static final ExtensionConsumer crOnLoadConsumer = new CRCertSignatureSchemesConsumer(); static final HandshakeConsumer crOnTradeConsumer = new CRCertSignatureSchemesUpdate(); @@ -134,7 +134,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; // Is it a supported and enabled extension? @@ -179,7 +179,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; SignatureSchemesSpec spec = (SignatureSchemesSpec) @@ -280,7 +280,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in client side only. + // The consuming happens in client side only. ClientHandshakeContext chc = (ClientHandshakeContext)context; // Is it a supported and enabled extension? @@ -325,7 +325,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message) throws IOException { - // The comsuming happens in client side only. + // The consuming happens in client side only. ClientHandshakeContext chc = (ClientHandshakeContext)context; SignatureSchemesSpec spec = (SignatureSchemesSpec) diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java --- a/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java Thu Jun 07 21:57:21 2018 -0700 @@ -590,7 +590,7 @@ public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; if (!shc.sslConfig.isAvailable(CH_STATUS_REQUEST)) { @@ -947,7 +947,7 @@ public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; if (!shc.sslConfig.isAvailable(CH_STATUS_REQUEST_V2)) { diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/ClientKeyExchange.java --- a/src/java.base/share/classes/sun/security/ssl/ClientKeyExchange.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/ClientKeyExchange.java Thu Jun 07 21:57:21 2018 -0700 @@ -66,7 +66,7 @@ } } - // not comsumer defined. + // not consumer defined. chc.conContext.fatal(Alert.UNEXPECTED_MESSAGE, "Unexpected ClientKeyExchange handshake message."); return null; // make the compiler happe @@ -102,7 +102,7 @@ } } - // not comsumer defined. + // not consumer defined. shc.conContext.fatal(Alert.UNEXPECTED_MESSAGE, "Unexpected ClientKeyExchange handshake message."); } diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/CookieExtension.java --- a/src/java.base/share/classes/sun/security/ssl/CookieExtension.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/CookieExtension.java Thu Jun 07 21:57:21 2018 -0700 @@ -41,14 +41,14 @@ public class CookieExtension { static final HandshakeProducer chNetworkProducer = new CHCookieProducer(); - static final ExtensionConsumer chOnLoadConcumer = + static final ExtensionConsumer chOnLoadConsumer = new CHCookieConsumer(); static final HandshakeConsumer chOnTradeConsumer = new CHCookieUpdate(); static final HandshakeProducer hrrNetworkProducer = new HRRCookieProducer(); - static final ExtensionConsumer hrrOnLoadConcumer = + static final ExtensionConsumer hrrOnLoadConsumer = new HRRCookieConsumer(); static final HandshakeProducer hrrNetworkReproducer = @@ -147,7 +147,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; // Is it a supported and enabled extension? @@ -187,7 +187,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; ClientHelloMessage clientHello = (ClientHelloMessage)message; @@ -254,7 +254,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in client side only. + // The consuming happens in client side only. ClientHandshakeContext chc = (ClientHandshakeContext)context; // Is it a supported and enabled extension? diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java --- a/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java Thu Jun 07 21:57:21 2018 -0700 @@ -224,7 +224,7 @@ // invalid, discard this record [section 4.1.2.7, RFC 6347] return null; } finally { - // comsume a complete record + // consume a complete record packet.limit(srcLim); packet.position(recLim); } diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/ECPointFormatsExtension.java --- a/src/java.base/share/classes/sun/security/ssl/ECPointFormatsExtension.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/ECPointFormatsExtension.java Thu Jun 07 21:57:21 2018 -0700 @@ -42,10 +42,10 @@ final class ECPointFormatsExtension { static final HandshakeProducer chNetworkProducer = new CHECPointFormatsProducer(); - static final ExtensionConsumer chOnLoadConcumer = + static final ExtensionConsumer chOnLoadConsumer = new CHECPointFormatsConsumer(); - static final ExtensionConsumer shOnLoadConcumer = + static final ExtensionConsumer shOnLoadConsumer = new SHECPointFormatsConsumer(); static final SSLStringize epfStringize = @@ -214,7 +214,7 @@ public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; // Is it a supported and enabled extension? @@ -265,7 +265,7 @@ public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in client side only. + // The consuming happens in client side only. ClientHandshakeContext chc = (ClientHandshakeContext)context; // In response to "ec_point_formats" extension request only diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java --- a/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java Thu Jun 07 21:57:21 2018 -0700 @@ -41,14 +41,14 @@ final class ExtendedMasterSecretExtension { static final HandshakeProducer chNetworkProducer = new CHExtendedMasterSecretProducer(); - static final ExtensionConsumer chOnLoadConcumer = + static final ExtensionConsumer chOnLoadConsumer = new CHExtendedMasterSecretConsumer(); static final HandshakeAbsence chOnLoadAbsence = new CHExtendedMasterSecretAbsence(); static final HandshakeProducer shNetworkProducer = new SHExtendedMasterSecretProducer(); - static final ExtensionConsumer shOnLoadConcumer = + static final ExtensionConsumer shOnLoadConsumer = new SHExtendedMasterSecretConsumer(); static final HandshakeAbsence shOnLoadAbsence = new SHExtendedMasterSecretAbsence(); @@ -153,7 +153,7 @@ public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; // Is it a supported and enabled extension? diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/Finished.java --- a/src/java.base/share/classes/sun/security/ssl/Finished.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/Finished.java Thu Jun 07 21:57:21 2018 -0700 @@ -508,7 +508,7 @@ // The consuming happens in handshake context only. HandshakeContext hc = (HandshakeContext)context; - // This comsumer can be used only once. + // This consumer can be used only once. hc.handshakeConsumers.remove(SSLHandshake.FINISHED.id); // We should not be processing finished messages unless diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/HandshakeConsumer.java --- a/src/java.base/share/classes/sun/security/ssl/HandshakeConsumer.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/HandshakeConsumer.java Thu Jun 07 21:57:21 2018 -0700 @@ -29,7 +29,7 @@ import sun.security.ssl.SSLHandshake.HandshakeMessage; interface HandshakeConsumer { - // message: the handshake message to be comsumed. + // message: the handshake message to be consumed. void consume(ConnectionContext context, HandshakeMessage message) throws IOException; } diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/KeyShareExtension.java --- a/src/java.base/share/classes/sun/security/ssl/KeyShareExtension.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/KeyShareExtension.java Thu Jun 07 21:57:21 2018 -0700 @@ -57,14 +57,14 @@ final class KeyShareExtension { static final HandshakeProducer chNetworkProducer = new CHKeyShareProducer(); - static final ExtensionConsumer chOnLoadConcumer = + static final ExtensionConsumer chOnLoadConsumer = new CHKeyShareConsumer(); static final SSLStringize chStringize = new CHKeyShareStringize(); static final HandshakeProducer shNetworkProducer = new SHKeyShareProducer(); - static final ExtensionConsumer shOnLoadConcumer = + static final ExtensionConsumer shOnLoadConsumer = new SHKeyShareConsumer(); static final HandshakeAbsence shOnLoadAbsence = new SHKeyShareAbsence(); @@ -73,7 +73,7 @@ static final HandshakeProducer hrrNetworkProducer = new HRRKeyShareProducer(); - static final ExtensionConsumer hrrOnLoadConcumer = + static final ExtensionConsumer hrrOnLoadConsumer = new HRRKeyShareConsumer(); static final HandshakeProducer hrrNetworkReproducer = new HRRKeyShareReproducer(); @@ -312,7 +312,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; if (shc.handshakeExtensions.containsKey(SSLExtension.CH_KEY_SHARE)) { diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/MaxFragExtension.java --- a/src/java.base/share/classes/sun/security/ssl/MaxFragExtension.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/MaxFragExtension.java Thu Jun 07 21:57:21 2018 -0700 @@ -41,19 +41,19 @@ final class MaxFragExtension { static final HandshakeProducer chNetworkProducer = new CHMaxFragmentLengthProducer(); - static final ExtensionConsumer chOnLoadConcumer = + static final ExtensionConsumer chOnLoadConsumer = new CHMaxFragmentLengthConsumer(); static final HandshakeProducer shNetworkProducer = new SHMaxFragmentLengthProducer(); - static final ExtensionConsumer shOnLoadConcumer = + static final ExtensionConsumer shOnLoadConsumer = new SHMaxFragmentLengthConsumer(); static final HandshakeConsumer shOnTradeConsumer = new SHMaxFragmentLengthUpdate(); static final HandshakeProducer eeNetworkProducer = new EEMaxFragmentLengthProducer(); - static final ExtensionConsumer eeOnLoadConcumer = + static final ExtensionConsumer eeOnLoadConsumer = new EEMaxFragmentLengthConsumer(); static final HandshakeConsumer eeOnTradeConsumer = new EEMaxFragmentLengthUpdate(); @@ -237,7 +237,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; if (!shc.sslConfig.isAvailable(CH_MAX_FRAGMENT_LENGTH)) { @@ -352,7 +352,7 @@ public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in client side only. + // The consuming happens in client side only. ClientHandshakeContext chc = (ClientHandshakeContext)context; // In response to "max_fragment_length" extension request only @@ -405,7 +405,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message) throws IOException { - // The comsuming happens in client side only. + // The consuming happens in client side only. ClientHandshakeContext chc = (ClientHandshakeContext)context; MaxFragLenSpec spec = (MaxFragLenSpec) @@ -525,7 +525,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in client side only. + // The consuming happens in client side only. ClientHandshakeContext chc = (ClientHandshakeContext)context; // In response to "max_fragment_length" extension request only @@ -577,7 +577,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message) throws IOException { - // The comsuming happens in client side only. + // The consuming happens in client side only. ClientHandshakeContext chc = (ClientHandshakeContext)context; MaxFragLenSpec spec = (MaxFragLenSpec) diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/PskKeyExchangeModesExtension.java --- a/src/java.base/share/classes/sun/security/ssl/PskKeyExchangeModesExtension.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/PskKeyExchangeModesExtension.java Thu Jun 07 21:57:21 2018 -0700 @@ -176,7 +176,7 @@ public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; // Is it a supported and enabled extension? @@ -283,7 +283,7 @@ @Override public void absent(ConnectionContext context, HandshakeMessage message) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; // No session resumptio is allowed. @@ -314,7 +314,7 @@ @Override public void absent(ConnectionContext context, HandshakeMessage message) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; // A client MUST provide a "psk_key_exchange_modes" extension if diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java --- a/src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java Thu Jun 07 21:57:21 2018 -0700 @@ -44,14 +44,14 @@ final class RenegoInfoExtension { static final HandshakeProducer chNetworkProducer = new CHRenegotiationInfoProducer(); - static final ExtensionConsumer chOnLoadConcumer = + static final ExtensionConsumer chOnLoadConsumer = new CHRenegotiationInfoConsumer(); static final HandshakeAbsence chOnLoadAbsence = new CHRenegotiationInfoAbsence(); static final HandshakeProducer shNetworkProducer = new SHRenegotiationInfoProducer(); - static final ExtensionConsumer shOnLoadConcumer = + static final ExtensionConsumer shOnLoadConsumer = new SHRenegotiationInfoConsumer(); static final HandshakeAbsence shOnLoadAbsence = new SHRenegotiationInfoAbsence(); @@ -209,7 +209,7 @@ public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; // Is it a supported and enabled extension? diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java --- a/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java Thu Jun 07 21:57:21 2018 -0700 @@ -255,7 +255,7 @@ throw (SSLProtocolException)(new SSLProtocolException( "Unexpected exception")).initCause(gse); } finally { - // comsume a complete record + // consume a complete record packet.limit(srcLim); packet.position(recLim); } diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/SSLExtension.java --- a/src/java.base/share/classes/sun/security/ssl/SSLExtension.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/SSLExtension.java Thu Jun 07 21:57:21 2018 -0700 @@ -36,12 +36,12 @@ import sun.security.util.HexDumpEncoder; enum SSLExtension implements SSLStringize { - // Extensions defined in RFC 3546 + // Extensions defined in RFC 6066 CH_SERVER_NAME (0x0000, "server_name", SSLHandshake.CLIENT_HELLO, ProtocolVersion.PROTOCOLS_TO_13, ServerNameExtension.chNetworkProducer, - ServerNameExtension.chOnLoadConcumer, + ServerNameExtension.chOnLoadConsumer, null, null, null, @@ -50,7 +50,7 @@ SSLHandshake.SERVER_HELLO, ProtocolVersion.PROTOCOLS_TO_12, ServerNameExtension.shNetworkProducer, - ServerNameExtension.shOnLoadConcumer, + ServerNameExtension.shOnLoadConsumer, null, null, null, @@ -59,7 +59,7 @@ SSLHandshake.ENCRYPTED_EXTENSIONS, ProtocolVersion.PROTOCOLS_OF_13, ServerNameExtension.eeNetworkProducer, - ServerNameExtension.eeOnLoadConcumer, + ServerNameExtension.eeOnLoadConsumer, null, null, null, @@ -68,7 +68,7 @@ SSLHandshake.CLIENT_HELLO, ProtocolVersion.PROTOCOLS_TO_13, MaxFragExtension.chNetworkProducer, - MaxFragExtension.chOnLoadConcumer, + MaxFragExtension.chOnLoadConsumer, null, null, null, @@ -77,7 +77,7 @@ SSLHandshake.SERVER_HELLO, ProtocolVersion.PROTOCOLS_TO_12, MaxFragExtension.shNetworkProducer, - MaxFragExtension.shOnLoadConcumer, + MaxFragExtension.shOnLoadConsumer, null, MaxFragExtension.shOnTradeConsumer, null, @@ -86,7 +86,7 @@ SSLHandshake.ENCRYPTED_EXTENSIONS, ProtocolVersion.PROTOCOLS_OF_13, MaxFragExtension.eeNetworkProducer, - MaxFragExtension.eeOnLoadConcumer, + MaxFragExtension.eeOnLoadConsumer, null, MaxFragExtension.eeOnTradeConsumer, null, @@ -139,7 +139,7 @@ SSLHandshake.CLIENT_HELLO, ProtocolVersion.PROTOCOLS_TO_13, SupportedGroupsExtension.chNetworkProducer, - SupportedGroupsExtension.chOnLoadConcumer, + SupportedGroupsExtension.chOnLoadConsumer, null, null, null, @@ -148,7 +148,7 @@ SSLHandshake.ENCRYPTED_EXTENSIONS, ProtocolVersion.PROTOCOLS_OF_13, SupportedGroupsExtension.eeNetworkProducer, - SupportedGroupsExtension.eeOnLoadConcumer, + SupportedGroupsExtension.eeOnLoadConsumer, null, null, null, @@ -158,7 +158,7 @@ SSLHandshake.CLIENT_HELLO, ProtocolVersion.PROTOCOLS_TO_12, ECPointFormatsExtension.chNetworkProducer, - ECPointFormatsExtension.chOnLoadConcumer, + ECPointFormatsExtension.chOnLoadConsumer, null, null, null, @@ -167,7 +167,7 @@ SSLHandshake.SERVER_HELLO, ProtocolVersion.PROTOCOLS_TO_12, null, // not use of the producer - ECPointFormatsExtension.shOnLoadConcumer, + ECPointFormatsExtension.shOnLoadConsumer, null, null, null, @@ -181,7 +181,7 @@ SSLHandshake.CLIENT_HELLO, ProtocolVersion.PROTOCOLS_12_13, SignatureAlgorithmsExtension.chNetworkProducer, - SignatureAlgorithmsExtension.chOnLoadConcumer, + SignatureAlgorithmsExtension.chOnLoadConsumer, SignatureAlgorithmsExtension.chOnLoadAbsence, SignatureAlgorithmsExtension.chOnTradeConsumer, SignatureAlgorithmsExtension.chOnTradeAbsence, @@ -190,7 +190,7 @@ SSLHandshake.CERTIFICATE_REQUEST, ProtocolVersion.PROTOCOLS_OF_13, SignatureAlgorithmsExtension.crNetworkProducer, - SignatureAlgorithmsExtension.crOnLoadConcumer, + SignatureAlgorithmsExtension.crOnLoadConsumer, SignatureAlgorithmsExtension.crOnLoadAbsence, SignatureAlgorithmsExtension.crOnTradeConsumer, null, @@ -200,7 +200,7 @@ SSLHandshake.CLIENT_HELLO, ProtocolVersion.PROTOCOLS_12_13, CertSignAlgsExtension.chNetworkProducer, - CertSignAlgsExtension.chOnLoadConcumer, + CertSignAlgsExtension.chOnLoadConsumer, null, CertSignAlgsExtension.chOnTradeConsumer, null, @@ -209,7 +209,7 @@ SSLHandshake.CERTIFICATE_REQUEST, ProtocolVersion.PROTOCOLS_OF_13, CertSignAlgsExtension.crNetworkProducer, - CertSignAlgsExtension.crOnLoadConcumer, + CertSignAlgsExtension.crOnLoadConsumer, null, CertSignAlgsExtension.crOnTradeConsumer, null, @@ -226,7 +226,7 @@ SSLHandshake.CLIENT_HELLO, ProtocolVersion.PROTOCOLS_TO_13, AlpnExtension.chNetworkProducer, - AlpnExtension.chOnLoadConcumer, + AlpnExtension.chOnLoadConsumer, AlpnExtension.chOnLoadAbsence, null, null, @@ -235,7 +235,7 @@ SSLHandshake.SERVER_HELLO, ProtocolVersion.PROTOCOLS_TO_12, AlpnExtension.shNetworkProducer, - AlpnExtension.shOnLoadConcumer, + AlpnExtension.shOnLoadConsumer, AlpnExtension.shOnLoadAbsence, null, null, @@ -244,7 +244,7 @@ SSLHandshake.ENCRYPTED_EXTENSIONS, ProtocolVersion.PROTOCOLS_OF_13, AlpnExtension.shNetworkProducer, - AlpnExtension.shOnLoadConcumer, + AlpnExtension.shOnLoadConsumer, AlpnExtension.shOnLoadAbsence, null, null, @@ -288,7 +288,7 @@ SSLHandshake.CLIENT_HELLO, ProtocolVersion.PROTOCOLS_TO_12, ExtendedMasterSecretExtension.chNetworkProducer, - ExtendedMasterSecretExtension.chOnLoadConcumer, + ExtendedMasterSecretExtension.chOnLoadConsumer, ExtendedMasterSecretExtension.chOnLoadAbsence, null, null, @@ -297,7 +297,7 @@ SSLHandshake.SERVER_HELLO, ProtocolVersion.PROTOCOLS_TO_12, ExtendedMasterSecretExtension.shNetworkProducer, - ExtendedMasterSecretExtension.shOnLoadConcumer, + ExtendedMasterSecretExtension.shOnLoadConsumer, ExtendedMasterSecretExtension.shOnLoadAbsence, null, null, @@ -321,7 +321,7 @@ SSLHandshake.CLIENT_HELLO, ProtocolVersion.PROTOCOLS_OF_13, SupportedVersionsExtension.chNetworkProducer, - SupportedVersionsExtension.chOnLoadConcumer, + SupportedVersionsExtension.chOnLoadConsumer, null, null, null, @@ -331,7 +331,7 @@ // and HelloRetryRequest ProtocolVersion.PROTOCOLS_OF_13, SupportedVersionsExtension.shNetworkProducer, - SupportedVersionsExtension.shOnLoadConcumer, + SupportedVersionsExtension.shOnLoadConsumer, null, null, null, @@ -340,7 +340,7 @@ SSLHandshake.HELLO_RETRY_REQUEST, ProtocolVersion.PROTOCOLS_OF_13, SupportedVersionsExtension.hrrNetworkProducer, - SupportedVersionsExtension.hrrOnLoadConcumer, + SupportedVersionsExtension.hrrOnLoadConsumer, null, null, null, @@ -357,7 +357,7 @@ SSLHandshake.CLIENT_HELLO, ProtocolVersion.PROTOCOLS_OF_13, CookieExtension.chNetworkProducer, - CookieExtension.chOnLoadConcumer, + CookieExtension.chOnLoadConsumer, null, CookieExtension.chOnTradeConsumer, null, @@ -366,7 +366,7 @@ SSLHandshake.HELLO_RETRY_REQUEST, ProtocolVersion.PROTOCOLS_OF_13, CookieExtension.hrrNetworkProducer, - CookieExtension.hrrOnLoadConcumer, + CookieExtension.hrrOnLoadConsumer, null, null, null, CookieExtension.cookieStringize), @@ -395,14 +395,14 @@ SSLHandshake.CLIENT_HELLO, ProtocolVersion.PROTOCOLS_OF_13, KeyShareExtension.chNetworkProducer, - KeyShareExtension.chOnLoadConcumer, + KeyShareExtension.chOnLoadConsumer, null, null, null, KeyShareExtension.chStringize), SH_KEY_SHARE (0x0033, "key_share", SSLHandshake.SERVER_HELLO, ProtocolVersion.PROTOCOLS_OF_13, KeyShareExtension.shNetworkProducer, - KeyShareExtension.shOnLoadConcumer, + KeyShareExtension.shOnLoadConsumer, KeyShareExtension.shOnLoadAbsence, null, null, @@ -411,7 +411,7 @@ SSLHandshake.HELLO_RETRY_REQUEST, ProtocolVersion.PROTOCOLS_OF_13, KeyShareExtension.hrrNetworkProducer, - KeyShareExtension.hrrOnLoadConcumer, + KeyShareExtension.hrrOnLoadConsumer, null, null, null, KeyShareExtension.hrrStringize), MH_KEY_SHARE (0x0033, "key_share", @@ -426,7 +426,7 @@ SSLHandshake.CLIENT_HELLO, ProtocolVersion.PROTOCOLS_TO_12, RenegoInfoExtension.chNetworkProducer, - RenegoInfoExtension.chOnLoadConcumer, + RenegoInfoExtension.chOnLoadConsumer, RenegoInfoExtension.chOnLoadAbsence, null, null, @@ -435,7 +435,7 @@ SSLHandshake.SERVER_HELLO, ProtocolVersion.PROTOCOLS_TO_12, RenegoInfoExtension.shNetworkProducer, - RenegoInfoExtension.shOnLoadConcumer, + RenegoInfoExtension.shOnLoadConsumer, RenegoInfoExtension.shOnLoadAbsence, null, null, @@ -465,7 +465,7 @@ final String name; final ProtocolVersion[] supportedProtocols; final HandshakeProducer networkProducer; - final ExtensionConsumer onLoadConcumer; + final ExtensionConsumer onLoadConsumer; final HandshakeAbsence onLoadAbsence; final HandshakeConsumer onTradeConsumer; final HandshakeAbsence onTradeAbsence; @@ -478,7 +478,7 @@ this.name = name; this.supportedProtocols = new ProtocolVersion[0]; this.networkProducer = null; - this.onLoadConcumer = null; + this.onLoadConsumer = null; this.onLoadAbsence = null; this.onTradeConsumer = null; this.onTradeAbsence = null; @@ -489,7 +489,7 @@ private SSLExtension(int id, String name, SSLHandshake handshakeType, ProtocolVersion[] supportedProtocols, HandshakeProducer producer, - ExtensionConsumer onLoadConcumer, HandshakeAbsence onLoadAbsence, + ExtensionConsumer onLoadConsumer, HandshakeAbsence onLoadAbsence, HandshakeConsumer onTradeConsumer, HandshakeAbsence onTradeAbsence, SSLStringize stringize) { this.id = id; @@ -497,7 +497,7 @@ this.name = name; this.supportedProtocols = supportedProtocols; this.networkProducer = producer; - this.onLoadConcumer = onLoadConcumer; + this.onLoadConsumer = onLoadConsumer; this.onLoadAbsence = onLoadAbsence; this.onTradeConsumer = onTradeConsumer; this.onTradeAbsence = onTradeAbsence; @@ -518,7 +518,7 @@ static boolean isConsumable(int extensionType) { for (SSLExtension ext : SSLExtension.values()) { if (ext.id == extensionType && - ext.onLoadConcumer != null) { + ext.onLoadConsumer != null) { return true; } } @@ -538,8 +538,8 @@ public void consumeOnLoad(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - if (onLoadConcumer != null) { - onLoadConcumer.consume(context, message, buffer); + if (onLoadConsumer != null) { + onLoadConsumer.consume(context, message, buffer); } else { throw new UnsupportedOperationException( "Not yet supported extension loading."); @@ -577,13 +577,6 @@ } public boolean isAvailable(ProtocolVersion protocolVersion) { - /* - for (ProtocolVersion pv : supportedProtocols) { - if (pv == protocolVersion) { - return true; - } - } - */ for (int i = 0; i < supportedProtocols.length; i++) { if (supportedProtocols[i] == protocolVersion) { return true; diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/SSLExtensions.java --- a/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java Thu Jun 07 21:57:21 2018 -0700 @@ -77,7 +77,7 @@ boolean isSupported = false; for (SSLExtension extension : extensions) { if ((extension.id != extId) || - (extension.onLoadConcumer == null)) { + (extension.onLoadConsumer == null)) { continue; } @@ -139,9 +139,6 @@ "Ignore unsupported extension: " + extension.name); } continue; - // context.conContext.fatal(Alert.UNSUPPORTED_EXTENSION, - // context.negotiatedProtocol + " does not support " + - // extension + " extension"); } if (!extMap.containsKey(extension)) { @@ -155,7 +152,7 @@ } - if (extension.onLoadConcumer == null) { + if (extension.onLoadConsumer == null) { if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) { SSLLogger.warning( "Ignore unsupported extension: " + extension.name); diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/SSLHandshake.java --- a/src/java.base/share/classes/sun/security/ssl/SSLHandshake.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/SSLHandshake.java Thu Jun 07 21:57:21 2018 -0700 @@ -399,7 +399,7 @@ return null; } - // The comsuming happens in handshake context only. + // The consuming happens in handshake context only. HandshakeContext hc = (HandshakeContext)context; ProtocolVersion protocolVersion; if ((hc.negotiatedProtocol == null) || @@ -439,7 +439,7 @@ return null; } - // The comsuming happens in handshake context only. + // The consuming happens in handshake context only. HandshakeContext hc = (HandshakeContext)context; ProtocolVersion protocolVersion; if ((hc.negotiatedProtocol == null) || diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/ServerKeyExchange.java --- a/src/java.base/share/classes/sun/security/ssl/ServerKeyExchange.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/ServerKeyExchange.java Thu Jun 07 21:57:21 2018 -0700 @@ -104,7 +104,7 @@ } } - // not comsumer defined. + // not consumer defined. chc.conContext.fatal(Alert.UNEXPECTED_MESSAGE, "Unexpected ServerKeyExchange handshake message."); } diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java --- a/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java Thu Jun 07 21:57:21 2018 -0700 @@ -53,21 +53,21 @@ final class ServerNameExtension { static final HandshakeProducer chNetworkProducer = new CHServerNameProducer(); - static final ExtensionConsumer chOnLoadConcumer = + static final ExtensionConsumer chOnLoadConsumer = new CHServerNameConsumer(); static final SSLStringize chStringize = new CHServerNamesStringize(); static final HandshakeProducer shNetworkProducer = new SHServerNameProducer(); - static final ExtensionConsumer shOnLoadConcumer = + static final ExtensionConsumer shOnLoadConsumer = new SHServerNameConsumer(); static final SSLStringize shStringize = new SHServerNamesStringize(); static final HandshakeProducer eeNetworkProducer = new EEServerNameProducer(); - static final ExtensionConsumer eeOnLoadConcumer = + static final ExtensionConsumer eeOnLoadConsumer = new EEServerNameConsumer(); /** @@ -272,7 +272,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; // Is it a supported and enabled extension? @@ -470,7 +470,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in client side only. + // The consuming happens in client side only. ClientHandshakeContext chc = (ClientHandshakeContext)context; // In response to "server_name" extension request only @@ -557,7 +557,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in client side only. + // The consuming happens in client side only. ClientHandshakeContext chc = (ClientHandshakeContext)context; // In response to "server_name" extension request only diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java --- a/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java Thu Jun 07 21:57:21 2018 -0700 @@ -43,7 +43,7 @@ final class SignatureAlgorithmsExtension { static final HandshakeProducer chNetworkProducer = new CHSignatureSchemesProducer(); - static final ExtensionConsumer chOnLoadConcumer = + static final ExtensionConsumer chOnLoadConsumer = new CHSignatureSchemesConsumer(); static final HandshakeAbsence chOnLoadAbsence = new CHSignatureSchemesOnLoadAbsence(); @@ -54,7 +54,7 @@ static final HandshakeProducer crNetworkProducer = new CRSignatureSchemesProducer(); - static final ExtensionConsumer crOnLoadConcumer = + static final ExtensionConsumer crOnLoadConsumer = new CRSignatureSchemesConsumer(); static final HandshakeAbsence crOnLoadAbsence = new CRSignatureSchemesAbsence(); @@ -220,7 +220,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; // Is it a supported and enabled extension? @@ -264,7 +264,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; SignatureSchemesSpec spec = @@ -320,7 +320,7 @@ @Override public void absent(ConnectionContext context, HandshakeMessage message) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; // This is a mandatory extension for certificate authentication @@ -345,7 +345,7 @@ @Override public void absent(ConnectionContext context, HandshakeMessage message) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; if (shc.negotiatedProtocol.useTLS12PlusSpec()) { @@ -447,7 +447,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in client side only. + // The consuming happens in client side only. ClientHandshakeContext chc = (ClientHandshakeContext)context; // Is it a supported and enabled extension? @@ -502,7 +502,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message) throws IOException { - // The comsuming happens in client side only. + // The consuming happens in client side only. ClientHandshakeContext chc = (ClientHandshakeContext)context; SignatureSchemesSpec spec = @@ -542,7 +542,7 @@ @Override public void absent(ConnectionContext context, HandshakeMessage message) throws IOException { - // The comsuming happens in client side only. + // The consuming happens in client side only. ClientHandshakeContext chc = (ClientHandshakeContext)context; // This is a mandatory extension for CertificateRequest handshake diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java --- a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java Thu Jun 07 21:57:21 2018 -0700 @@ -60,14 +60,14 @@ final class SupportedGroupsExtension { static final HandshakeProducer chNetworkProducer = new CHSupportedGroupsProducer(); - static final ExtensionConsumer chOnLoadConcumer = + static final ExtensionConsumer chOnLoadConsumer = new CHSupportedGroupsConsumer(); static final SSLStringize sgsStringize = new SupportedGroupsStringize(); static final HandshakeProducer eeNetworkProducer = new EESupportedGroupsProducer(); - static final ExtensionConsumer eeOnLoadConcumer = + static final ExtensionConsumer eeOnLoadConsumer = new EESupportedGroupsConsumer(); /** @@ -873,7 +873,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; // Is it a supported and enabled extension? @@ -997,7 +997,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in client side only. + // The consuming happens in client side only. ClientHandshakeContext chc = (ClientHandshakeContext)context; // Is it a supported and enabled extension? diff -r 33a2451070d3 -r 585e6d31677b src/java.base/share/classes/sun/security/ssl/SupportedVersionsExtension.java --- a/src/java.base/share/classes/sun/security/ssl/SupportedVersionsExtension.java Thu Jun 07 22:04:52 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/SupportedVersionsExtension.java Thu Jun 07 21:57:21 2018 -0700 @@ -43,21 +43,21 @@ final class SupportedVersionsExtension { static final HandshakeProducer chNetworkProducer = new CHSupportedVersionsProducer(); - static final ExtensionConsumer chOnLoadConcumer = + static final ExtensionConsumer chOnLoadConsumer = new CHSupportedVersionsConsumer(); static final SSLStringize chStringize = new CHSupportedVersionsStringize(); static final HandshakeProducer shNetworkProducer = new SHSupportedVersionsProducer(); - static final ExtensionConsumer shOnLoadConcumer = + static final ExtensionConsumer shOnLoadConsumer = new SHSupportedVersionsConsumer(); static final SSLStringize shStringize = new SHSupportedVersionsStringize(); static final HandshakeProducer hrrNetworkProducer = new HRRSupportedVersionsProducer(); - static final ExtensionConsumer hrrOnLoadConcumer = + static final ExtensionConsumer hrrOnLoadConsumer = new HRRSupportedVersionsConsumer(); static final HandshakeProducer hrrReproducer = new HRRSupportedVersionsReproducer(); @@ -207,7 +207,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in server side only. + // The consuming happens in server side only. ServerHandshakeContext shc = (ServerHandshakeContext)context; // Is it a supported and enabled extension? @@ -350,7 +350,7 @@ @Override public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in client side only. + // The consuming happens in client side only. ClientHandshakeContext chc = (ClientHandshakeContext)context; // Is it a supported and enabled extension? @@ -440,7 +440,7 @@ public void consume(ConnectionContext context, HandshakeMessage message, ByteBuffer buffer) throws IOException { - // The comsuming happens in client side only. + // The consuming happens in client side only. ClientHandshakeContext chc = (ClientHandshakeContext)context; // Is it a supported and enabled extension?