libjava/classpath/ChangeLog.gcj:
2007-05-31 Matthias Klose <doko@ubuntu.com> * javax/management/NotificationBroadcasterSupport.java (getNotificationInfo): Add cast. * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include directories. * native/jni/qt-peer/Makefile.in: Regenerate. libjava/ChangeLog: 2007-06-03 Matthias Klose <doko@ubuntu.com> * java/io/natFileWin32.cc (setFilePermissions): New (stub only). _access: Handle EXEC query, stub only. 2007-06-03 Matthias Klose <doko@ubuntu.com> Merged from classpath: * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge. * java/lang/System.java(inheritedChannel): New. * java/lang/Character.java: Remove stray`;'. * java/net/MulticastSocket.java: Merged. * java/text/DateFormatSymbols.java(getInstance): New, comment updates. * java/text/Collator.java(getInstance): Merged. * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG. getDisplayName, getDisplayNames: New. * java/util/logging/Logger.java: Merged. * Regenerate .class and .h files. 2007-06-03 Matthias Klose <doko@ubuntu.com> * java/io/File.java: Merge with classpath-0.95, new method setFilePermissions, new attribute EXEC. * java/io/natFilePosix.cc (setFilePermissions): New. _access: Handle EXEC query. * classpath/lib/java/io/File.class, java/io/File.h: Regenerate. 2007-06-03 Matthias Klose <doko@ubuntu.com> Imported GNU Classpath 0.95. * classpath/Makefile.in, classpath/native/jni/midi-dssi/Makefile.in, classpath/native/jni/classpath/Makefile.in, classpath/native/jni/Makefile.in, classpath/native/jni/gconf-peer/Makefile.in, classpath/native/jni/java-io/Makefile.in, classpath/native/jni/native-lib/Makefile.in, classpath/native/jni/java-util/Makefile.in, classpath/native/jni/midi-alsa/Makefile.in, classpath/native/jni/java-lang/Makefile.in, classpath/native/jni/java-nio/Makefile.in, classpath/native/jni/java-net/Makefile.in, classpath/native/jni/xmlj/Makefile.in, classpath/native/jni/qt-peer/Makefile.in, classpath/native/jni/gtk-peer/Makefile.in, classpath/native/Makefile.in, classpath/native/jawt/Makefile.in, classpath/native/fdlibm/Makefile.in, classpath/native/plugin/Makefile.in, classpath/resource/Makefile.in, classpath/scripts/Makefile.in, classpath/tools/Makefile.in, classpath/doc/Makefile.in, classpath/doc/api/Makefile.in, classpath/lib/Makefile.in, classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in, classpath/external/sax/Makefile.in, classpath/external/w3c_dom/Makefile.in, classpath/external/relaxngDatatype/Makefile.in, classpath/include/Makefile.in, classpath/examples/Makefile.in: Regenerate. * classpath/config.guess, classpath/config.sub, classpath/ltmain.sh : Update. * classpath/configure, classpath/depcomp, classpath/missing, classpath/aclocal.m4, classpath/install-sh: Regenerate. * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95. * sources.am: Regenerate. * Makefile.in: Regenerate. * Update the .class files and generated CNI header files, add new .class and generated CNI header files. * Remove generated files for removed java source files: classpath/gnu/java/net/BASE64.java, classpath/gnu/java/security/util/Base64.java, classpath/gnu/java/awt/peer/gtk/GThreadMutex.java, classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java, classpath/gnu/java/awt/font/autofit/Scaler.java, classpath/gnu/classpath/jdwp/util/Value.java, classpath/gnu/javax/net/ssl/Base64.java. * Remove empty directories. * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc. * java/lang/Class.java(setAccessible): Merge from classpath. * java/util/Locale.java: Remove. * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java, gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New. * gcj/javaprims.h: Update class declarations. * scripts/classes.pl: Update usage. * HACKING: Mention to build all peers. From-SVN: r125302
This commit is contained in:
Matthias Klose
@@ -1,5 +1,5 @@
|
||||
/* X509Certificate.java -- X.509 certificate.
|
||||
Copyright (C) 2003, 2004 Free Software Foundation, Inc.
|
||||
Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
@@ -48,6 +48,7 @@ import gnu.java.security.der.DERValue;
|
||||
import gnu.java.security.x509.ext.BasicConstraints;
|
||||
import gnu.java.security.x509.ext.ExtendedKeyUsage;
|
||||
import gnu.java.security.x509.ext.Extension;
|
||||
import gnu.java.security.x509.ext.GeneralName;
|
||||
import gnu.java.security.x509.ext.IssuerAlternativeNames;
|
||||
import gnu.java.security.x509.ext.KeyUsage;
|
||||
import gnu.java.security.x509.ext.SubjectAlternativeNames;
|
||||
@@ -103,6 +104,7 @@ public class X509Certificate extends java.security.cert.X509Certificate
|
||||
// Constants and fields.
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
private static final long serialVersionUID = -2491127588187038216L;
|
||||
private static final Logger logger = SystemLogger.SYSTEM;
|
||||
|
||||
protected static final OID ID_DSA = new OID ("1.2.840.10040.4.1");
|
||||
@@ -133,7 +135,7 @@ public class X509Certificate extends java.security.cert.X509Certificate
|
||||
protected transient PublicKey subjectKey;
|
||||
protected transient BitString issuerUniqueId;
|
||||
protected transient BitString subjectUniqueId;
|
||||
protected transient Map extensions;
|
||||
protected transient Map<OID, Extension> extensions;
|
||||
|
||||
// Signature.
|
||||
protected transient OID sigAlgId;
|
||||
@@ -157,7 +159,7 @@ public class X509Certificate extends java.security.cert.X509Certificate
|
||||
throws CertificateException, IOException
|
||||
{
|
||||
super();
|
||||
extensions = new HashMap();
|
||||
extensions = new HashMap<OID, Extension>();
|
||||
try
|
||||
{
|
||||
parse(encoded);
|
||||
@@ -178,7 +180,7 @@ public class X509Certificate extends java.security.cert.X509Certificate
|
||||
|
||||
protected X509Certificate()
|
||||
{
|
||||
extensions = new HashMap();
|
||||
extensions = new HashMap<OID, Extension>();
|
||||
}
|
||||
|
||||
// X509Certificate methods.
|
||||
@@ -316,17 +318,15 @@ public class X509Certificate extends java.security.cert.X509Certificate
|
||||
return null;
|
||||
}
|
||||
|
||||
public List getExtendedKeyUsage() throws CertificateParsingException
|
||||
public List<String> getExtendedKeyUsage() throws CertificateParsingException
|
||||
{
|
||||
Extension e = getExtension(ExtendedKeyUsage.ID);
|
||||
if (e != null)
|
||||
{
|
||||
List a = ((ExtendedKeyUsage) e.getValue()).getPurposeIds();
|
||||
List b = new ArrayList(a.size());
|
||||
for (Iterator it = a.iterator(); it.hasNext(); )
|
||||
{
|
||||
b.add(it.next().toString());
|
||||
}
|
||||
List<OID> a = ((ExtendedKeyUsage) e.getValue()).getPurposeIds();
|
||||
List<String> b = new ArrayList<String>(a.size());
|
||||
for (OID oid : a)
|
||||
b.add(oid.toString());
|
||||
return Collections.unmodifiableList(b);
|
||||
}
|
||||
return null;
|
||||
@@ -342,24 +342,44 @@ public class X509Certificate extends java.security.cert.X509Certificate
|
||||
return -1;
|
||||
}
|
||||
|
||||
public Collection getSubjectAlternativeNames()
|
||||
public Collection<List<?>> getSubjectAlternativeNames()
|
||||
throws CertificateParsingException
|
||||
{
|
||||
Extension e = getExtension(SubjectAlternativeNames.ID);
|
||||
if (e != null)
|
||||
{
|
||||
return ((SubjectAlternativeNames) e.getValue()).getNames();
|
||||
List<GeneralName> names
|
||||
= ((SubjectAlternativeNames) e.getValue()).getNames();
|
||||
List<List<?>> list = new ArrayList<List<?>>(names.size());
|
||||
for (GeneralName name : names)
|
||||
{
|
||||
List<Object> n = new ArrayList<Object>(2);
|
||||
n.add(name.kind().tag());
|
||||
n.add(name.name());
|
||||
list.add(n);
|
||||
}
|
||||
return list;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public Collection getIssuerAlternativeNames()
|
||||
public Collection<List<?>> getIssuerAlternativeNames()
|
||||
throws CertificateParsingException
|
||||
{
|
||||
Extension e = getExtension(IssuerAlternativeNames.ID);
|
||||
if (e != null)
|
||||
{
|
||||
return ((IssuerAlternativeNames) e.getValue()).getNames();
|
||||
List<GeneralName> names
|
||||
= ((IssuerAlternativeNames) e.getValue()).getNames();
|
||||
List<List<?>> list = new ArrayList<List<?>>(names.size());
|
||||
for (GeneralName name : names)
|
||||
{
|
||||
List<Object> n = new ArrayList<Object>(2);
|
||||
n.add(name.kind().tag());
|
||||
n.add(name.name());
|
||||
list.add(n);
|
||||
}
|
||||
return list;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@@ -378,24 +398,22 @@ public class X509Certificate extends java.security.cert.X509Certificate
|
||||
return false;
|
||||
}
|
||||
|
||||
public Set getCriticalExtensionOIDs()
|
||||
public Set<String> getCriticalExtensionOIDs()
|
||||
{
|
||||
HashSet s = new HashSet();
|
||||
for (Iterator it = extensions.values().iterator(); it.hasNext(); )
|
||||
HashSet<String> s = new HashSet<String>();
|
||||
for (Extension e : extensions.values())
|
||||
{
|
||||
Extension e = (Extension) it.next();
|
||||
if (e.isCritical())
|
||||
s.add(e.getOid().toString());
|
||||
}
|
||||
return Collections.unmodifiableSet(s);
|
||||
}
|
||||
|
||||
public Set getNonCriticalExtensionOIDs()
|
||||
public Set<String> getNonCriticalExtensionOIDs()
|
||||
{
|
||||
HashSet s = new HashSet();
|
||||
for (Iterator it = extensions.values().iterator(); it.hasNext(); )
|
||||
HashSet<String> s = new HashSet<String>();
|
||||
for (Extension e : extensions.values())
|
||||
{
|
||||
Extension e = (Extension) it.next();
|
||||
if (!e.isCritical())
|
||||
s.add(e.getOid().toString());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user