[GNUnet-SVN] r202 - branches/GNUnet06/contrib/win

[durner]

Author: durner
Date: 2005-02-07 12:13:54 -0800 (Mon, 07 Feb 2005)
New Revision: 202

Modified:
   branches/GNUnet06/contrib/win/Installer.nsi
   branches/GNUnet06/contrib/win/License.rtf
Log:
Replace OpenSSL by libgcrypt

Modified: branches/GNUnet06/contrib/win/Installer.nsi
===================================================================
--- branches/GNUnet06/contrib/win/Installer.nsi 2005-02-07 18:22:25 UTC (rev 
201)
+++ branches/GNUnet06/contrib/win/Installer.nsi 2005-02-07 20:13:54 UTC (rev 
202)
@@ -273,7 +273,8 @@
   File "C:\GNUnet\bin\libglib-2.0-0.dll"
   File "C:\GNUnet\bin\libgdk_pixbuf-2.0-0.dll"
   File "C:\GNUnet\bin\libgdk-win32-2.0-0.dll"
-  File "C:\GNUnet\bin\libgdk-0.dll"
+  File "C:\GNUnet\bin\libgdk-0.dll"
+  File "C:\GNUnet\bin\libgcrypt.dll"
   File "C:\GNUnet\bin\libdb.dll"  
   File "C:\GNUnet\bin\libatk-1.0-0.dll"
   File "C:\GNUnet\bin\intl.dll"
@@ -501,7 +502,8 @@
   Delete "$INSTDIR\bin\libatk-1.0-0.dll"
   Delete "$INSTDIR\bin\libcharset.dll"
   Delete "$INSTDIR\bin\libdb.dll"
-  Delete "$INSTDIR\bin\libeay32-0.dll"
+  Delete "$INSTDIR\bin\libeay32-0.dll"
+  Delete "$INSTDIR\bin\libgcrypt.dll"
   Delete "$INSTDIR\bin\libgdbm-2.dll"
   Delete "$INSTDIR\bin\libgdk-0.dll"
   Delete "$INSTDIR\bin\libgdk_pixbuf-2.0-0.dll"

Modified: branches/GNUnet06/contrib/win/License.rtf
===================================================================
--- branches/GNUnet06/contrib/win/License.rtf   2005-02-07 18:22:25 UTC (rev 
201)
+++ branches/GNUnet06/contrib/win/License.rtf   2005-02-07 20:13:54 UTC (rev 
202)
@@ -14,17 +14,13 @@
 \par
 See below for the GNU General Public License.\par
 \par
-This product includes software developed by the OpenSSL\par
-Project for use in the OpenSSL Toolkit\par
-(http://www.openssl.org/).\par
-See below for the full licenses of OpenSSL.\par
-\par
 It also contains the Berkeley DB software, see below for\line the licenses.\par
 \par
 Other libraries covered under the (L)GPL (see below):\par
  libiconv         Copyright Free Software Foundation, Inc.\par
  libintl          Copyright Free Software Foundation, Inc.\par
  libcharset       Copyright Free Software Foundation, Inc.\par
+ libgcrypt        Copyright Free Software Foundation, Inc.\par
  gdbm             Copyright Free Software Foundation, Inc.\par
  GTK+             Copyright by the GTK+ team <www.gtk.org>\par
  GLib             Copyright by the GTK+ team <www.gtk.org>\par
@@ -386,125 +382,6 @@
 \par
 \par
 \par
-  OpenSSL License\par
-  --------------------------\par
-\par
-/* ====================================================================\par
- * Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.\par
- *\par
- * Redistribution and use in source and binary forms, with or without\par
- * modification, are permitted provided that the following conditions\par
- * are met:\par
- *\par
- * 1. Redistributions of source code must retain the above copyright\par
- *    notice, this list of conditions and the following disclaimer. \par
- *\par
- * 2. Redistributions in binary form must reproduce the above copyright\par
- *    notice, this list of conditions and the following disclaimer in\par
- *    the documentation and/or other materials provided with the\par
- *    distribution.\par
- *\par
- * 3. All advertising materials mentioning features or use of this\par
- *    software must display the following acknowledgment:\par
- *    "This product includes software developed by the OpenSSL Project\par
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"\par
- *\par
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to\par
- *    endorse or promote products derived from this software without\par
- *    prior written permission. For written permission, please contact\par
- *    address@hidden
- *\par
- * 5. Products derived from this software may not be called "OpenSSL"\par
- *    nor may "OpenSSL" appear in their names without prior written\par
- *    permission of the OpenSSL Project.\par
- *\par
- * 6. Redistributions of any form whatsoever must retain the following\par
- *    acknowledgment:\par
- *    "This product includes software developed by the OpenSSL Project\par
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"\par
- *\par
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY\par
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\par
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\par
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR\par
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\par
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\par
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\par
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\par
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\par
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\par
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\par
- * OF THE POSSIBILITY OF SUCH DAMAGE.\par
- * ====================================================================\par
- *\par
- * This product includes cryptographic software written by Eric Young\par
- * (address@hidden).  This product includes software written by Tim\par
- * Hudson (address@hidden).\par
- *\par
- */\par
-\par
- Original SSLeay License\par
- -----------------------------------\par
-\par
-/* Copyright (C) 1995-1998 Eric Young (address@hidden)\par
- * All rights reserved.\par
- *\par
- * This package is an SSL implementation written\par
- * by Eric Young (address@hidden).\par
- * The implementation was written so as to conform with Netscapes SSL.\par
- * \par
- * This library is free for commercial and non-commercial use as long as\par
- * the following conditions are aheared to.  The following conditions\par
- * apply to all code found in this distribution, be it the RC4, RSA,\par
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation\par
- * included with this distribution is covered by the same copyright terms\par
- * except that the holder is Tim Hudson (address@hidden).\par
- * \par
- * Copyright remains Eric Young's, and as such any Copyright notices in\par
- * the code are not to be removed.\par
- * If this package is used in a product, Eric Young should be given 
attribution\par
- * as the author of the parts of the library used.\par
- * This can be in the form of a textual message at program startup or\par
- * in documentation (online or textual) provided with the package.\par
- * \par
- * Redistribution and use in source and binary forms, with or without\par
- * modification, are permitted provided that the following conditions\par
- * are met:\par
- * 1. Redistributions of source code must retain the copyright\par
- *    notice, this list of conditions and the following disclaimer.\par
- * 2. Redistributions in binary form must reproduce the above copyright\par
- *    notice, this list of conditions and the following disclaimer in the\par
- *    documentation and/or other materials provided with the distribution.\par
- * 3. All advertising materials mentioning features or use of this software\par
- *    must display the following acknowledgement:\par
- *    "This product includes cryptographic software written by\par
- *     Eric Young (address@hidden)"\par
- *    The word 'cryptographic' can be left out if the rouines from the 
library\par
- *    being used are not cryptographic related :-).\par
- * 4. If you include any Windows specific code (or a derivative thereof) from 
\par
- *    the apps directory (application code) you must include an 
acknowledgement:\par
- *    "This product includes software written by Tim Hudson 
(address@hidden)"\par
- * \par
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND\par
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\par
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
PURPOSE\par
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE\par
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
CONSEQUENTIAL\par
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\par
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\par
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
STRICT\par
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY 
WAY\par
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\par
- * SUCH DAMAGE.\par
- * \par
- * The licence and distribution terms for any publically available version 
or\par
- * derivative of this code cannot be changed.  i.e. this code cannot simply 
be\par
- * copied and put under another distribution licence\par
- * [including the GNU Public Licence.]\par
- */\par
-\par
-\par
-\par
   GNU LESSER GENERAL PUBLIC LICENSE\par
   ---------------------------------------------------------------\par
 \tab\tab        Version 2.1, February 1999\par