Diff

Differences From Artifact [00024a3aee]:

To Artifact [6315f16a70]:


     1         -The following files in this directory are the intellectual property of the
     2         -Free Software Foundation and are licensed under the terms of the GNU General
     3         -Public License (GPL):
     4         -	config.guess, config.sub, install-sh
            1  +With the exceptions noted below, the files in this directory and the
            2  +'leakcheck' subdirectory are Copyright 2012, Lockheed Martin
            3  +Corporation.
            4  +
            5  +The U.S. Government has Unlimited Rights in this computer software
            6  +pursuant to the clause DFARS 252.227-7014 of contract No.
            7  +W91WMC-07-D-0001. Any reproduction of this computer software, or
            8  +portions thereof, marked with this legend must also reproduce these
            9  +markings.
           10  +
           11  +The files this project developed in the performance of contract
           12  +W91WMC-07-D-0001 (see exceptions below) are authorized for
           13  +distribution by the United States Government under the following
           14  +license:  
           15  +
           16  +LICENSE (MIT)
           17  +
           18  +Permission is hereby granted, free of charge, to any person obtaining
           19  +a copy of this software and associated documentation files (the
           20  +"Software"), to deal in the Software without restriction, including
           21  +without limitation the rights to use, copy, modify, merge, publish,
           22  +distribute, sublicense, and/or sell copies of the Software, and to
           23  +permit persons to whom the Software is furnished to do so, subject to
           24  +the following conditions:
           25  +
           26  +The above copyright notice and this permission notice shall be
           27  +included in all copies or substantial portions of the Software.
           28  +
           29  +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
           30  +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
           31  +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
           32  +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
           33  +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
           34  +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
           35  +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
           36  +
           37  +EXCEPTIONS
           38  +
           39  +The following files in this directory are the intellectual property of
           40  +the Free Software Foundation and are licensed under the terms of
           41  +GPL-2.0-with-autoconf-exception: config.guess, config.sub
     5     42   
     6         -The following files in this directory are the intellectual property of RSA
     7         -Data Security, Inc.:
     8         -	md5.h
     9         -	md5.c
           43  +The followig files in this directory are the intellectual property of
           44  +the X Consortium, and are licensed under the X11 license: install.sh
    10     45   
    11         -And are "derived from the RSA Data Security, Inc. MD5 Message-Digest
    12         -Algorithm".
           46  +The following files in this directory are the intellectual property of
           47  +RSA Data Security, Inc., and are licensed under terms specified
           48  +therein: md5.h, md5.c These files are "derived from the RSA Data
           49  +Security, Inc. MD5 Message-Digest Algorithm".
    13     50   
    14         -The following files in this directory are from RFC 3174:
    15         -	sha1.c
    16         -	sha1.h
    17         -
    18         -The remaining files in this directory and the "leakcheck" directory are the
    19         -intellectual property of the United States Government.  It is not clear which,
    20         -if any, license is made on them.  In addition, as of 07-JUN-2010 they have not
    21         -been cleared for public release.
           51  +The following files in this directory are from RFC 3174, are the
           52  +intellectual property of the Internet Society, and are licensed under
           53  +terms specified therein: sha1.c, sha1.h
    22     54   
    23     55   The files in the "pkcs11/" directory are licensed under the terms of the
    24     56   following licenses:
    25         -	mypkcs11.h : GNU General Public License 2.1.
    26         -	pkcs11.h   : GNU General Public License 2.1.
    27         -	pkcs11f.h  : GNU General Public License 2.1.
    28         -	pkcs11n.h  : Mozilla Public License or GNU General Public License
    29         -	pkcs11t.h  : GNU General Public License 2.1.
           57  +	mypkcs11.h : GNU Lesser General Public License 2.1.
           58  +	pkcs11.h   : GNU Lesser General Public License 2.1.
           59  +	pkcs11f.h  : GNU Lesser General Public License 2.1.
           60  +	pkcs11n.h  : Mozilla Public License 2.0
           61  +	pkcs11t.h  : GNU Lesser General Public License 2.1.