From 9231c02497eced2f401170a4cda503a774db894e Mon Sep 17 00:00:00 2001 From: Casey Marshall Date: Fri, 22 Apr 2005 18:15:15 +0000 Subject: [PATCH] 2005-04-22 Casey Marshall * gnu/java/security/der/DERValue.java (getValueAs): new method. * gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java (): read both dates with 'DERValue.getValueAs', with 'GENERALIZED_TIME' as the argument. From-SVN: r98578 --- libjava/ChangeLog | 8 ++++++++ libjava/gnu/java/security/der/DERValue.java | 7 +++++++ libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java | 4 ++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 1a9c0ba..4fa341c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2005-04-22 Casey Marshall + + * gnu/java/security/der/DERValue.java + (getValueAs): new method. + * gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java + (): read both dates with 'DERValue.getValueAs', with + 'GENERALIZED_TIME' as the argument. + 2005-04-22 Andrew Pinski * gnu/gcj/runtime/NameFinder.java (close): IN, OUT, and PROC can all diff --git a/libjava/gnu/java/security/der/DERValue.java b/libjava/gnu/java/security/der/DERValue.java index bad7bed..9c3431e 100644 --- a/libjava/gnu/java/security/der/DERValue.java +++ b/libjava/gnu/java/security/der/DERValue.java @@ -119,6 +119,13 @@ public class DERValue implements DER return value; } + public Object getValueAs (final int derType) throws IOException + { + byte[] encoded = getEncoded (); + encoded[0] = (byte) derType; + return DERReader.read (encoded).getValue (); + } + public byte[] getEncoded() { if (encoded == null) diff --git a/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java b/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java index 8e7e9e2..c56cd27 100644 --- a/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java +++ b/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java @@ -71,14 +71,14 @@ public class PrivateKeyUsagePeriod extends Extension.Value val = der.read(); if (val.getTagClass() == DER.APPLICATION || val.getTag() == 0) { - notBefore = (Date) val.getValue(); + notBefore = (Date) val.getValueAs (DER.GENERALIZED_TIME); val = der.read(); } else notBefore = null; if (val.getTagClass() == DER.APPLICATION || val.getTag() == 1) { - notAfter = (Date) val.getValue(); + notAfter = (Date) val.getValueAs (DER.GENERALIZED_TIME); } else notAfter = null; -- 2.7.4