--- old/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java 2017-01-20 09:52:43.150288774 -0800 +++ /dev/null 2017-01-18 09:30:05.425422781 -0800 @@ -1,137 +0,0 @@ -/* - * reserved comment block - * DO NOT REMOVE OR ALTER! - */ -/* Copyright (c) 2002 Graz University of Technology. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * 3. The end-user documentation included with the redistribution, if any, must - * include the following acknowledgment: - * - * "This product includes software developed by IAIK of Graz University of - * Technology." - * - * Alternately, this acknowledgment may appear in the software itself, if - * and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Graz University of Technology" and "IAIK of Graz University of - * Technology" must not be used to endorse or promote products derived from - * this software without prior written permission. - * - * 5. Products derived from this software may not be called - * "IAIK PKCS Wrapper", nor may "IAIK" appear in their name, without prior - * written permission of Graz University of Technology. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE LICENSOR BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -package sun.security.pkcs11.wrapper; - - - -/** - * class .

- * PKCS#11 structure: - *

- * typedef struct CK_DATE {  
- *   CK_CHAR year[4];  
- *   CK_CHAR month[2];  
- *   CK_CHAR day[2];  
- * } CK_DATE;
- * 
- * - * @author Karl Scheibelhofer - * @author Martin Schlaeffer - */ -public class CK_DATE implements Cloneable { - - /** - * PKCS#11: - *
-     *   CK_CHAR year[4];   - the year ("1900" - "9999")
-     * 
- */ - public char[] year; /* the year ("1900" - "9999") */ - - /** - * PKCS#11: - *
-     *   CK_CHAR month[2];  - the month ("01" - "12")
-     * 
- */ - public char[] month; /* the month ("01" - "12") */ - - /** - * PKCS#11: - *
-     *   CK_CHAR day[2];    - the day ("01" - "31")
-     * 
- */ - public char[] day; /* the day ("01" - "31") */ - - public CK_DATE(char[] year, char[] month, char[] day) { - this.year = year; - this.month = month; - this.day = day; - } - - /** - * Create a (deep) clone of this object. - * - * @return A clone of this object. - */ - public Object clone() { - CK_DATE copy = null; - try { - copy = (CK_DATE) super.clone(); - } catch (CloneNotSupportedException cnse) { - // re-throw as RuntimeException - throw (RuntimeException) - (new RuntimeException("Clone error").initCause(cnse)); - } - copy.year = this.year.clone(); - copy.month = this.month.clone(); - copy.day = this.day.clone(); - - return copy; - } - - /** - * Returns the string representation of CK_DATE. - * - * @return the string representation of CK_DATE - */ - public String toString() { - StringBuilder sb = new StringBuilder(); - - sb.append(new String(day)); - sb.append('.'); - sb.append(new String(month)); - sb.append('.'); - sb.append(new String(year)); - sb.append(" (DD.MM.YYYY)"); - - return sb.toString(); - } - -} --- /dev/null 2017-01-18 09:30:05.425422781 -0800 +++ new/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java 2017-01-20 09:52:42.942288782 -0800 @@ -0,0 +1,137 @@ +/* + * reserved comment block + * DO NOT REMOVE OR ALTER! + */ +/* Copyright (c) 2002 Graz University of Technology. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * 3. The end-user documentation included with the redistribution, if any, must + * include the following acknowledgment: + * + * "This product includes software developed by IAIK of Graz University of + * Technology." + * + * Alternately, this acknowledgment may appear in the software itself, if + * and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Graz University of Technology" and "IAIK of Graz University of + * Technology" must not be used to endorse or promote products derived from + * this software without prior written permission. + * + * 5. Products derived from this software may not be called + * "IAIK PKCS Wrapper", nor may "IAIK" appear in their name, without prior + * written permission of Graz University of Technology. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE LICENSOR BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, + * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +package sun.security.pkcs11.wrapper; + + + +/** + * class .

+ * PKCS#11 structure: + *

+ * typedef struct CK_DATE {  
+ *   CK_CHAR year[4];  
+ *   CK_CHAR month[2];  
+ *   CK_CHAR day[2];  
+ * } CK_DATE;
+ * 
+ * + * @author Karl Scheibelhofer + * @author Martin Schlaeffer + */ +public class CK_DATE implements Cloneable { + + /** + * PKCS#11: + *
+     *   CK_CHAR year[4];   - the year ("1900" - "9999")
+     * 
+ */ + public char[] year; /* the year ("1900" - "9999") */ + + /** + * PKCS#11: + *
+     *   CK_CHAR month[2];  - the month ("01" - "12")
+     * 
+ */ + public char[] month; /* the month ("01" - "12") */ + + /** + * PKCS#11: + *
+     *   CK_CHAR day[2];    - the day ("01" - "31")
+     * 
+ */ + public char[] day; /* the day ("01" - "31") */ + + public CK_DATE(char[] year, char[] month, char[] day) { + this.year = year; + this.month = month; + this.day = day; + } + + /** + * Create a (deep) clone of this object. + * + * @return A clone of this object. + */ + public Object clone() { + CK_DATE copy = null; + try { + copy = (CK_DATE) super.clone(); + } catch (CloneNotSupportedException cnse) { + // re-throw as RuntimeException + throw (RuntimeException) + (new RuntimeException("Clone error").initCause(cnse)); + } + copy.year = this.year.clone(); + copy.month = this.month.clone(); + copy.day = this.day.clone(); + + return copy; + } + + /** + * Returns the string representation of CK_DATE. + * + * @return the string representation of CK_DATE + */ + public String toString() { + StringBuilder sb = new StringBuilder(); + + sb.append(new String(day)); + sb.append('.'); + sb.append(new String(month)); + sb.append('.'); + sb.append(new String(year)); + sb.append(" (DD.MM.YYYY)"); + + return sb.toString(); + } + +}