From 71306719d39db2b505c84dd88c1a54b2191c68d9 Mon Sep 17 00:00:00 2001
From: Xue-Lei Andrew Fan <xuelei@openjdk.org>
Date: Tue, 16 Jun 2009 20:46:25 +0800
Subject: [PATCH] 6850783: InvalidityDateExtension returns reference to
 internal mutable state

Return cloned instead of referenced object

Reviewed-by: weijun
---
 .../share/classes/sun/security/x509/CertificateVersion.java | 1 -
 .../classes/sun/security/x509/InvalidityDateExtension.java  | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/jdk/src/share/classes/sun/security/x509/CertificateVersion.java b/jdk/src/share/classes/sun/security/x509/CertificateVersion.java
index 855586adeb1..fc645999d8f 100644
--- a/jdk/src/share/classes/sun/security/x509/CertificateVersion.java
+++ b/jdk/src/share/classes/sun/security/x509/CertificateVersion.java
@@ -28,7 +28,6 @@ package sun.security.x509;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.Date;
 import java.util.Enumeration;
 
 import sun.security.util.*;
diff --git a/jdk/src/share/classes/sun/security/x509/InvalidityDateExtension.java b/jdk/src/share/classes/sun/security/x509/InvalidityDateExtension.java
index b8a620d13f0..dcaf5f3992c 100644
--- a/jdk/src/share/classes/sun/security/x509/InvalidityDateExtension.java
+++ b/jdk/src/share/classes/sun/security/x509/InvalidityDateExtension.java
@@ -140,7 +140,11 @@ public class InvalidityDateExtension extends Extension
      */
     public Object get(String name) throws IOException {
         if (name.equalsIgnoreCase(DATE)) {
-            return date;
+            if (date == null) {
+                return null;
+            } else {
+                return (new Date(date.getTime()));    // clone
+            }
         } else {
             throw new IOException
                 ("Name not supported by InvalidityDateExtension");