src/java.base/share/classes/sun/security/ssl/Ciphertext.java

*** 1,7 ****
  /*
!  * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 24,145 ****
   */
  
  package sun.security.ssl;
  
  import javax.net.ssl.SSLEngineResult.HandshakeStatus;
- import static sun.security.ssl.HandshakeMessage.*;
  
  /*
!  * enumeration of record type
   */
  final class Ciphertext {
      static final Ciphertext CIPHERTEXT_NULL = new Ciphertext();
  
!     RecordType recordType;
!     long recordSN;
  
      HandshakeStatus handshakeStatus;    // null if not used or not handshaking
  
!     Ciphertext() {
!         this.recordType = null;
          this.recordSN = -1L;
          this.handshakeStatus = null;
      }
  
!     Ciphertext(RecordType recordType, long recordSN) {
!         this.recordType = recordType;
!         this.recordSN = recordSN;
!         this.handshakeStatus = null;
!     }
! 
!     static enum RecordType {
!         RECORD_CHANGE_CIPHER_SPEC (
!                 Record.ct_change_cipher_spec, ht_not_applicable),
!         RECORD_ALERT (
!                 Record.ct_alert, ht_not_applicable),
!         RECORD_HELLO_REQUEST (
!                 Record.ct_handshake, ht_hello_request),
!         RECORD_CLIENT_HELLO (
!                 Record.ct_handshake, ht_client_hello),
!         RECORD_SERVER_HELLO (
!                 Record.ct_handshake, ht_server_hello),
!         RECORD_HELLO_VERIFY_REQUEST (
!                 Record.ct_handshake, ht_hello_verify_request),
!         RECORD_NEW_SESSION_TICKET (
!                 Record.ct_handshake, ht_new_session_ticket),
!         RECORD_CERTIFICATE (
!                 Record.ct_handshake, ht_certificate),
!         RECORD_SERVER_KEY_EXCHANGE (
!                 Record.ct_handshake, ht_server_key_exchange),
!         RECORD_CERTIFICATE_REQUEST (
!                 Record.ct_handshake, ht_certificate_request),
!         RECORD_SERVER_HELLO_DONE (
!                 Record.ct_handshake, ht_server_hello_done),
!         RECORD_CERTIFICATE_VERIFY (
!                 Record.ct_handshake, ht_certificate_verify),
!         RECORD_CLIENT_KEY_EXCHANGE (
!                 Record.ct_handshake, ht_client_key_exchange),
!         RECORD_FINISHED (
!                 Record.ct_handshake, ht_finished),
!         RECORD_CERTIFICATE_URL (
!                 Record.ct_handshake, ht_certificate_url),
!         RECORD_CERTIFICATE_STATUS (
!                 Record.ct_handshake, ht_certificate_status),
!         RECORD_SUPPLIEMENTAL_DATA (
!                 Record.ct_handshake, ht_supplemental_data),
!         RECORD_APPLICATION_DATA (
!                 Record.ct_application_data, ht_not_applicable);
! 
!         byte contentType;
!         byte handshakeType;
! 
!         private RecordType(byte contentType, byte handshakeType) {
              this.contentType = contentType;
              this.handshakeType = handshakeType;
!         }
! 
!         static RecordType valueOf(byte contentType, byte handshakeType) {
!             if (contentType == Record.ct_change_cipher_spec) {
!                 return RECORD_CHANGE_CIPHER_SPEC;
!             } else if (contentType == Record.ct_alert) {
!                 return RECORD_ALERT;
!             } else if (contentType == Record.ct_application_data) {
!                 return RECORD_APPLICATION_DATA;
!             } else if (handshakeType == ht_hello_request) {
!                 return RECORD_HELLO_REQUEST;
!             } else if (handshakeType == ht_client_hello) {
!                 return RECORD_CLIENT_HELLO;
!             } else if (handshakeType == ht_server_hello) {
!                 return RECORD_SERVER_HELLO;
!             } else if (handshakeType == ht_hello_verify_request) {
!                 return RECORD_HELLO_VERIFY_REQUEST;
!             } else if (handshakeType == ht_new_session_ticket) {
!                 return RECORD_NEW_SESSION_TICKET;
!             } else if (handshakeType == ht_certificate) {
!                 return RECORD_CERTIFICATE;
!             } else if (handshakeType == ht_server_key_exchange) {
!                 return RECORD_SERVER_KEY_EXCHANGE;
!             } else if (handshakeType == ht_certificate_request) {
!                 return RECORD_CERTIFICATE_REQUEST;
!             } else if (handshakeType == ht_server_hello_done) {
!                 return RECORD_SERVER_HELLO_DONE;
!             } else if (handshakeType == ht_certificate_verify) {
!                 return RECORD_CERTIFICATE_VERIFY;
!             } else if (handshakeType == ht_client_key_exchange) {
!                 return RECORD_CLIENT_KEY_EXCHANGE;
!             } else if (handshakeType == ht_finished) {
!                 return RECORD_FINISHED;
!             } else if (handshakeType == ht_certificate_url) {
!                 return RECORD_CERTIFICATE_URL;
!             } else if (handshakeType == ht_certificate_status) {
!                 return RECORD_CERTIFICATE_STATUS;
!             } else if (handshakeType == ht_supplemental_data) {
!                 return RECORD_SUPPLIEMENTAL_DATA;
!             }
! 
!             // otherwise, invalid record type
!             throw new IllegalArgumentException(
!                     "Invalid record type (ContentType:" + contentType +
!                     ", HandshakeType:" + handshakeType + ")");
!         }
      }
  }
--- 24,55 ----
   */
  
  package sun.security.ssl;
  
  import javax.net.ssl.SSLEngineResult.HandshakeStatus;
  
  /*
!  * Ciphertext
   */
  final class Ciphertext {
      static final Ciphertext CIPHERTEXT_NULL = new Ciphertext();
  
!     final byte contentType;
!     final byte handshakeType;
!     final long recordSN;
  
      HandshakeStatus handshakeStatus;    // null if not used or not handshaking
  
!     private Ciphertext() {
!         this.contentType = 0;
!         this.handshakeType = -1;
          this.recordSN = -1L;
          this.handshakeStatus = null;
      }
  
!     Ciphertext(byte contentType, byte handshakeType, long recordSN) {
          this.contentType = contentType;
          this.handshakeType = handshakeType;
!         this.recordSN = recordSN;
!         this.handshakeStatus = null;
      }
  }