[Pkg-silc-commits] r164 - in /silc-toolkit/branches/upstream/current: ./ apps/ doc/ doc/toolkit/ includes/ lib/ lib/contrib/ lib/silcapputil/ lib/silcasn1/ lib/silcclient/ lib/silccore/ lib/silccrypt/ lib/silccrypt/tests/ lib/silccrypt/tests/.libs/ lib/silchttp/ lib/silcmath/ lib/silcsftp/ lib/silcsim/ lib/silcske/ lib/silcskr/ lib/silcutil/ lib/silcutil/unix/ lib/silcvcard/

lunar at users.alioth.debian.org lunar at users.alioth.debian.org
Tue Sep 11 23:39:49 UTC 2007 

Author: lunar
Date: Tue Sep 11 23:39:49 2007
New Revision: 164

URL: http://svn.debian.org/wsvn/pkg-silc/?sc=1&rev=164
Log:
[svn-upgrade] Integrating new upstream version, silc-toolkit (1.1.3)

Added:
    silc-toolkit/branches/upstream/current/lib/silccrypt/tests/.libs/
    silc-toolkit/branches/upstream/current/lib/silccrypt/tests/core.27282   (with props)
    silc-toolkit/branches/upstream/current/lib/silccrypt/tests/test_sha256   (with props)
Modified:
    silc-toolkit/branches/upstream/current/CHANGES
    silc-toolkit/branches/upstream/current/Makefile.am
    silc-toolkit/branches/upstream/current/Makefile.in
    silc-toolkit/branches/upstream/current/apps/Makefile.am
    silc-toolkit/branches/upstream/current/apps/Makefile.in
    silc-toolkit/branches/upstream/current/configure
    silc-toolkit/branches/upstream/current/configure.ac
    silc-toolkit/branches/upstream/current/doc/Makefile.am
    silc-toolkit/branches/upstream/current/doc/Makefile.in
    silc-toolkit/branches/upstream/current/doc/silcalgs.conf
    silc-toolkit/branches/upstream/current/doc/toolkit/index.html
    silc-toolkit/branches/upstream/current/doc/toolkit/silcnet.html
    silc-toolkit/branches/upstream/current/includes/Makefile.am
    silc-toolkit/branches/upstream/current/includes/Makefile.in
    silc-toolkit/branches/upstream/current/includes/silcdistdefs.h
    silc-toolkit/branches/upstream/current/includes/silcversion.h
    silc-toolkit/branches/upstream/current/includes/silcversion.h.in
    silc-toolkit/branches/upstream/current/lib/Makefile.am
    silc-toolkit/branches/upstream/current/lib/Makefile.in
    silc-toolkit/branches/upstream/current/lib/contrib/Makefile.am
    silc-toolkit/branches/upstream/current/lib/contrib/Makefile.in
    silc-toolkit/branches/upstream/current/lib/silcapputil/Makefile.am
    silc-toolkit/branches/upstream/current/lib/silcapputil/Makefile.in
    silc-toolkit/branches/upstream/current/lib/silcasn1/Makefile.am
    silc-toolkit/branches/upstream/current/lib/silcasn1/Makefile.in
    silc-toolkit/branches/upstream/current/lib/silcclient/Makefile.am
    silc-toolkit/branches/upstream/current/lib/silcclient/Makefile.in
    silc-toolkit/branches/upstream/current/lib/silcclient/client_notify.c
    silc-toolkit/branches/upstream/current/lib/silcclient/command_reply.c
    silc-toolkit/branches/upstream/current/lib/silccore/Makefile.am
    silc-toolkit/branches/upstream/current/lib/silccore/Makefile.in
    silc-toolkit/branches/upstream/current/lib/silccrypt/Makefile.am
    silc-toolkit/branches/upstream/current/lib/silccrypt/Makefile.in
    silc-toolkit/branches/upstream/current/lib/silccrypt/aes.c
    silc-toolkit/branches/upstream/current/lib/silccrypt/silcpk.c
    silc-toolkit/branches/upstream/current/lib/silchttp/Makefile.am
    silc-toolkit/branches/upstream/current/lib/silchttp/Makefile.in
    silc-toolkit/branches/upstream/current/lib/silcmath/Makefile.am
    silc-toolkit/branches/upstream/current/lib/silcmath/Makefile.in
    silc-toolkit/branches/upstream/current/lib/silcsftp/Makefile.am
    silc-toolkit/branches/upstream/current/lib/silcsftp/Makefile.in
    silc-toolkit/branches/upstream/current/lib/silcsim/Makefile.am
    silc-toolkit/branches/upstream/current/lib/silcsim/Makefile.in
    silc-toolkit/branches/upstream/current/lib/silcske/Makefile.am
    silc-toolkit/branches/upstream/current/lib/silcske/Makefile.in
    silc-toolkit/branches/upstream/current/lib/silcskr/Makefile.am
    silc-toolkit/branches/upstream/current/lib/silcskr/Makefile.in
    silc-toolkit/branches/upstream/current/lib/silcutil/Makefile.am
    silc-toolkit/branches/upstream/current/lib/silcutil/Makefile.in
    silc-toolkit/branches/upstream/current/lib/silcutil/silcatomic.h
    silc-toolkit/branches/upstream/current/lib/silcutil/silcconfig.c
    silc-toolkit/branches/upstream/current/lib/silcutil/silcnet.h
    silc-toolkit/branches/upstream/current/lib/silcutil/silcschedule.c
    silc-toolkit/branches/upstream/current/lib/silcutil/unix/silcunixschedule.c
    silc-toolkit/branches/upstream/current/lib/silcvcard/Makefile.am
    silc-toolkit/branches/upstream/current/lib/silcvcard/Makefile.in
    silc-toolkit/branches/upstream/current/silc-toolkit.spec

Modified: silc-toolkit/branches/upstream/current/CHANGES
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/CHANGES?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/CHANGES (original)
+++ silc-toolkit/branches/upstream/current/CHANGES Tue Sep 11 23:39:49 2007
@@ -1,3 +1,42 @@
+Sun Sep  9 17:52:49 EEST 2007  Pekka Riikonen <priikone at silcnet.org>
+
+	* Fixed possible buffer overflows from SILC Config code.
+	  Patch from Jérémy Bobbio.  Affected file is
+	  lib/silcutil/silcconfig.c.
+
+Sun Aug 26 12:28:49 EEST 2007  Pekka Riikonen <priikone at silcnet.org>
+
+	* Fixed TIMEOUT handling in user info resolving during JOINing,
+	  fixes crash.  Affected file is lib/silcclient/client_notify.c.
+
+	* Fixed mandatory UN and HN SILC public key identifier checking
+	  (both must be present).  Affected file is
+	  lib/silccrypt/silcpk.c.
+
+Tue Aug  7 20:56:06 EEST 2007  Pekka Riikonen <priikone at silcnet.org>
+
+	* Fixed alignment issues with 64-bit CPUs.  Affected files
+	  are lib/silcutil/silcschedule.c and unix/silcunixschedule.c.
+
+	* Added "There are now xx nick's" to "are xx nicks".  Affected
+	  file is apps/irssi/src/fe-common/silc/module-formats.c.
+
+Sat Aug 4 18:37:22 EEST 2007 Pekka Riikonen <priikone at silcnet.org>
+
+	* Fixed USERS command user mode handling (integer overflow).
+	  Affected file is lib/silcclient/command_reply.c.
+
+Thu Jul 19 21:08:49 EEST 2007  Pekka Riikonen <priikone at silcnet.org>
+
+	* Fixed big-endian issues from aes implementation.  Affected
+	  files are lib/silccrypt/aes.c.
+
+	* Fixed lib/silcutil/silcatomic.h compilation on IA64.  Patch
+	  from Jérémy Bobbio.
+
+	* Fixed public key identifier parsing to check lengths
+	  correctly.  Affected file is lib/silccrypt/silcpk.c.
+
 Wed Jul  4 08:06:38 EEST 2007  Pekka Riikonen <priikone at silcnet.org>
 
 	* SILC Toolkit 1.1.2.

Modified: silc-toolkit/branches/upstream/current/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/Makefile.am?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/Makefile.am (original)
+++ silc-toolkit/branches/upstream/current/Makefile.am Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the ./Makefile.ad file in the source tree.
 
 # Source: ./Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/Makefile.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/Makefile.in (original)
+++ silc-toolkit/branches/upstream/current/Makefile.in Tue Sep 11 23:39:49 2007
@@ -18,7 +18,7 @@
 # To make changes edit the ./Makefile.ad file in the source tree.
 
 # Source: ./Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/apps/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/apps/Makefile.am?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/apps/Makefile.am (original)
+++ silc-toolkit/branches/upstream/current/apps/Makefile.am Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the ./apps/Makefile.ad file in the source tree.
 
 # Source: ./apps/Makefile.ad
-# Generated: Wed Jul  4 08:15:31 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:51 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/apps/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/apps/Makefile.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/apps/Makefile.in (original)
+++ silc-toolkit/branches/upstream/current/apps/Makefile.in Tue Sep 11 23:39:49 2007
@@ -18,7 +18,7 @@
 # To make changes edit the ./apps/Makefile.ad file in the source tree.
 
 # Source: ./apps/Makefile.ad
-# Generated: Wed Jul  4 08:15:31 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:51 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/configure
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/configure?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/configure (original)
+++ silc-toolkit/branches/upstream/current/configure Tue Sep 11 23:39:49 2007
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Toolkit 1.1.2.
+# Generated by GNU Autoconf 2.61 for Toolkit 1.1.3.
 #
 # Report bugs to <silc-devel at lists.silcnet.org>.
 #
@@ -728,8 +728,8 @@
 # Identity of this package.
 PACKAGE_NAME='Toolkit'
 PACKAGE_TARNAME='silc-toolkit'
-PACKAGE_VERSION='1.1.2'
-PACKAGE_STRING='Toolkit 1.1.2'
+PACKAGE_VERSION='1.1.3'
+PACKAGE_STRING='Toolkit 1.1.3'
 PACKAGE_BUGREPORT='silc-devel at lists.silcnet.org'
 
 # Factoring default headers for most tests.
@@ -1467,7 +1467,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Toolkit 1.1.2 to adapt to many kinds of systems.
+\`configure' configures Toolkit 1.1.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1538,7 +1538,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Toolkit 1.1.2:";;
+     short | recursive ) echo "Configuration of Toolkit 1.1.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1653,7 +1653,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Toolkit configure 1.1.2
+Toolkit configure 1.1.3
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1667,7 +1667,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Toolkit $as_me 1.1.2, which was
+It was created by Toolkit $as_me 1.1.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2483,7 +2483,7 @@
 
 # Define the identity of the package.
  PACKAGE='silc-toolkit'
- VERSION='1.1.2'
+ VERSION='1.1.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -31703,7 +31703,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Toolkit $as_me 1.1.2, which was
+This file was extended by Toolkit $as_me 1.1.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31756,7 +31756,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Toolkit config.status 1.1.2
+Toolkit config.status 1.1.3
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

Modified: silc-toolkit/branches/upstream/current/configure.ac
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/configure.ac?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/configure.ac (original)
+++ silc-toolkit/branches/upstream/current/configure.ac Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the configure.ad file in the source tree.
 
 # Source: configure.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:53 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 
@@ -23,7 +23,7 @@
 #  information.
 #
 
-AC_INIT([Toolkit], [1.1.2], [silc-devel at lists.silcnet.org], [silc-toolkit])
+AC_INIT([Toolkit], [1.1.3], [silc-devel at lists.silcnet.org], [silc-toolkit])
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE
 AC_PREREQ(2.52)

Modified: silc-toolkit/branches/upstream/current/doc/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/doc/Makefile.am?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/doc/Makefile.am (original)
+++ silc-toolkit/branches/upstream/current/doc/Makefile.am Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the ./doc/Makefile.ad file in the source tree.
 
 # Source: ./doc/Makefile.ad
-# Generated: Wed Jul  4 08:15:31 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:51 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/doc/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/doc/Makefile.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/doc/Makefile.in (original)
+++ silc-toolkit/branches/upstream/current/doc/Makefile.in Tue Sep 11 23:39:49 2007
@@ -18,7 +18,7 @@
 # To make changes edit the ./doc/Makefile.ad file in the source tree.
 
 # Source: ./doc/Makefile.ad
-# Generated: Wed Jul  4 08:15:31 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:51 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/doc/silcalgs.conf
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/doc/silcalgs.conf?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/doc/silcalgs.conf (original)
+++ silc-toolkit/branches/upstream/current/doc/silcalgs.conf Tue Sep 11 23:39:49 2007
@@ -13,45 +13,37 @@
 #
 # Configured ciphers
 #
-# The "name" is unique name to the cipher. The "module" option can be either
-# absolute or relative to the "module_path", and it defines where the cipher
-# module is found.  If omitted the built-in cipher is used.  The "keylength"
-# defines the length of the key (bytes), and the "blocklength" defines the
-# block size of the cipher (bytes).
+# The "name" is unique name to the cipher.  The "keylength" defines the
+# length of the key (bytes), and the "blocklength" defines the block size
+# of the cipher (bytes).
 #
 cipher {
 	name = "aes-256-cbc";
-	module = "aes.sim.so";
 	keylength = 32;
 	blocklength = 16;
 };
 cipher {
 	name = "aes-192-cbc";
-	module = "aes.sim.so";
 	keylength = 24;
 	blocklength = 16;
 };
 cipher {
 	name = "aes-128-cbc";
-	module = "aes.sim.so";
 	keylength = 16;
 	blocklength = 16;
 };
 cipher {
 	name = "twofish-256-cbc";
-	module = "twofish.sim.so";
 	keylength = 32;
 	blocklength = 16;
 };
 cipher {
 	name = "twofish-192-cbc";
-	module = "twofish.sim.so";
 	keylength = 24;
 	blocklength = 16;
 };
 cipher {
 	name = "twofish-128-cbc";
-	module = "twofish.sim.so";
 	keylength = 16;
 	blocklength = 16;
 };
@@ -59,7 +51,6 @@
 # "none" cipher should not be used
 #cipher {
 #	name = "none";
-#	module = "none.sim.so";
 #	keylength = 0;
 #	blocklength = 0;
 #};

Modified: silc-toolkit/branches/upstream/current/doc/toolkit/index.html
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/doc/toolkit/index.html?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/doc/toolkit/index.html (original)
+++ silc-toolkit/branches/upstream/current/doc/toolkit/index.html Tue Sep 11 23:39:49 2007
@@ -63,9 +63,9 @@
 <big><b>SILC Toolkit Reference Manual</b></big>
 <br />
 <small>
-Version: 1.1.2<br />
+Version: 1.1.3<br />
 Copyright &copy; 1997 - 2007 The SILC Project<br />
-Updated: Wed Jul  4 08:18:09 EEST 2007
+Updated: Sun Sep  9 18:01:29 EEST 2007
 </small>
 <br /><br /><br />
 Welcome to the SILC Toolkit Reference Manual.  The manual is a complete

Modified: silc-toolkit/branches/upstream/current/doc/toolkit/silcnet.html
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/doc/toolkit/silcnet.html?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/doc/toolkit/silcnet.html (original)
+++ silc-toolkit/branches/upstream/current/doc/toolkit/silcnet.html Tue Sep 11 23:39:49 2007
@@ -173,11 +173,6 @@
  Various utility functions for resolving various information is also
  provided.
 
- On WIN32 systems the SILC Net API must initialized by calling the
- silc_net_win32_init and uninitialized when the application ends by
- calling the silc_net_win32_uninit function. The initializing must be
- done in order to assure that the SILC Net API works correctly.
-
 </FONT></PRE><LI><A HREF="silcnet-SilcNetListener.html">SilcNetListener</A>
 <LI><A HREF="silcnet-SilcNetStatus.html">SilcNetStatus</A>
 <LI><A HREF="silcnet-SilcNetCallback.html">SilcNetCallback</A>

Modified: silc-toolkit/branches/upstream/current/includes/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/includes/Makefile.am?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/includes/Makefile.am (original)
+++ silc-toolkit/branches/upstream/current/includes/Makefile.am Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the ./includes/Makefile.ad file in the source tree.
 
 # Source: ./includes/Makefile.ad
-# Generated: Wed Jul  4 08:15:31 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:50 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/includes/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/includes/Makefile.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/includes/Makefile.in (original)
+++ silc-toolkit/branches/upstream/current/includes/Makefile.in Tue Sep 11 23:39:49 2007
@@ -18,7 +18,7 @@
 # To make changes edit the ./includes/Makefile.ad file in the source tree.
 
 # Source: ./includes/Makefile.ad
-# Generated: Wed Jul  4 08:15:31 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:50 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/includes/silcdistdefs.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/includes/silcdistdefs.h?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/includes/silcdistdefs.h (original)
+++ silc-toolkit/branches/upstream/current/includes/silcdistdefs.h Tue Sep 11 23:39:49 2007
@@ -1,7 +1,7 @@
 /*
   Automatically generated by Autodist 1.3.2.  Do not edit.
 
-  Generated: Wed Jul  4 08:15:31 EEST 2007 by priikone
+  Generated: Sun Sep  9 17:58:49 EEST 2007 by priikone
   Distribution: Toolkit
   License: distdir/TOOLKIT
 */

Modified: silc-toolkit/branches/upstream/current/includes/silcversion.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/includes/silcversion.h?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/includes/silcversion.h (original)
+++ silc-toolkit/branches/upstream/current/includes/silcversion.h Tue Sep 11 23:39:49 2007
@@ -26,12 +26,12 @@
 
 /* Version check macro.  Use this to check that package is of specific
    version compile time.  Use the __SILC_XXX_VERSION below in comparison. */
-#define SILC_VERSION(a, b, c) (((a) << 24) + ((b) << 16) + ((c) << 8)
-#define __SILC_TOOLKIT_VERSION SILC_VERSION(1,1,2)
+#define SILC_VERSION(a, b, c) (((a) << 24) + ((b) << 16) + ((c) << 8))
+#define __SILC_TOOLKIT_VERSION SILC_VERSION(1,1,3)
 
-#define SILC_VERSION_STRING "1.1.2"
-#define SILC_DIST_VERSION_STRING "1.1.2"
-#define SILC_PROTOCOL_VERSION_STRING "SILC-1.2-1.1.2 silc-toolkit"
+#define SILC_VERSION_STRING "1.1.3"
+#define SILC_DIST_VERSION_STRING "1.1.3"
+#define SILC_PROTOCOL_VERSION_STRING "SILC-1.2-1.1.3 silc-toolkit"
 #define SILC_NAME "SILC Toolkit"
 
 /* SILC Protocol version number */

Modified: silc-toolkit/branches/upstream/current/includes/silcversion.h.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/includes/silcversion.h.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/includes/silcversion.h.in (original)
+++ silc-toolkit/branches/upstream/current/includes/silcversion.h.in Tue Sep 11 23:39:49 2007
@@ -26,7 +26,7 @@
 
 /* Version check macro.  Use this to check that package is of specific
    version compile time.  Use the __SILC_XXX_VERSION below in comparison. */
-#define SILC_VERSION(a, b, c) (((a) << 24) + ((b) << 16) + ((c) << 8)
+#define SILC_VERSION(a, b, c) (((a) << 24) + ((b) << 16) + ((c) << 8))
 @__SILC_PACKAGE_VERSION@
 
 #define SILC_VERSION_STRING "@VERSION@"

Modified: silc-toolkit/branches/upstream/current/lib/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/Makefile.am?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/Makefile.am (original)
+++ silc-toolkit/branches/upstream/current/lib/Makefile.am Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the ./lib/Makefile.ad file in the source tree.
 
 # Source: ./lib/Makefile.ad
-# Generated: Wed Jul  4 08:15:31 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:51 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 
@@ -28,7 +28,11 @@
 # SILC Library dirs
 SILCLIB_DIRS =	contrib	silccore	silcutil	silcapputil	silccrypt	silcskr	silcmath	silcsim	silcasn1	silcske	silchttp	silcsftp	silcvcard
 if SILC_ENABLE_SHARED
+if SILC_WIN32
+LIBTOOL_OPTS= -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -export-dynamic -no-undefined
+else
 LIBTOOL_OPTS= -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir)
+endif
 LIBTOOL_SILC_VERSION = -version-info $(LIBSILC_CURRENT):$(LIBSILC_REVISION):$(LIBSILC_AGE)
 LIBTOOL_SILCCLIENT_VERSION = -version-info $(LIBSILCCLIENT_CURRENT):$(LIBSILCCLIENT_REVISION):$(LIBSILCCLIENT_AGE)
 LIBTOOL_SILCSERVER_VERSION = -version-info $(LIBSILCSERVER_CURRENT):$(LIBSILCSERVER_REVISION):$(LIBSILCSERVER_AGE)
@@ -37,6 +41,16 @@
 LIBTOOL_SILC_VERSION = 
 LIBTOOL_SILCCLIENT_VERSION = 
 LIBTOOL_SILCSERVER_VERSION = 
+endif
+
+if SILC_WIN32
+SILC_LIBS=$(LIBS)
+SILCCLIENT_LIBS=$(LIBS) -lsilc
+SILCSERVER_LIBS=$(LIBS) -lsilc
+else
+SILC_LIBS=
+SILCCLIENT_LIBS=
+SILCSERVER_LIBS=
 endif
 
 SILCLIB = libsilc.a
@@ -68,14 +82,14 @@
 LIBSILC_AGE=@LIBSILC_AGE@
 
 libsilc.a:
-	find $(SILCLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)	$(LIBTOOL_SILC_VERSION)	$(LIBTOOL_OPTS) -o libsilc.la
+	find $(SILCLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(SILC_LIBS)	$(LIBTOOL_SILC_VERSION)	$(LIBTOOL_OPTS) -o libsilc.la
 
 LIBSILCCLIENT_CURRENT=@LIBSILCCLIENT_CURRENT@
 LIBSILCCLIENT_REVISION=@LIBSILCCLIENT_REVISION@
 LIBSILCCLIENT_AGE=@LIBSILCCLIENT_AGE@
 
 libsilcclient.a:
-	find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)	$(LIBTOOL_SILCCLIENT_VERSION)	$(LIBTOOL_OPTS) -o libsilcclient.la
+	find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(SILCCLIENT_LIBS)	$(LIBTOOL_SILCCLIENT_VERSION)	$(LIBTOOL_OPTS) -o libsilcclient.la
 
 
 pkgconfigdir = $(libdir)/pkgconfig

Modified: silc-toolkit/branches/upstream/current/lib/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/Makefile.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/Makefile.in (original)
+++ silc-toolkit/branches/upstream/current/lib/Makefile.in Tue Sep 11 23:39:49 2007
@@ -18,7 +18,7 @@
 # To make changes edit the ./lib/Makefile.ad file in the source tree.
 
 # Source: ./lib/Makefile.ad
-# Generated: Wed Jul  4 08:15:31 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:51 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 
@@ -281,13 +281,20 @@
 # SILC Library dirs
 SILCLIB_DIRS = contrib	silccore	silcutil	silcapputil	silccrypt	silcskr	silcmath	silcsim	silcasn1	silcske	silchttp	silcsftp	silcvcard
 @SILC_ENABLE_SHARED_FALSE at LIBTOOL_OPTS = 
- at SILC_ENABLE_SHARED_TRUE@LIBTOOL_OPTS = -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir)
+ at SILC_ENABLE_SHARED_TRUE@@SILC_WIN32_FALSE at LIBTOOL_OPTS = -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir)
+ at SILC_ENABLE_SHARED_TRUE@@SILC_WIN32_TRUE at LIBTOOL_OPTS = -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -export-dynamic -no-undefined
 @SILC_ENABLE_SHARED_FALSE at LIBTOOL_SILC_VERSION = 
 @SILC_ENABLE_SHARED_TRUE at LIBTOOL_SILC_VERSION = -version-info $(LIBSILC_CURRENT):$(LIBSILC_REVISION):$(LIBSILC_AGE)
 @SILC_ENABLE_SHARED_FALSE at LIBTOOL_SILCCLIENT_VERSION = 
 @SILC_ENABLE_SHARED_TRUE at LIBTOOL_SILCCLIENT_VERSION = -version-info $(LIBSILCCLIENT_CURRENT):$(LIBSILCCLIENT_REVISION):$(LIBSILCCLIENT_AGE)
 @SILC_ENABLE_SHARED_FALSE at LIBTOOL_SILCSERVER_VERSION = 
 @SILC_ENABLE_SHARED_TRUE at LIBTOOL_SILCSERVER_VERSION = -version-info $(LIBSILCSERVER_CURRENT):$(LIBSILCSERVER_REVISION):$(LIBSILCSERVER_AGE)
+ at SILC_WIN32_FALSE@SILC_LIBS = 
+ at SILC_WIN32_TRUE@SILC_LIBS = $(LIBS)
+ at SILC_WIN32_FALSE@SILCCLIENT_LIBS = 
+ at SILC_WIN32_TRUE@SILCCLIENT_LIBS = $(LIBS) -lsilc
+ at SILC_WIN32_FALSE@SILCSERVER_LIBS = 
+ at SILC_WIN32_TRUE@SILCSERVER_LIBS = $(LIBS) -lsilc
 SILCLIB = libsilc.a
 
 # SILC Client Library dirs
@@ -668,10 +675,10 @@
 	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
 
 libsilc.a:
-	find $(SILCLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)	$(LIBTOOL_SILC_VERSION)	$(LIBTOOL_OPTS) -o libsilc.la
+	find $(SILCLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(SILC_LIBS)	$(LIBTOOL_SILC_VERSION)	$(LIBTOOL_OPTS) -o libsilc.la
 
 libsilcclient.a:
-	find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)	$(LIBTOOL_SILCCLIENT_VERSION)	$(LIBTOOL_OPTS) -o libsilcclient.la
+	find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(SILCCLIENT_LIBS)	$(LIBTOOL_SILCCLIENT_VERSION)	$(LIBTOOL_OPTS) -o libsilcclient.la
 toolkit-install:
 	-mkdir -p $(docdir)/toolkit/
 	-$(INSTALL_DATA) $(top_srcdir)/doc/toolkit/* $(docdir)/toolkit

Modified: silc-toolkit/branches/upstream/current/lib/contrib/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/contrib/Makefile.am?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/contrib/Makefile.am (original)
+++ silc-toolkit/branches/upstream/current/lib/contrib/Makefile.am Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the ./lib/contrib/Makefile.ad file in the source tree.
 
 # Source: ./lib/contrib/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 
@@ -35,11 +35,7 @@
 
 STRINGPREP = nfkc.c rfc3454.c stringprep.c
 
-if SILC_WIN32
-libcontrib_la_SOURCES = getopti.c $(STRINGPREP)
-else
 libcontrib_la_SOURCES = getopti.c $(STRINGPREP) $(REGEX)
-endif
 
 EXTRA_DIST = *.c *.h
 

Modified: silc-toolkit/branches/upstream/current/lib/contrib/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/contrib/Makefile.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/contrib/Makefile.in (original)
+++ silc-toolkit/branches/upstream/current/lib/contrib/Makefile.in Tue Sep 11 23:39:49 2007
@@ -18,7 +18,7 @@
 # To make changes edit the ./lib/contrib/Makefile.ad file in the source tree.
 
 # Source: ./lib/contrib/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 
@@ -111,10 +111,8 @@
 	stringprep.c regexpr.c
 am__objects_1 = nfkc.lo rfc3454.lo stringprep.lo
 @HAVE_REGEX_FALSE at am__objects_2 = regexpr.lo
- at SILC_WIN32_FALSE@am_libcontrib_la_OBJECTS = getopti.lo \
- at SILC_WIN32_FALSE@	$(am__objects_1) $(am__objects_2)
- at SILC_WIN32_TRUE@am_libcontrib_la_OBJECTS = getopti.lo \
- at SILC_WIN32_TRUE@	$(am__objects_1)
+am_libcontrib_la_OBJECTS = getopti.lo $(am__objects_1) \
+	$(am__objects_2)
 libcontrib_la_OBJECTS = $(am_libcontrib_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp =
@@ -282,8 +280,7 @@
 @HAVE_REGEX_FALSE at REGEX = regexpr.c
 @HAVE_REGEX_TRUE at REGEX = 
 STRINGPREP = nfkc.c rfc3454.c stringprep.c
- at SILC_WIN32_FALSE@libcontrib_la_SOURCES = getopti.c $(STRINGPREP) $(REGEX)
- at SILC_WIN32_TRUE@libcontrib_la_SOURCES = getopti.c $(STRINGPREP)
+libcontrib_la_SOURCES = getopti.c $(STRINGPREP) $(REGEX)
 EXTRA_DIST = *.c *.h
 
 #

Modified: silc-toolkit/branches/upstream/current/lib/silcapputil/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcapputil/Makefile.am?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcapputil/Makefile.am (original)
+++ silc-toolkit/branches/upstream/current/lib/silcapputil/Makefile.am Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the ./lib/silcapputil/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcapputil/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcapputil/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcapputil/Makefile.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcapputil/Makefile.in (original)
+++ silc-toolkit/branches/upstream/current/lib/silcapputil/Makefile.in Tue Sep 11 23:39:49 2007
@@ -18,7 +18,7 @@
 # To make changes edit the ./lib/silcapputil/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcapputil/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcasn1/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcasn1/Makefile.am?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcasn1/Makefile.am (original)
+++ silc-toolkit/branches/upstream/current/lib/silcasn1/Makefile.am Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the ./lib/silcasn1/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcasn1/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:51 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcasn1/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcasn1/Makefile.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcasn1/Makefile.in (original)
+++ silc-toolkit/branches/upstream/current/lib/silcasn1/Makefile.in Tue Sep 11 23:39:49 2007
@@ -18,7 +18,7 @@
 # To make changes edit the ./lib/silcasn1/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcasn1/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:51 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcclient/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcclient/Makefile.am?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcclient/Makefile.am (original)
+++ silc-toolkit/branches/upstream/current/lib/silcclient/Makefile.am Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the ./lib/silcclient/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcclient/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcclient/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcclient/Makefile.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcclient/Makefile.in (original)
+++ silc-toolkit/branches/upstream/current/lib/silcclient/Makefile.in Tue Sep 11 23:39:49 2007
@@ -18,7 +18,7 @@
 # To make changes edit the ./lib/silcclient/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcclient/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcclient/client_notify.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcclient/client_notify.c?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcclient/client_notify.c (original)
+++ silc-toolkit/branches/upstream/current/lib/silcclient/client_notify.c Tue Sep 11 23:39:49 2007
@@ -16,7 +16,7 @@
   information.
 
 */
-/* $Id: client_notify.c,v 1.93.2.1 2007/07/02 13:34:02 priikone Exp $ */
+/* $Id: client_notify.c,v 1.93.2.2 2007/09/01 08:52:01 priikone Exp $ */
 
 #include "silc.h"
 #include "silcclient.h"
@@ -56,9 +56,14 @@
   /* If entry is still invalid, resolving failed.  Finish notify processing. */
   if (notify->client_entry && !notify->client_entry->internal.valid) {
     /* If resolving timedout try it again many times. */
-    if (status != SILC_STATUS_ERR_TIMEDOUT || ++notify->resolve_retry > 1000)
+    if (status != SILC_STATUS_ERR_TIMEDOUT || ++notify->resolve_retry > 1000) {
       silc_fsm_next(notify->fsm, silc_client_notify_processed);
-    silc_client_unref_client(client, conn, notify->client_entry);
+
+      /* Unref client only in case of non-timeout error.  In case of timeout
+	 occurred, the routine reprocessing the notify is expected not to
+	 create new references of the entry. */
+      silc_client_unref_client(client, conn, notify->client_entry);
+    }
   }
 
   /* If no entries found, just finish the notify processing */

Modified: silc-toolkit/branches/upstream/current/lib/silcclient/command_reply.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcclient/command_reply.c?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcclient/command_reply.c (original)
+++ silc-toolkit/branches/upstream/current/lib/silcclient/command_reply.c Tue Sep 11 23:39:49 2007
@@ -16,7 +16,7 @@
   information.
 
 */
-/* $Id: command_reply.c,v 1.149.2.3 2007/06/18 21:05:02 priikone Exp $ */
+/* $Id: command_reply.c,v 1.149.2.5 2007/09/01 08:52:01 priikone Exp $ */
 
 #include "silc.h"
 #include "silcclient.h"
@@ -1851,8 +1851,8 @@
   SilcCommandPayload payload = state_context;
   SilcArgumentPayload args = silc_command_get_args(payload);
   unsigned char *tmp;
-  SilcUInt32 tmp_len, list_count;
-  SilcUInt16 idp_len, mode;
+  SilcUInt32 tmp_len, list_count, mode;
+  SilcUInt16 idp_len;
   SilcHashTableList htl;
   SilcBufferStruct client_id_list, client_mode_list;
   SilcChannelEntry channel = NULL;
@@ -1997,6 +1997,8 @@
     goto out;
   }
   if (!silc_public_key_payload_decode(tmp, len, &public_key)) {
+    SAY(client, conn, SILC_CLIENT_MESSAGE_COMMAND_ERROR,
+        "Cannot decode public key: malformed/unsupported public key");
     ERROR_CALLBACK(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS);
     goto out;
   }

Modified: silc-toolkit/branches/upstream/current/lib/silccore/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silccore/Makefile.am?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silccore/Makefile.am (original)
+++ silc-toolkit/branches/upstream/current/lib/silccore/Makefile.am Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the ./lib/silccore/Makefile.ad file in the source tree.
 
 # Source: ./lib/silccore/Makefile.ad
-# Generated: Wed Jul  4 08:15:31 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:51 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silccore/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silccore/Makefile.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silccore/Makefile.in (original)
+++ silc-toolkit/branches/upstream/current/lib/silccore/Makefile.in Tue Sep 11 23:39:49 2007
@@ -18,7 +18,7 @@
 # To make changes edit the ./lib/silccore/Makefile.ad file in the source tree.
 
 # Source: ./lib/silccore/Makefile.ad
-# Generated: Wed Jul  4 08:15:31 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:51 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silccrypt/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silccrypt/Makefile.am?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silccrypt/Makefile.am (original)
+++ silc-toolkit/branches/upstream/current/lib/silccrypt/Makefile.am Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the ./lib/silccrypt/Makefile.ad file in the source tree.
 
 # Source: ./lib/silccrypt/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silccrypt/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silccrypt/Makefile.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silccrypt/Makefile.in (original)
+++ silc-toolkit/branches/upstream/current/lib/silccrypt/Makefile.in Tue Sep 11 23:39:49 2007
@@ -18,7 +18,7 @@
 # To make changes edit the ./lib/silccrypt/Makefile.ad file in the source tree.
 
 # Source: ./lib/silccrypt/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silccrypt/aes.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silccrypt/aes.c?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silccrypt/aes.c (original)
+++ silc-toolkit/branches/upstream/current/lib/silccrypt/aes.c Tue Sep 11 23:39:49 2007
@@ -74,17 +74,35 @@
 SILC_CIPHER_API_ENCRYPT(aes_cbc)
 {
   int nb = len >> 4;
+  SilcUInt32 tmp[4], tmp2[4];
 
   SILC_ASSERT((len & (16 - 1)) == 0);
   if (len & (16 - 1))
     return FALSE;
 
   while(nb--) {
-    lp32(iv)[0] ^= lp32(src)[0];
-    lp32(iv)[1] ^= lp32(src)[1];
-    lp32(iv)[2] ^= lp32(src)[2];
-    lp32(iv)[3] ^= lp32(src)[3];
+    SILC_GET32_MSB(tmp[0], &iv[0]);
+    SILC_GET32_MSB(tmp[1], &iv[4]);
+    SILC_GET32_MSB(tmp[2], &iv[8]);
+    SILC_GET32_MSB(tmp[3], &iv[12]);
+
+    SILC_GET32_MSB(tmp2[0], &src[0]);
+    SILC_GET32_MSB(tmp2[1], &src[4]);
+    SILC_GET32_MSB(tmp2[2], &src[8]);
+    SILC_GET32_MSB(tmp2[3], &src[12]);
+
+    tmp[0] = tmp[0] ^ tmp2[0];
+    tmp[1] = tmp[1] ^ tmp2[1];
+    tmp[2] = tmp[2] ^ tmp2[2];
+    tmp[3] = tmp[3] ^ tmp2[3];
+
+    SILC_PUT32_MSB(tmp[0], &iv[0]);
+    SILC_PUT32_MSB(tmp[1], &iv[4]);
+    SILC_PUT32_MSB(tmp[2], &iv[8]);
+    SILC_PUT32_MSB(tmp[3], &iv[12]);
+
     aes_encrypt(iv, iv, &((AesContext *)context)->u.enc);
+
     memcpy(dst, iv, 16);
     src += 16;
     dst += 16;
@@ -100,6 +118,7 @@
 {
   unsigned char tmp[16];
   int nb = len >> 4;
+  SilcUInt32 tmp2[4], tmp3[4];
 
   if (len & (16 - 1))
     return FALSE;
@@ -107,10 +126,27 @@
   while(nb--) {
     memcpy(tmp, src, 16);
     aes_decrypt(src, dst, &((AesContext *)context)->u.dec);
-    lp32(dst)[0] ^= lp32(iv)[0];
-    lp32(dst)[1] ^= lp32(iv)[1];
-    lp32(dst)[2] ^= lp32(iv)[2];
-    lp32(dst)[3] ^= lp32(iv)[3];
+
+    SILC_GET32_MSB(tmp2[0], &iv[0]);
+    SILC_GET32_MSB(tmp2[1], &iv[4]);
+    SILC_GET32_MSB(tmp2[2], &iv[8]);
+    SILC_GET32_MSB(tmp2[3], &iv[12]);
+
+    SILC_GET32_MSB(tmp3[0], &dst[0]);
+    SILC_GET32_MSB(tmp3[1], &dst[4]);
+    SILC_GET32_MSB(tmp3[2], &dst[8]);
+    SILC_GET32_MSB(tmp3[3], &dst[12]);
+
+    tmp2[0] = tmp3[0] ^ tmp2[0];
+    tmp2[1] = tmp3[1] ^ tmp2[1];
+    tmp2[2] = tmp3[2] ^ tmp2[2];
+    tmp2[3] = tmp3[3] ^ tmp2[3];
+
+    SILC_PUT32_MSB(tmp2[0], &dst[0]);
+    SILC_PUT32_MSB(tmp2[1], &dst[4]);
+    SILC_PUT32_MSB(tmp2[2], &dst[8]);
+    SILC_PUT32_MSB(tmp2[3], &dst[12]);
+
     memcpy(iv, tmp, 16);
     src += 16;
     dst += 16;

Modified: silc-toolkit/branches/upstream/current/lib/silccrypt/silcpk.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silccrypt/silcpk.c?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silccrypt/silcpk.c (original)
+++ silc-toolkit/branches/upstream/current/lib/silccrypt/silcpk.c Tue Sep 11 23:39:49 2007
@@ -124,7 +124,7 @@
   int len;
 
   /* Protocol says that at least UN and HN must be provided as identifier */
-  if (!strstr(identifier, "UN=") && !strstr(identifier, "HN=")) {
+  if (!strstr(identifier, "UN=") || !strstr(identifier, "HN=")) {
     SILC_LOG_DEBUG(("The public does not have the required UN= and HN= "
 		    "identifiers"));
     return FALSE;
@@ -206,7 +206,7 @@
 
   if (!username || !host)
     return NULL;
-  if (strlen(username) < 3 || strlen(host) < 3)
+  if (strlen(username) < 1 || strlen(host) < 1)
     return NULL;
 
   memset(&buf, 0, sizeof(buf));

Added: silc-toolkit/branches/upstream/current/lib/silccrypt/tests/core.27282
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silccrypt/tests/core.27282?rev=164&op=file
==============================================================================
Binary file - no diff available.

Propchange: silc-toolkit/branches/upstream/current/lib/silccrypt/tests/core.27282
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: silc-toolkit/branches/upstream/current/lib/silccrypt/tests/test_sha256
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silccrypt/tests/test_sha256?rev=164&op=file
==============================================================================
Binary file - no diff available.

Propchange: silc-toolkit/branches/upstream/current/lib/silccrypt/tests/test_sha256
------------------------------------------------------------------------------
    svn:executable = *

Propchange: silc-toolkit/branches/upstream/current/lib/silccrypt/tests/test_sha256
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: silc-toolkit/branches/upstream/current/lib/silchttp/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silchttp/Makefile.am?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silchttp/Makefile.am (original)
+++ silc-toolkit/branches/upstream/current/lib/silchttp/Makefile.am Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the ./lib/silchttp/Makefile.ad file in the source tree.
 
 # Source: ./lib/silchttp/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silchttp/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silchttp/Makefile.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silchttp/Makefile.in (original)
+++ silc-toolkit/branches/upstream/current/lib/silchttp/Makefile.in Tue Sep 11 23:39:49 2007
@@ -18,7 +18,7 @@
 # To make changes edit the ./lib/silchttp/Makefile.ad file in the source tree.
 
 # Source: ./lib/silchttp/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcmath/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcmath/Makefile.am?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcmath/Makefile.am (original)
+++ silc-toolkit/branches/upstream/current/lib/silcmath/Makefile.am Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the ./lib/silcmath/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcmath/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcmath/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcmath/Makefile.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcmath/Makefile.in (original)
+++ silc-toolkit/branches/upstream/current/lib/silcmath/Makefile.in Tue Sep 11 23:39:49 2007
@@ -18,7 +18,7 @@
 # To make changes edit the ./lib/silcmath/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcmath/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcsftp/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcsftp/Makefile.am?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcsftp/Makefile.am (original)
+++ silc-toolkit/branches/upstream/current/lib/silcsftp/Makefile.am Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the ./lib/silcsftp/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcsftp/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcsftp/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcsftp/Makefile.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcsftp/Makefile.in (original)
+++ silc-toolkit/branches/upstream/current/lib/silcsftp/Makefile.in Tue Sep 11 23:39:49 2007
@@ -18,7 +18,7 @@
 # To make changes edit the ./lib/silcsftp/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcsftp/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcsim/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcsim/Makefile.am?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcsim/Makefile.am (original)
+++ silc-toolkit/branches/upstream/current/lib/silcsim/Makefile.am Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the ./lib/silcsim/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcsim/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcsim/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcsim/Makefile.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcsim/Makefile.in (original)
+++ silc-toolkit/branches/upstream/current/lib/silcsim/Makefile.in Tue Sep 11 23:39:49 2007
@@ -18,7 +18,7 @@
 # To make changes edit the ./lib/silcsim/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcsim/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcske/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcske/Makefile.am?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcske/Makefile.am (original)
+++ silc-toolkit/branches/upstream/current/lib/silcske/Makefile.am Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the ./lib/silcske/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcske/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcske/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcske/Makefile.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcske/Makefile.in (original)
+++ silc-toolkit/branches/upstream/current/lib/silcske/Makefile.in Tue Sep 11 23:39:49 2007
@@ -18,7 +18,7 @@
 # To make changes edit the ./lib/silcske/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcske/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcskr/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcskr/Makefile.am?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcskr/Makefile.am (original)
+++ silc-toolkit/branches/upstream/current/lib/silcskr/Makefile.am Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the ./lib/silcskr/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcskr/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:51 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcskr/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcskr/Makefile.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcskr/Makefile.in (original)
+++ silc-toolkit/branches/upstream/current/lib/silcskr/Makefile.in Tue Sep 11 23:39:49 2007
@@ -18,7 +18,7 @@
 # To make changes edit the ./lib/silcskr/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcskr/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:51 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcutil/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcutil/Makefile.am?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcutil/Makefile.am (original)
+++ silc-toolkit/branches/upstream/current/lib/silcutil/Makefile.am Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the ./lib/silcutil/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcutil/Makefile.ad
-# Generated: Wed Jul  4 08:15:31 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:51 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcutil/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcutil/Makefile.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcutil/Makefile.in (original)
+++ silc-toolkit/branches/upstream/current/lib/silcutil/Makefile.in Tue Sep 11 23:39:49 2007
@@ -18,7 +18,7 @@
 # To make changes edit the ./lib/silcutil/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcutil/Makefile.ad
-# Generated: Wed Jul  4 08:15:31 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:51 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcutil/silcatomic.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcutil/silcatomic.h?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcutil/silcatomic.h (original)
+++ silc-toolkit/branches/upstream/current/lib/silcutil/silcatomic.h Tue Sep 11 23:39:49 2007
@@ -753,7 +753,7 @@
 SILC_ATOMIC_ADD_INT_F(bits)						\
 {									\
   SilcUInt##bits ret;							\
-  SilcInt32 val = value;
+  SilcInt32 val = value;						\
   /* GCC + IA64 (GCC builtin atomic operations) */			\
   ret = __sync_fetch_and_add(&atomic->value, val);			\
   return ret + value;							\
@@ -1230,7 +1230,7 @@
 
 #elif defined(__GNUC__) && defined(SILC_IA64)
   /* GCC + IA64 (GCC builtin atomic operations) */
-  return  __sync_bool_compare_and_swap((long)&atomic->value, (long)old_val,
+  return  __sync_bool_compare_and_swap((long *)&atomic->value, (long)old_val,
 				       (long)new_val);
 
 #elif defined(__GNUC__) && defined(SILC_POWERPC)

Modified: silc-toolkit/branches/upstream/current/lib/silcutil/silcconfig.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcutil/silcconfig.c?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcutil/silcconfig.c (original)
+++ silc-toolkit/branches/upstream/current/lib/silcutil/silcconfig.c Tue Sep 11 23:39:49 2007
@@ -16,7 +16,7 @@
   information.
 
 */
-/* $Id: silcconfig.c,v 1.24 2006/12/31 15:33:57 priikone Exp $ */
+/* $Id: silcconfig.c,v 1.24.2.1 2007/09/09 15:04:15 priikone Exp $ */
 
 #include "silc.h"
 
@@ -26,6 +26,8 @@
 #else
 #define SILC_CONFIG_DEBUG(fmt)
 #endif
+
+#define BUF_SIZE 255
 
 /* this is the option struct and currently it is only used internally to
  * the module and other structs. */
@@ -112,11 +114,14 @@
  * a separator is any non alphanumeric character nor "_" or "-" */
 static char *my_next_token(SilcConfigFile *file, char *to)
 {
+  unsigned int count = 0;
   register char *o;
   my_trim_spaces(file);
   o = file->p;
-  while (isalnum((int)*o) || (*o == '_') || (*o == '-'))
+  while ((isalnum((int)*o) || (*o == '_') || (*o == '-')) && count < BUF_SIZE) {
+    count++;
     *to++ = *o++;
+  }
   *to = '\0';
   file->p = o;
   return to;
@@ -130,24 +135,30 @@
   my_trim_spaces(file);
   o = file->p;
   if (*o == '"') {
-    char *quot = strchr(++o, '"');
-    int len = quot - o;
-    if (!quot) { /* XXX FIXME: gotta do something here */
-      printf("Bullshit, missing matching \"");
+    unsigned int count = 0;
+    char *d = to;
+    while (count < BUF_SIZE) {
+      o++;
+      if (*o == '"') {
+          break;
+      }
+      if (*o == '\\') {
+          o++;
+      }
+      count++;
+      *d++ = *o;
+    }
+    if (count >= BUF_SIZE) { /* XXX FIXME: gotta do something here */
+      fprintf(stderr, "Bullshit, missing matching \"");
       exit(1);
     }
-    if (len <= 0)
-      *to = '\0';
-    else {
-      strncpy(to, o, len);
-      to[len] = '\0';
-    }
+    *d = '\0';
     /* update stream pointer */
-    file->p = quot + 1;
-    return to;
-  }
-  /* we don't need quote parsing, fall-back to token extractor */
-  my_next_token(file, to);
+    file->p = o + 1;
+  } else {
+    /* we don't need quote parsing, fall-back to token extractor */
+    my_next_token(file, to);
+  }
   return to;
 }
 
@@ -454,7 +465,7 @@
 
   /* loop throught statements */
   while (1) {
-    char buf[255];
+    char buf[BUF_SIZE];
     SilcConfigOption *thisopt;
 
     /* makes it pointing to the next interesting char */

Modified: silc-toolkit/branches/upstream/current/lib/silcutil/silcnet.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcutil/silcnet.h?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcutil/silcnet.h (original)
+++ silc-toolkit/branches/upstream/current/lib/silcutil/silcnet.h Tue Sep 11 23:39:49 2007
@@ -25,11 +25,6 @@
  * can be used to create TCP/IP and UDP/IP connections and listeners.
  * Various utility functions for resolving various information is also
  * provided.
- *
- * On WIN32 systems the SILC Net API must initialized by calling the
- * silc_net_win32_init and uninitialized when the application ends by
- * calling the silc_net_win32_uninit function. The initializing must be
- * done in order to assure that the SILC Net API works correctly.
  *
  ***/
 

Modified: silc-toolkit/branches/upstream/current/lib/silcutil/silcschedule.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcutil/silcschedule.c?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcutil/silcschedule.c (original)
+++ silc-toolkit/branches/upstream/current/lib/silcutil/silcschedule.c Tue Sep 11 23:39:49 2007
@@ -16,7 +16,7 @@
   information.
 
 */
-/* $Id: silcschedule.c,v 1.74.2.1 2007/06/06 14:32:17 priikone Exp $ */
+/* $Id: silcschedule.c,v 1.74.2.2 2007/08/07 18:15:19 priikone Exp $ */
 
 #include "silc.h"
 
@@ -201,12 +201,12 @@
   if (silc_unlikely(task == SILC_ALL_TASKS)) {
     SilcTask task;
     SilcHashTableList htl;
-    SilcUInt32 fd;
+    void *fd;
 
     /* Delete from fd queue */
     silc_hash_table_list(schedule->fd_queue, &htl);
-    while (silc_hash_table_get(&htl, (void *)&fd, (void *)&task))
-      silc_hash_table_del(schedule->fd_queue, SILC_32_TO_PTR(fd));
+    while (silc_hash_table_get(&htl, &fd, (void *)&task))
+      silc_hash_table_del(schedule->fd_queue, fd);
     silc_hash_table_list_reset(&htl);
 
     /* Delete from timeout queue */

Modified: silc-toolkit/branches/upstream/current/lib/silcutil/unix/silcunixschedule.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcutil/unix/silcunixschedule.c?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcutil/unix/silcunixschedule.c (original)
+++ silc-toolkit/branches/upstream/current/lib/silcutil/unix/silcunixschedule.c Tue Sep 11 23:39:49 2007
@@ -16,7 +16,7 @@
   information.
 
 */
-/* $Id: silcunixschedule.c,v 1.28.2.4 2007/06/24 14:12:26 priikone Exp $ */
+/* $Id: silcunixschedule.c,v 1.28.2.5 2007/08/07 18:15:19 priikone Exp $ */
 
 #include "silc.h"
 
@@ -121,11 +121,13 @@
   struct pollfd *fds = internal->fds;
   SilcUInt32 fds_count = internal->fds_count;
   int fd, ret, i = 0, timeout = -1;
+  void *fdp;
 
   silc_hash_table_list(schedule->fd_queue, &htl);
-  while (silc_hash_table_get(&htl, (void *)&fd, (void *)&task)) {
+  while (silc_hash_table_get(&htl, &fdp, (void *)&task)) {
     if (!task->events)
       continue;
+    fd = SILC_PTR_TO_32(fdp);
 
     /* Allocate larger fd table if needed */
     if (i >= fds_count) {
@@ -198,14 +200,16 @@
   SilcTaskFd task;
   fd_set in, out;
   int fd, max_fd = 0, ret;
+  void *fdp;
 
   FD_ZERO(&in);
   FD_ZERO(&out);
 
   silc_hash_table_list(schedule->fd_queue, &htl);
-  while (silc_hash_table_get(&htl, (void *)&fd, (void *)&task)) {
+  while (silc_hash_table_get(&htl, &fdp, (void *)&task)) {
     if (!task->events)
       continue;
+    fd = SILC_PTR_TO_32(fdp);
 
 #ifdef FD_SETSIZE
     if (fd >= FD_SETSIZE)
@@ -233,9 +237,10 @@
     return ret;
 
   silc_hash_table_list(schedule->fd_queue, &htl);
-  while (silc_hash_table_get(&htl, (void *)&fd, (void *)&task)) {
+  while (silc_hash_table_get(&htl, &fdp, (void *)&task)) {
     if (!task->header.valid || !task->events)
       continue;
+    fd = SILC_PTR_TO_32(fdp);
 
 #ifdef FD_SETSIZE
     if (fd >= FD_SETSIZE)

Modified: silc-toolkit/branches/upstream/current/lib/silcvcard/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcvcard/Makefile.am?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcvcard/Makefile.am (original)
+++ silc-toolkit/branches/upstream/current/lib/silcvcard/Makefile.am Tue Sep 11 23:39:49 2007
@@ -2,7 +2,7 @@
 # To make changes edit the ./lib/silcvcard/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcvcard/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/lib/silcvcard/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/lib/silcvcard/Makefile.in?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/lib/silcvcard/Makefile.in (original)
+++ silc-toolkit/branches/upstream/current/lib/silcvcard/Makefile.in Tue Sep 11 23:39:49 2007
@@ -18,7 +18,7 @@
 # To make changes edit the ./lib/silcvcard/Makefile.ad file in the source tree.
 
 # Source: ./lib/silcvcard/Makefile.ad
-# Generated: Wed Jul  4 08:15:32 EEST 2007 by priikone
+# Generated: Sun Sep  9 17:58:52 EEST 2007 by priikone
 # Distribution: Toolkit
 # License: distdir/TOOLKIT
 

Modified: silc-toolkit/branches/upstream/current/silc-toolkit.spec
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/branches/upstream/current/silc-toolkit.spec?rev=164&op=diff
==============================================================================
--- silc-toolkit/branches/upstream/current/silc-toolkit.spec (original)
+++ silc-toolkit/branches/upstream/current/silc-toolkit.spec Tue Sep 11 23:39:49 2007
@@ -1,6 +1,6 @@
 Summary: SILC Toolkit
 Name: silc-toolkit
-Version: 1.1.2
+Version: 1.1.3
 Release: 0.fc7
 License: GPL/BSD dual licensed
 Group: System Environment/Libraries

More information about the Pkg-silc-commits mailing list