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
parent
af333b9a7f
commit
e1bea0c068
2951 changed files with 80982 additions and 68583 deletions
|
|
@ -0,0 +1,161 @@
|
|||
/* NameConstraints.java -- the NameConstraints X.509 extension.
|
||||
Copyright (C) 2006 Free Software Foundation, Inc.
|
||||
|
||||
This file is a part of GNU Classpath.
|
||||
|
||||
GNU Classpath is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or (at
|
||||
your option) any later version.
|
||||
|
||||
GNU Classpath is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GNU Classpath; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
|
||||
USA
|
||||
|
||||
Linking this library statically or dynamically with other modules is
|
||||
making a combined work based on this library. Thus, the terms and
|
||||
conditions of the GNU General Public License cover the whole
|
||||
combination.
|
||||
|
||||
As a special exception, the copyright holders of this library give you
|
||||
permission to link this library with independent modules to produce an
|
||||
executable, regardless of the license terms of these independent
|
||||
modules, and to copy and distribute the resulting executable under
|
||||
terms of your choice, provided that you also meet, for each linked
|
||||
independent module, the terms and conditions of the license of that
|
||||
module. An independent module is a module which is not derived from
|
||||
or based on this library. If you modify this library, you may extend
|
||||
this exception to your version of the library, but you are not
|
||||
obligated to do so. If you do not wish to do so, delete this
|
||||
exception statement from your version. */
|
||||
|
||||
|
||||
package gnu.java.security.x509.ext;
|
||||
|
||||
import gnu.java.security.OID;
|
||||
import gnu.java.security.der.DERReader;
|
||||
import gnu.java.security.der.DERValue;
|
||||
import gnu.java.security.x509.ext.Extension.Value;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Collections;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* The NameConstraints extension. From RFC 3280, section 4.2.1.11, this
|
||||
* extension is defined as:
|
||||
*
|
||||
* <pre>
|
||||
id-ce-nameConstraints OBJECT IDENTIFIER ::= { id-ce 30 }
|
||||
|
||||
NameConstraints ::= SEQUENCE {
|
||||
permittedSubtrees [0] GeneralSubtrees OPTIONAL,
|
||||
excludedSubtrees [1] GeneralSubtrees OPTIONAL }
|
||||
|
||||
GeneralSubtrees ::= SEQUENCE SIZE (1..MAX) OF GeneralSubtree
|
||||
|
||||
GeneralSubtree ::= SEQUENCE {
|
||||
base GeneralName,
|
||||
minimum [0] BaseDistance DEFAULT 0,
|
||||
maximum [1] BaseDistance OPTIONAL }
|
||||
|
||||
BaseDistance ::= INTEGER (0..MAX)
|
||||
</pre>
|
||||
*
|
||||
* See also the classes {@link GeneralNames} and {@link GeneralSubtree}.
|
||||
*
|
||||
* @author csm
|
||||
*/
|
||||
public class NameConstraints extends Value
|
||||
{
|
||||
public static final OID ID = new OID("2.5.29.30");
|
||||
|
||||
private List<GeneralSubtree> permittedSubtrees;
|
||||
private List<GeneralSubtree> excludedSubtrees;
|
||||
|
||||
public NameConstraints(byte[] encoded) throws IOException
|
||||
{
|
||||
super(encoded);
|
||||
|
||||
DERReader der = new DERReader(encoded);
|
||||
DERValue value = der.read();
|
||||
if (!value.isConstructed())
|
||||
{
|
||||
throw new IOException("malformed NameConstraints");
|
||||
}
|
||||
|
||||
permittedSubtrees = new LinkedList<GeneralSubtree>();
|
||||
excludedSubtrees = new LinkedList<GeneralSubtree>();
|
||||
int len = 0;
|
||||
if (len < value.getLength())
|
||||
{
|
||||
DERValue subtrees = der.read();
|
||||
if (subtrees.getTag() == 0)
|
||||
{
|
||||
int len2 = 0;
|
||||
while (len2 < subtrees.getLength())
|
||||
{
|
||||
DERValue subtree = der.read();
|
||||
permittedSubtrees.add(new GeneralSubtree(subtree.getEncoded()));
|
||||
der.skip(subtree.getLength());
|
||||
len2 += subtree.getEncodedLength();
|
||||
}
|
||||
len += subtrees.getEncodedLength();
|
||||
|
||||
if (len < value.getLength())
|
||||
{
|
||||
subtrees = der.read();
|
||||
if (subtrees.getTag() != 1)
|
||||
throw new IOException("unexpected tag " + subtrees.getTag()
|
||||
+ " (expecting 1 for excludedSubtrees)");
|
||||
len2 = 0;
|
||||
while (len2 < subtrees.getLength())
|
||||
{
|
||||
DERValue subtree = der.read();
|
||||
excludedSubtrees.add(new GeneralSubtree(subtree.getEncoded()));
|
||||
der.skip(subtree.getLength());
|
||||
len2 += subtree.getEncodedLength();
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (subtrees.getTag() == 1)
|
||||
{
|
||||
int len2 = 0;
|
||||
while (len2 < subtrees.getLength())
|
||||
{
|
||||
DERValue subtree = der.read();
|
||||
excludedSubtrees.add(new GeneralSubtree(subtree.getEncoded()));
|
||||
der.skip(subtree.getLength());
|
||||
len2 += subtree.getEncodedLength();
|
||||
}
|
||||
}
|
||||
else
|
||||
throw new IOException("unexpected tag " + subtrees.getTag()
|
||||
+ " (expecting 0 or 1)");
|
||||
}
|
||||
}
|
||||
|
||||
public List<GeneralSubtree> permittedSubtrees()
|
||||
{
|
||||
return Collections.unmodifiableList(permittedSubtrees);
|
||||
}
|
||||
|
||||
public List<GeneralSubtree> excludedSubtrees()
|
||||
{
|
||||
return Collections.unmodifiableList(excludedSubtrees);
|
||||
}
|
||||
|
||||
public String toString()
|
||||
{
|
||||
return NameConstraints.class.getName() + " [ permittedSubtrees="
|
||||
+ permittedSubtrees + "; excludedSubtrees=" + excludedSubtrees
|
||||
+ " ]";
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue