From 5e03e2fcd5edb344250443db6a68696986824e43 Mon Sep 17 00:00:00 2001
From: Bradford Wetmore <wetmore@openjdk.org>
Date: Tue, 8 Nov 2016 16:54:28 -0800
Subject: [PATCH] 8169229: RSAClientKeyExchange debug info is incorrect

Reviewed-by: xuelei
---
 .../classes/sun/security/ssl/RSAClientKeyExchange.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java b/jdk/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java
index 6cb2b650de5..98504af5536 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java
@@ -257,7 +257,13 @@ final class RSAClientKeyExchange extends HandshakeMessage {
 
     @Override
     void print(PrintStream s) throws IOException {
-        s.println("*** ClientKeyExchange, RSA PreMasterSecret, " +
-                                                        protocolVersion);
+        String version = "version not available/extractable";
+
+        byte[] ba = preMaster.getEncoded();
+        if (ba != null && ba.length >= 2) {
+            version = ProtocolVersion.valueOf(ba[0], ba[1]).name;
+        }
+
+        s.println("*** ClientKeyExchange, RSA PreMasterSecret, " + version);
     }
 }