jdk/src/share/classes/sun/security/pkcs/ContentInfo.java
author jjg
Mon, 15 Aug 2011 11:48:20 -0700
changeset 10336 0bb1999251f8
parent 5506 202f599c92aa
permissions -rw-r--r--
7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror Reviewed-by: xuelei, mullan Contributed-by: alexandre.boulgakov@oracle.com
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     1
/*
10336
0bb1999251f8 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
jjg
parents: 5506
diff changeset
     2
 * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
90ce3da70b43 Initial load
duke
parents:
diff changeset
     4
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
90ce3da70b43 Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    10
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
90ce3da70b43 Initial load
duke
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
90ce3da70b43 Initial load
duke
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
90ce3da70b43 Initial load
duke
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
90ce3da70b43 Initial load
duke
parents:
diff changeset
    15
 * accompanied this code).
90ce3da70b43 Initial load
duke
parents:
diff changeset
    16
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
90ce3da70b43 Initial load
duke
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
90ce3da70b43 Initial load
duke
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    20
 *
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    23
 * questions.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    24
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    25
90ce3da70b43 Initial load
duke
parents:
diff changeset
    26
package sun.security.pkcs;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    27
90ce3da70b43 Initial load
duke
parents:
diff changeset
    28
import java.io.*;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    29
90ce3da70b43 Initial load
duke
parents:
diff changeset
    30
import sun.security.util.*;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    31
90ce3da70b43 Initial load
duke
parents:
diff changeset
    32
/**
90ce3da70b43 Initial load
duke
parents:
diff changeset
    33
 * A ContentInfo type, as defined in PKCS#7.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    34
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    35
 * @author Benjamin Renaud
90ce3da70b43 Initial load
duke
parents:
diff changeset
    36
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    37
90ce3da70b43 Initial load
duke
parents:
diff changeset
    38
public class ContentInfo {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    39
90ce3da70b43 Initial load
duke
parents:
diff changeset
    40
    // pkcs7 pre-defined content types
90ce3da70b43 Initial load
duke
parents:
diff changeset
    41
    private static int[]  pkcs7 = {1, 2, 840, 113549, 1, 7};
90ce3da70b43 Initial load
duke
parents:
diff changeset
    42
    private static int[]   data = {1, 2, 840, 113549, 1, 7, 1};
90ce3da70b43 Initial load
duke
parents:
diff changeset
    43
    private static int[]  sdata = {1, 2, 840, 113549, 1, 7, 2};
90ce3da70b43 Initial load
duke
parents:
diff changeset
    44
    private static int[]  edata = {1, 2, 840, 113549, 1, 7, 3};
90ce3da70b43 Initial load
duke
parents:
diff changeset
    45
    private static int[] sedata = {1, 2, 840, 113549, 1, 7, 4};
90ce3da70b43 Initial load
duke
parents:
diff changeset
    46
    private static int[]  ddata = {1, 2, 840, 113549, 1, 7, 5};
90ce3da70b43 Initial load
duke
parents:
diff changeset
    47
    private static int[] crdata = {1, 2, 840, 113549, 1, 7, 6};
90ce3da70b43 Initial load
duke
parents:
diff changeset
    48
    private static int[] nsdata = {2, 16, 840, 1, 113730, 2, 5};
90ce3da70b43 Initial load
duke
parents:
diff changeset
    49
    // timestamp token (id-ct-TSTInfo) from RFC 3161
90ce3da70b43 Initial load
duke
parents:
diff changeset
    50
    private static int[] tstInfo = {1, 2, 840, 113549, 1, 9, 16, 1, 4};
90ce3da70b43 Initial load
duke
parents:
diff changeset
    51
    // this is for backwards-compatibility with JDK 1.1.x
90ce3da70b43 Initial load
duke
parents:
diff changeset
    52
    private static final int[] OLD_SDATA = {1, 2, 840, 1113549, 1, 7, 2};
90ce3da70b43 Initial load
duke
parents:
diff changeset
    53
    private static final int[] OLD_DATA = {1, 2, 840, 1113549, 1, 7, 1};
90ce3da70b43 Initial load
duke
parents:
diff changeset
    54
    public static ObjectIdentifier PKCS7_OID;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    55
    public static ObjectIdentifier DATA_OID;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    56
    public static ObjectIdentifier SIGNED_DATA_OID;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    57
    public static ObjectIdentifier ENVELOPED_DATA_OID;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    58
    public static ObjectIdentifier SIGNED_AND_ENVELOPED_DATA_OID;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    59
    public static ObjectIdentifier DIGESTED_DATA_OID;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    60
    public static ObjectIdentifier ENCRYPTED_DATA_OID;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    61
    public static ObjectIdentifier OLD_SIGNED_DATA_OID;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    62
    public static ObjectIdentifier OLD_DATA_OID;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    63
    public static ObjectIdentifier NETSCAPE_CERT_SEQUENCE_OID;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    64
    public static ObjectIdentifier TIMESTAMP_TOKEN_INFO_OID;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    65
90ce3da70b43 Initial load
duke
parents:
diff changeset
    66
    static {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    67
        PKCS7_OID =  ObjectIdentifier.newInternal(pkcs7);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    68
        DATA_OID = ObjectIdentifier.newInternal(data);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    69
        SIGNED_DATA_OID = ObjectIdentifier.newInternal(sdata);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    70
        ENVELOPED_DATA_OID = ObjectIdentifier.newInternal(edata);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    71
        SIGNED_AND_ENVELOPED_DATA_OID = ObjectIdentifier.newInternal(sedata);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    72
        DIGESTED_DATA_OID = ObjectIdentifier.newInternal(ddata);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    73
        ENCRYPTED_DATA_OID = ObjectIdentifier.newInternal(crdata);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    74
        OLD_SIGNED_DATA_OID = ObjectIdentifier.newInternal(OLD_SDATA);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    75
        OLD_DATA_OID = ObjectIdentifier.newInternal(OLD_DATA);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    76
        /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
    77
         * The ASN.1 systax for the Netscape Certificate Sequence
90ce3da70b43 Initial load
duke
parents:
diff changeset
    78
         * data type is defined
90ce3da70b43 Initial load
duke
parents:
diff changeset
    79
         * <a href=http://wp.netscape.com/eng/security/comm4-cert-download.html>
90ce3da70b43 Initial load
duke
parents:
diff changeset
    80
         * here.</a>
90ce3da70b43 Initial load
duke
parents:
diff changeset
    81
         */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    82
        NETSCAPE_CERT_SEQUENCE_OID = ObjectIdentifier.newInternal(nsdata);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    83
        TIMESTAMP_TOKEN_INFO_OID = ObjectIdentifier.newInternal(tstInfo);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    84
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    85
90ce3da70b43 Initial load
duke
parents:
diff changeset
    86
    ObjectIdentifier contentType;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    87
    DerValue content; // OPTIONAL
90ce3da70b43 Initial load
duke
parents:
diff changeset
    88
90ce3da70b43 Initial load
duke
parents:
diff changeset
    89
    public ContentInfo(ObjectIdentifier contentType, DerValue content) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    90
        this.contentType = contentType;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    91
        this.content = content;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    92
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    93
90ce3da70b43 Initial load
duke
parents:
diff changeset
    94
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
    95
     * Make a contentInfo of type data.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    96
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    97
    public ContentInfo(byte[] bytes) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    98
        DerValue octetString = new DerValue(DerValue.tag_OctetString, bytes);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    99
        this.contentType = DATA_OID;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   100
        this.content = octetString;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   101
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   102
90ce3da70b43 Initial load
duke
parents:
diff changeset
   103
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   104
     * Parses a PKCS#7 content info.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   105
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   106
    public ContentInfo(DerInputStream derin)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   107
        throws IOException, ParsingException
90ce3da70b43 Initial load
duke
parents:
diff changeset
   108
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   109
        this(derin, false);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   110
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   111
90ce3da70b43 Initial load
duke
parents:
diff changeset
   112
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   113
     * Parses a PKCS#7 content info.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   114
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   115
     * <p>This constructor is used only for backwards compatibility with
90ce3da70b43 Initial load
duke
parents:
diff changeset
   116
     * PKCS#7 blocks that were generated using JDK1.1.x.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   117
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   118
     * @param derin the ASN.1 encoding of the content info.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   119
     * @param oldStyle flag indicating whether or not the given content info
90ce3da70b43 Initial load
duke
parents:
diff changeset
   120
     * is encoded according to JDK1.1.x.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   121
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   122
    public ContentInfo(DerInputStream derin, boolean oldStyle)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   123
        throws IOException, ParsingException
90ce3da70b43 Initial load
duke
parents:
diff changeset
   124
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   125
        DerInputStream disType;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   126
        DerInputStream disTaggedContent;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   127
        DerValue type;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   128
        DerValue taggedContent;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   129
        DerValue[] typeAndContent;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   130
        DerValue[] contents;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   131
90ce3da70b43 Initial load
duke
parents:
diff changeset
   132
        typeAndContent = derin.getSequence(2);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   133
90ce3da70b43 Initial load
duke
parents:
diff changeset
   134
        // Parse the content type
90ce3da70b43 Initial load
duke
parents:
diff changeset
   135
        type = typeAndContent[0];
90ce3da70b43 Initial load
duke
parents:
diff changeset
   136
        disType = new DerInputStream(type.toByteArray());
90ce3da70b43 Initial load
duke
parents:
diff changeset
   137
        contentType = disType.getOID();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   138
90ce3da70b43 Initial load
duke
parents:
diff changeset
   139
        if (oldStyle) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   140
            // JDK1.1.x-style encoding
90ce3da70b43 Initial load
duke
parents:
diff changeset
   141
            content = typeAndContent[1];
90ce3da70b43 Initial load
duke
parents:
diff changeset
   142
        } else {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   143
            // This is the correct, standards-compliant encoding.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   144
            // Parse the content (OPTIONAL field).
90ce3da70b43 Initial load
duke
parents:
diff changeset
   145
            // Skip the [0] EXPLICIT tag by pretending that the content is the
90ce3da70b43 Initial load
duke
parents:
diff changeset
   146
            // one and only element in an implicitly tagged set
90ce3da70b43 Initial load
duke
parents:
diff changeset
   147
            if (typeAndContent.length > 1) { // content is OPTIONAL
90ce3da70b43 Initial load
duke
parents:
diff changeset
   148
                taggedContent = typeAndContent[1];
90ce3da70b43 Initial load
duke
parents:
diff changeset
   149
                disTaggedContent
90ce3da70b43 Initial load
duke
parents:
diff changeset
   150
                    = new DerInputStream(taggedContent.toByteArray());
90ce3da70b43 Initial load
duke
parents:
diff changeset
   151
                contents = disTaggedContent.getSet(1, true);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   152
                content = contents[0];
90ce3da70b43 Initial load
duke
parents:
diff changeset
   153
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   154
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   155
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   156
90ce3da70b43 Initial load
duke
parents:
diff changeset
   157
    public DerValue getContent() {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   158
        return content;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   159
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   160
90ce3da70b43 Initial load
duke
parents:
diff changeset
   161
    public ObjectIdentifier getContentType() {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   162
        return contentType;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   163
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   164
90ce3da70b43 Initial load
duke
parents:
diff changeset
   165
    public byte[] getData() throws IOException {
10336
0bb1999251f8 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
jjg
parents: 5506
diff changeset
   166
        if (contentType.equals((Object)DATA_OID) ||
0bb1999251f8 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
jjg
parents: 5506
diff changeset
   167
            contentType.equals((Object)OLD_DATA_OID) ||
0bb1999251f8 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
jjg
parents: 5506
diff changeset
   168
            contentType.equals((Object)TIMESTAMP_TOKEN_INFO_OID)) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   169
            if (content == null)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   170
                return null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   171
            else
90ce3da70b43 Initial load
duke
parents:
diff changeset
   172
                return content.getOctetString();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   173
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   174
        throw new IOException("content type is not DATA: " + contentType);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   175
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   176
90ce3da70b43 Initial load
duke
parents:
diff changeset
   177
    public void encode(DerOutputStream out) throws IOException {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   178
        DerOutputStream contentDerCode;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   179
        DerOutputStream seq;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   180
90ce3da70b43 Initial load
duke
parents:
diff changeset
   181
        seq = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   182
        seq.putOID(contentType);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   183
90ce3da70b43 Initial load
duke
parents:
diff changeset
   184
        // content is optional, it could be external
90ce3da70b43 Initial load
duke
parents:
diff changeset
   185
        if (content != null) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   186
            DerValue taggedContent = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   187
            contentDerCode = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   188
            content.encode(contentDerCode);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   189
90ce3da70b43 Initial load
duke
parents:
diff changeset
   190
            // Add the [0] EXPLICIT tag in front of the content encoding
90ce3da70b43 Initial load
duke
parents:
diff changeset
   191
            taggedContent = new DerValue((byte)0xA0,
90ce3da70b43 Initial load
duke
parents:
diff changeset
   192
                                         contentDerCode.toByteArray());
90ce3da70b43 Initial load
duke
parents:
diff changeset
   193
            seq.putDerValue(taggedContent);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   194
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   195
90ce3da70b43 Initial load
duke
parents:
diff changeset
   196
        out.write(DerValue.tag_Sequence, seq);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   197
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   198
90ce3da70b43 Initial load
duke
parents:
diff changeset
   199
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   200
     * Returns a byte array representation of the data held in
90ce3da70b43 Initial load
duke
parents:
diff changeset
   201
     * the content field.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   202
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   203
    public byte[] getContentBytes() throws IOException {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   204
        if (content == null)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   205
            return null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   206
90ce3da70b43 Initial load
duke
parents:
diff changeset
   207
        DerInputStream dis = new DerInputStream(content.toByteArray());
90ce3da70b43 Initial load
duke
parents:
diff changeset
   208
        return dis.getOctetString();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   209
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   210
90ce3da70b43 Initial load
duke
parents:
diff changeset
   211
    public String toString() {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   212
        String out = "";
90ce3da70b43 Initial load
duke
parents:
diff changeset
   213
90ce3da70b43 Initial load
duke
parents:
diff changeset
   214
        out += "Content Info Sequence\n\tContent type: " + contentType + "\n";
90ce3da70b43 Initial load
duke
parents:
diff changeset
   215
        out += "\tContent: " + content;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   216
        return out;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   217
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   218
}