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

equal deleted inserted replaced

-:929ac4f1cddd
+:25178bb3e8f5
 import java.util.LinkedList;
 import java.util.Locale;
 import sun.security.ssl.SSLHandshake.HandshakeMessage;
 import sun.security.util.HexDumpEncoder;
-enum SSLExtension implements SSLStringize {
+enum SSLExtension implements SSLStringizer {
 // Extensions defined in RFC 6066
 CH_SERVER_NAME          (0x0000,  "server_name",
 SSLHandshake.CLIENT_HELLO,
 ProtocolVersion.PROTOCOLS_TO_13,
 ServerNameExtension.chNetworkProducer,
 ServerNameExtension.chOnLoadConsumer,
 null,
 null,
 null,
-ServerNameExtension.chStringize),
+ServerNameExtension.chStringizer),
 SH_SERVER_NAME          (0x0000, "server_name",
 SSLHandshake.SERVER_HELLO,
 ProtocolVersion.PROTOCOLS_TO_12,
 ServerNameExtension.shNetworkProducer,
 ServerNameExtension.shOnLoadConsumer,
 null,
 null,
 null,
-ServerNameExtension.shStringize),
+ServerNameExtension.shStringizer),
 EE_SERVER_NAME          (0x0000, "server_name",
 SSLHandshake.ENCRYPTED_EXTENSIONS,
 ProtocolVersion.PROTOCOLS_OF_13,
 ServerNameExtension.eeNetworkProducer,
 ServerNameExtension.eeOnLoadConsumer,
 null,
 null,
 null,
-ServerNameExtension.shStringize),
+ServerNameExtension.shStringizer),
 CH_MAX_FRAGMENT_LENGTH (0x0001, "max_fragment_length",
 SSLHandshake.CLIENT_HELLO,
 ProtocolVersion.PROTOCOLS_TO_13,
 MaxFragExtension.chNetworkProducer,
 MaxFragExtension.chOnLoadConsumer,
 null,
 null,
 null,
-MaxFragExtension.maxFragLenStringize),
+MaxFragExtension.maxFragLenStringizer),
 SH_MAX_FRAGMENT_LENGTH (0x0001, "max_fragment_length",
 SSLHandshake.SERVER_HELLO,
 ProtocolVersion.PROTOCOLS_TO_12,
 MaxFragExtension.shNetworkProducer,
 MaxFragExtension.shOnLoadConsumer,
 null,
 MaxFragExtension.shOnTradeConsumer,
 null,
-MaxFragExtension.maxFragLenStringize),
+MaxFragExtension.maxFragLenStringizer),
 EE_MAX_FRAGMENT_LENGTH (0x0001, "max_fragment_length",
 SSLHandshake.ENCRYPTED_EXTENSIONS,
 ProtocolVersion.PROTOCOLS_OF_13,
 MaxFragExtension.eeNetworkProducer,
 MaxFragExtension.eeOnLoadConsumer,
 null,
 MaxFragExtension.eeOnTradeConsumer,
 null,
-MaxFragExtension.maxFragLenStringize),
+MaxFragExtension.maxFragLenStringizer),
 CLIENT_CERTIFICATE_URL  (0x0002, "client_certificate_url"),
 TRUSTED_CA_KEYS         (0x0003, "trusted_ca_keys"),
 TRUNCATED_HMAC          (0x0004, "truncated_hmac"),
 CH_STATUS_REQUEST       (0x0005, "status_request",
 CertStatusExtension.chNetworkProducer,
 CertStatusExtension.chOnLoadConsumer,
 null,
 null,
 null,
-CertStatusExtension.certStatusReqStringize),
+CertStatusExtension.certStatusReqStringizer),
 SH_STATUS_REQUEST       (0x0005, "status_request",
 SSLHandshake.SERVER_HELLO,
 ProtocolVersion.PROTOCOLS_TO_12,
 CertStatusExtension.shNetworkProducer,
 CertStatusExtension.shOnLoadConsumer,
 null,
 null,
 null,
-CertStatusExtension.certStatusReqStringize),
+CertStatusExtension.certStatusReqStringizer),
 CR_STATUS_REQUEST       (0x0005, "status_request"),
 CT_STATUS_REQUEST       (0x0005, "status_request",
 SSLHandshake.CERTIFICATE,
 ProtocolVersion.PROTOCOLS_OF_13,
 CertStatusExtension.ctNetworkProducer,
 CertStatusExtension.ctOnLoadConsumer,
 null,
 null,
 null,
-CertStatusExtension.certStatusRespStringize),
+CertStatusExtension.certStatusRespStringizer),
 // extensions defined in RFC 4681
 USER_MAPPING            (0x0006, "user_mapping"),
 // extensions defined in RFC 5878
 CLIENT_AUTHZ            (0x0007, "client_authz"),
 SupportedGroupsExtension.chNetworkProducer,
 SupportedGroupsExtension.chOnLoadConsumer,
 null,
 null,
 null,
-SupportedGroupsExtension.sgsStringize),
+SupportedGroupsExtension.sgsStringizer),
 EE_SUPPORTED_GROUPS     (0x000A, "supported_groups",
 SSLHandshake.ENCRYPTED_EXTENSIONS,
 ProtocolVersion.PROTOCOLS_OF_13,
 SupportedGroupsExtension.eeNetworkProducer,
 SupportedGroupsExtension.eeOnLoadConsumer,
 null,
 null,
 null,
-SupportedGroupsExtension.sgsStringize),
+SupportedGroupsExtension.sgsStringizer),
 CH_EC_POINT_FORMATS     (0x000B, "ec_point_formats",
 SSLHandshake.CLIENT_HELLO,
 ProtocolVersion.PROTOCOLS_TO_12,
 ECPointFormatsExtension.chNetworkProducer,
 ECPointFormatsExtension.chOnLoadConsumer,
 null,
 null,
 null,
-ECPointFormatsExtension.epfStringize),
+ECPointFormatsExtension.epfStringizer),
 SH_EC_POINT_FORMATS     (0x000B, "ec_point_formats",
 SSLHandshake.SERVER_HELLO,
 ProtocolVersion.PROTOCOLS_TO_12,
 null,   // not use of the producer
 ECPointFormatsExtension.shOnLoadConsumer,
 null,
 null,
 null,
-ECPointFormatsExtension.epfStringize),
+ECPointFormatsExtension.epfStringizer),
 // extensions defined in RFC 5054
 SRP                     (0x000C, "srp"),
 // extensions defined in RFC 5246
 SignatureAlgorithmsExtension.chNetworkProducer,
 SignatureAlgorithmsExtension.chOnLoadConsumer,
 SignatureAlgorithmsExtension.chOnLoadAbsence,
 SignatureAlgorithmsExtension.chOnTradeConsumer,
 SignatureAlgorithmsExtension.chOnTradeAbsence,
-SignatureAlgorithmsExtension.ssStringize),
+SignatureAlgorithmsExtension.ssStringizer),
 CR_SIGNATURE_ALGORITHMS (0x000D, "signature_algorithms",
 SSLHandshake.CERTIFICATE_REQUEST,
 ProtocolVersion.PROTOCOLS_OF_13,
 SignatureAlgorithmsExtension.crNetworkProducer,
 SignatureAlgorithmsExtension.crOnLoadConsumer,
 SignatureAlgorithmsExtension.crOnLoadAbsence,
 SignatureAlgorithmsExtension.crOnTradeConsumer,
 null,
-SignatureAlgorithmsExtension.ssStringize),
+SignatureAlgorithmsExtension.ssStringizer),
 CH_SIGNATURE_ALGORITHMS_CERT (0x0032, "signature_algorithms_cert",
 SSLHandshake.CLIENT_HELLO,
 ProtocolVersion.PROTOCOLS_12_13,
 CertSignAlgsExtension.chNetworkProducer,
 CertSignAlgsExtension.chOnLoadConsumer,
 null,
 CertSignAlgsExtension.chOnTradeConsumer,
 null,
-CertSignAlgsExtension.ssStringize),
+CertSignAlgsExtension.ssStringizer),
 CR_SIGNATURE_ALGORITHMS_CERT (0x0032, "signature_algorithms_cert",
 SSLHandshake.CERTIFICATE_REQUEST,
 ProtocolVersion.PROTOCOLS_OF_13,
 CertSignAlgsExtension.crNetworkProducer,
 CertSignAlgsExtension.crOnLoadConsumer,
 null,
 CertSignAlgsExtension.crOnTradeConsumer,
 null,
-CertSignAlgsExtension.ssStringize),
+CertSignAlgsExtension.ssStringizer),
 // extensions defined in RFC 5764
 USE_SRTP                (0x000E, "use_srtp"),
 // extensions defined in RFC 6520
 AlpnExtension.chNetworkProducer,
 AlpnExtension.chOnLoadConsumer,
 AlpnExtension.chOnLoadAbsence,
 null,
 null,
-AlpnExtension.alpnStringize),
+AlpnExtension.alpnStringizer),
 SH_ALPN                 (0x0010, "application_layer_protocol_negotiation",
 SSLHandshake.SERVER_HELLO,
 ProtocolVersion.PROTOCOLS_TO_12,
 AlpnExtension.shNetworkProducer,
 AlpnExtension.shOnLoadConsumer,
 AlpnExtension.shOnLoadAbsence,
 null,
 null,
-AlpnExtension.alpnStringize),
+AlpnExtension.alpnStringizer),
 EE_ALPN                 (0x0010, "application_layer_protocol_negotiation",
 SSLHandshake.ENCRYPTED_EXTENSIONS,
 ProtocolVersion.PROTOCOLS_OF_13,
 AlpnExtension.shNetworkProducer,
 AlpnExtension.shOnLoadConsumer,
 AlpnExtension.shOnLoadAbsence,
 null,
 null,
-AlpnExtension.alpnStringize),
+AlpnExtension.alpnStringizer),
 // extensions defined in RFC 6961
 CH_STATUS_REQUEST_V2    (0x0011, "status_request_v2",
 SSLHandshake.CLIENT_HELLO,
 ProtocolVersion.PROTOCOLS_TO_12,
 CertStatusExtension.chV2NetworkProducer,
 CertStatusExtension.chV2OnLoadConsumer,
 null,
 null,
 null,
-CertStatusExtension.certStatusReqV2Stringize),
+CertStatusExtension.certStatusReqV2Stringizer),
 SH_STATUS_REQUEST_V2    (0x0011, "status_request_v2",
 SSLHandshake.SERVER_HELLO,
 ProtocolVersion.PROTOCOLS_TO_12,
 CertStatusExtension.shV2NetworkProducer,
 CertStatusExtension.shV2OnLoadConsumer,
 null,
 null,
 null,
-CertStatusExtension.certStatusReqV2Stringize),
+CertStatusExtension.certStatusReqV2Stringizer),
 // extensions defined in RFC 6962
 SIGNED_CERT_TIMESTAMP   (0x0012, "signed_certificate_timestamp"),
 // extensions defined in RFC 7250
 ExtendedMasterSecretExtension.chNetworkProducer,
 ExtendedMasterSecretExtension.chOnLoadConsumer,
 ExtendedMasterSecretExtension.chOnLoadAbsence,
 null,
 null,
-ExtendedMasterSecretExtension.emsStringize),
+ExtendedMasterSecretExtension.emsStringizer),
 SH_EXTENDED_MASTER_SECRET  (0x0017, "extended_master_secret",
 SSLHandshake.SERVER_HELLO,
 ProtocolVersion.PROTOCOLS_TO_12,
 ExtendedMasterSecretExtension.shNetworkProducer,
 ExtendedMasterSecretExtension.shOnLoadConsumer,
 ExtendedMasterSecretExtension.shOnLoadAbsence,
 null,
 null,
-ExtendedMasterSecretExtension.emsStringize),
+ExtendedMasterSecretExtension.emsStringizer),
 // extensions defined in RFC draft-ietf-tokbind-negotiation
 TOKEN_BINDING           (0x0018, "token_binding "),
 // extensions defined in RFC 7924
 SupportedVersionsExtension.chNetworkProducer,
 SupportedVersionsExtension.chOnLoadConsumer,
 null,
 null,
 null,
-SupportedVersionsExtension.chStringize),
+SupportedVersionsExtension.chStringizer),
 SH_SUPPORTED_VERSIONS   (0x002B, "supported_versions",
 SSLHandshake.SERVER_HELLO,
 // and HelloRetryRequest
 ProtocolVersion.PROTOCOLS_OF_13,
 SupportedVersionsExtension.shNetworkProducer,
 SupportedVersionsExtension.shOnLoadConsumer,
 null,
 null,
 null,
-SupportedVersionsExtension.shStringize),
+SupportedVersionsExtension.shStringizer),
 HRR_SUPPORTED_VERSIONS  (0x002B, "supported_versions",
 SSLHandshake.HELLO_RETRY_REQUEST,
 ProtocolVersion.PROTOCOLS_OF_13,
 SupportedVersionsExtension.hrrNetworkProducer,
 SupportedVersionsExtension.hrrOnLoadConsumer,
 null,
 null,
 null,
-SupportedVersionsExtension.hrrStringize),
+SupportedVersionsExtension.hrrStringizer),
 MH_SUPPORTED_VERSIONS   (0x002B, "supported_versions",
 SSLHandshake.MESSAGE_HASH,
 ProtocolVersion.PROTOCOLS_OF_13,
 SupportedVersionsExtension.hrrReproducer,
 null, null, null,
 null,
-SupportedVersionsExtension.hrrStringize),
+SupportedVersionsExtension.hrrStringizer),
 CH_COOKIE               (0x002C, "cookie",
 SSLHandshake.CLIENT_HELLO,
 ProtocolVersion.PROTOCOLS_OF_13,
 CookieExtension.chNetworkProducer,
 CookieExtension.chOnLoadConsumer,
 null,
 CookieExtension.chOnTradeConsumer,
 null,
-CookieExtension.cookieStringize),
+CookieExtension.cookieStringizer),
 HRR_COOKIE              (0x002C, "cookie",
 SSLHandshake.HELLO_RETRY_REQUEST,
 ProtocolVersion.PROTOCOLS_OF_13,
 CookieExtension.hrrNetworkProducer,
 CookieExtension.hrrOnLoadConsumer,
 null, null,
 null,
-CookieExtension.cookieStringize),
+CookieExtension.cookieStringizer),
 MH_COOKIE               (0x002C, "cookie",
 SSLHandshake.MESSAGE_HASH,
 ProtocolVersion.PROTOCOLS_OF_13,
 CookieExtension.hrrNetworkReproducer,
 null, null, null,
 null,
-CookieExtension.cookieStringize),
+CookieExtension.cookieStringizer),
 PSK_KEY_EXCHANGE_MODES  (0x002D, "psk_key_exchange_modes",
 SSLHandshake.CLIENT_HELLO,
 ProtocolVersion.PROTOCOLS_OF_13,
 PskKeyExchangeModesExtension.chNetworkProducer,
 PskKeyExchangeModesExtension.chOnLoadConsumer,
 PskKeyExchangeModesExtension.chOnLoadAbsence,
 null,
 PskKeyExchangeModesExtension.chOnTradeAbsence,
-PskKeyExchangeModesExtension.pkemStringize),
+PskKeyExchangeModesExtension.pkemStringizer),
 CERTIFICATE_AUTHORITIES (0x002F, "certificate_authorities"),
 OID_FILTERS             (0x0030, "oid_filters"),
 POST_HANDSHAKE_AUTH     (0x0030, "post_handshake_auth"),
 CH_KEY_SHARE            (0x0033, "key_share",
 SSLHandshake.CLIENT_HELLO,
 ProtocolVersion.PROTOCOLS_OF_13,
 KeyShareExtension.chNetworkProducer,
 KeyShareExtension.chOnLoadConsumer,
 null, null, null,
-KeyShareExtension.chStringize),
+KeyShareExtension.chStringizer),
 SH_KEY_SHARE            (0x0033, "key_share",
 SSLHandshake.SERVER_HELLO,
 ProtocolVersion.PROTOCOLS_OF_13,
 KeyShareExtension.shNetworkProducer,
 KeyShareExtension.shOnLoadConsumer,
 KeyShareExtension.shOnLoadAbsence,
 null,
 null,
-KeyShareExtension.shStringize),
+KeyShareExtension.shStringizer),
 HRR_KEY_SHARE           (0x0033, "key_share",
 SSLHandshake.HELLO_RETRY_REQUEST,
 ProtocolVersion.PROTOCOLS_OF_13,
 KeyShareExtension.hrrNetworkProducer,
 KeyShareExtension.hrrOnLoadConsumer,
 null, null, null,
-KeyShareExtension.hrrStringize),
+KeyShareExtension.hrrStringizer),
 MH_KEY_SHARE            (0x0033, "key_share",
 SSLHandshake.MESSAGE_HASH,
 ProtocolVersion.PROTOCOLS_OF_13,
 KeyShareExtension.hrrNetworkReproducer,
 null, null, null, null,
-KeyShareExtension.hrrStringize),
+KeyShareExtension.hrrStringizer),
 // Extensions defined in RFC 5746
 CH_RENEGOTIATION_INFO   (0xff01, "renegotiation_info",
 SSLHandshake.CLIENT_HELLO,
 ProtocolVersion.PROTOCOLS_TO_12,
 RenegoInfoExtension.chNetworkProducer,
 RenegoInfoExtension.chOnLoadConsumer,
 RenegoInfoExtension.chOnLoadAbsence,
 null,
 null,
-RenegoInfoExtension.rniStringize),
+RenegoInfoExtension.rniStringizer),
 SH_RENEGOTIATION_INFO   (0xff01, "renegotiation_info",
 SSLHandshake.SERVER_HELLO,
 ProtocolVersion.PROTOCOLS_TO_12,
 RenegoInfoExtension.shNetworkProducer,
 RenegoInfoExtension.shOnLoadConsumer,
 RenegoInfoExtension.shOnLoadAbsence,
 null,
 null,
-RenegoInfoExtension.rniStringize),
+RenegoInfoExtension.rniStringizer),
 // TLS 1.3 PSK extension must be last
 CH_PRE_SHARED_KEY       (0x0029, "pre_shared_key",
 SSLHandshake.CLIENT_HELLO,
 ProtocolVersion.PROTOCOLS_OF_13,
 PreSharedKeyExtension.chNetworkProducer,
 PreSharedKeyExtension.chOnLoadConsumer,
 PreSharedKeyExtension.chOnLoadAbsence,
 PreSharedKeyExtension.chOnTradeConsumer,
 null,
-PreSharedKeyExtension.chStringize),
+PreSharedKeyExtension.chStringizer),
 SH_PRE_SHARED_KEY       (0x0029, "pre_shared_key",
 SSLHandshake.SERVER_HELLO,
 ProtocolVersion.PROTOCOLS_OF_13,
 PreSharedKeyExtension.shNetworkProducer,
 PreSharedKeyExtension.shOnLoadConsumer,
 PreSharedKeyExtension.shOnLoadAbsence,
 null, null,
-PreSharedKeyExtension.shStringize);
+PreSharedKeyExtension.shStringizer);
 final int id;
 final SSLHandshake handshakeType;
 final String name;
 final ProtocolVersion[] supportedProtocols;
 final HandshakeProducer networkProducer;
 final ExtensionConsumer onLoadConsumer;
 final HandshakeAbsence  onLoadAbsence;
 final HandshakeConsumer onTradeConsumer;
 final HandshakeAbsence  onTradeAbsence;
-final SSLStringize stringize;
+final SSLStringizer stringizer;
 // known but unsupported extension
 private SSLExtension(int id, String name) {
 this.id = id;
 this.handshakeType = SSLHandshake.NOT_APPLICABLE;
 this.networkProducer = null;
 this.onLoadConsumer = null;
 this.onLoadAbsence = null;
 this.onTradeConsumer = null;
 this.onTradeAbsence = null;
-this.stringize = null;
+this.stringizer = null;
 }
 // supported extension
 private SSLExtension(int id, String name, SSLHandshake handshakeType,
 ProtocolVersion[] supportedProtocols,
 HandshakeProducer producer,
 ExtensionConsumer onLoadConsumer, HandshakeAbsence onLoadAbsence,
 HandshakeConsumer onTradeConsumer, HandshakeAbsence onTradeAbsence,
-SSLStringize stringize) {
+SSLStringizer stringize) {
 this.id = id;
 this.handshakeType = handshakeType;
 this.name = name;
 this.supportedProtocols = supportedProtocols;
 this.networkProducer = producer;
 this.onLoadConsumer = onLoadConsumer;
 this.onLoadAbsence = onLoadAbsence;
 this.onTradeConsumer = onTradeConsumer;
 this.onTradeAbsence = onTradeAbsence;
-this.stringize = stringize;
+this.stringizer = stringize;
 }
 static SSLExtension valueOf(SSLHandshake handshakeType, int extensionType) {
 for (SSLExtension ext : SSLExtension.values()) {
 if (ext.id == extensionType &&
 "{2}\n" +
 "'}'",
 Locale.ENGLISH);
 String extData;
-if (stringize == null) {
+if (stringizer == null) {
 HexDumpEncoder hexEncoder = new HexDumpEncoder();
 String encoded = hexEncoder.encode(byteBuffer.duplicate());
 extData = encoded;
 } else {
-extData = stringize.toString(byteBuffer);
+extData = stringizer.toString(byteBuffer);
 }
 Object[] messageFields = {
 this.name,
 this.id,

branch	JDK-8145252-TLS13-branch
changeset 56708	25178bb3e8f5
parent 56705	585e6d31677b
child 56769	125890684a60