[Pkg-silc-commits] r194 - in /silc-client/branches/upstream/current: ./ apps/ apps/irssi/ apps/irssi/src/fe-common/silc/ doc/ includes/ lib/ lib/contrib/ lib/silcapputil/ lib/silcasn1/ lib/silcclient/ lib/silccore/ lib/silccrypt/ lib/silcmath/ lib/silcsftp/ lib/silcske/ lib/silcskr/ lib/silcutil/ lib/silcutil/unix/ lib/silcutil/win32/ lib/silcvcard/
micah at users.alioth.debian.org
micah at users.alioth.debian.org
Sat Nov 24 19:48:38 UTC 2007
Author: micah
Date: Sat Nov 24 19:48:38 2007
New Revision: 194
URL: http://svn.debian.org/wsvn/pkg-silc/?sc=1&rev=194
Log:
[svn-upgrade] Integrating new upstream version, silc-client (1.1.3)
Modified:
silc-client/branches/upstream/current/CHANGES
silc-client/branches/upstream/current/Makefile.am
silc-client/branches/upstream/current/Makefile.in
silc-client/branches/upstream/current/TODO
silc-client/branches/upstream/current/apps/Makefile.am
silc-client/branches/upstream/current/apps/Makefile.in
silc-client/branches/upstream/current/apps/irssi/irssi-version.h.in
silc-client/branches/upstream/current/apps/irssi/silc-client.spec
silc-client/branches/upstream/current/apps/irssi/src/fe-common/silc/module-formats.c
silc-client/branches/upstream/current/configure
silc-client/branches/upstream/current/configure.ac
silc-client/branches/upstream/current/doc/Makefile.am
silc-client/branches/upstream/current/doc/Makefile.in
silc-client/branches/upstream/current/includes/Makefile.am
silc-client/branches/upstream/current/includes/Makefile.in
silc-client/branches/upstream/current/includes/silc.h
silc-client/branches/upstream/current/includes/silc.h.in
silc-client/branches/upstream/current/includes/silcdistdefs.h
silc-client/branches/upstream/current/includes/silcversion.h.in
silc-client/branches/upstream/current/lib/Makefile.am
silc-client/branches/upstream/current/lib/Makefile.in
silc-client/branches/upstream/current/lib/contrib/Makefile.am
silc-client/branches/upstream/current/lib/contrib/Makefile.in
silc-client/branches/upstream/current/lib/silcapputil/Makefile.am
silc-client/branches/upstream/current/lib/silcapputil/Makefile.in
silc-client/branches/upstream/current/lib/silcasn1/Makefile.am
silc-client/branches/upstream/current/lib/silcasn1/Makefile.in
silc-client/branches/upstream/current/lib/silcclient/Makefile.am
silc-client/branches/upstream/current/lib/silcclient/Makefile.in
silc-client/branches/upstream/current/lib/silcclient/client_entry.c
silc-client/branches/upstream/current/lib/silcclient/client_entry.h
silc-client/branches/upstream/current/lib/silcclient/client_keyagr.c
silc-client/branches/upstream/current/lib/silcclient/client_notify.c
silc-client/branches/upstream/current/lib/silcclient/command_reply.c
silc-client/branches/upstream/current/lib/silccore/Makefile.am
silc-client/branches/upstream/current/lib/silccore/Makefile.in
silc-client/branches/upstream/current/lib/silccore/silcattrs.c
silc-client/branches/upstream/current/lib/silccore/silcpacket.c
silc-client/branches/upstream/current/lib/silccore/silcpacket.h
silc-client/branches/upstream/current/lib/silccrypt/Makefile.am
silc-client/branches/upstream/current/lib/silccrypt/Makefile.in
silc-client/branches/upstream/current/lib/silccrypt/aes.c
silc-client/branches/upstream/current/lib/silccrypt/silcpk.c
silc-client/branches/upstream/current/lib/silcmath/Makefile.am
silc-client/branches/upstream/current/lib/silcmath/Makefile.in
silc-client/branches/upstream/current/lib/silcsftp/Makefile.am
silc-client/branches/upstream/current/lib/silcsftp/Makefile.in
silc-client/branches/upstream/current/lib/silcske/Makefile.am
silc-client/branches/upstream/current/lib/silcske/Makefile.in
silc-client/branches/upstream/current/lib/silcske/silcske.c
silc-client/branches/upstream/current/lib/silcskr/Makefile.am
silc-client/branches/upstream/current/lib/silcskr/Makefile.in
silc-client/branches/upstream/current/lib/silcutil/Makefile.am
silc-client/branches/upstream/current/lib/silcutil/Makefile.in
silc-client/branches/upstream/current/lib/silcutil/silcatomic.h
silc-client/branches/upstream/current/lib/silcutil/silcconfig.c
silc-client/branches/upstream/current/lib/silcutil/silcnet.h
silc-client/branches/upstream/current/lib/silcutil/silcschedule.c
silc-client/branches/upstream/current/lib/silcutil/unix/silcunixnet.c
silc-client/branches/upstream/current/lib/silcutil/unix/silcunixschedule.c
silc-client/branches/upstream/current/lib/silcutil/win32/silcwin32schedule.c
silc-client/branches/upstream/current/lib/silcvcard/Makefile.am
silc-client/branches/upstream/current/lib/silcvcard/Makefile.in
Modified: silc-client/branches/upstream/current/CHANGES
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/CHANGES?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/CHANGES (original)
+++ silc-client/branches/upstream/current/CHANGES Sat Nov 24 19:48:38 2007
@@ -1,4 +1,89 @@
+Tue Nov 6 16:39:20 EET 2007 Pekka Riikonen <priikone at silcnet.org>
+
+ * SILC Client 1.1.3.
+
+Mon Nov 5 23:07:58 EET 2007 Pekka Riikonen <priikone at silcnet.org>
+
+ * Zero tail of CTR mode IV in IV Included mode. Change does
+ not cause compatibility issues. Affected file is
+ lib/silcske/silcske.c.
+
+Mon Nov 5 22:24:25 EET 2007 Pekka Riikonen <priikone at silcnet.org>
+
+ * SILC Toolkit 1.1.4.
+
+ * Fixed CTR mode rekey. Affected file is lib/silcske/silcske.c.
+
+ * Rewrote the IV Included CTR mode encryption/decryption in
+ packet engine. Affected file is lib/silccore/silcpacket.c.
+
+Sun Nov 4 15:20:25 EET 2007 Pekka Riikonen <priikone at silcnet.org>
+
+ * Removed module_path and module options from the server
+ config file format. Affected file is apps/silcd/serverconfig.c.
+
+ * Fixed non-IPv6 compilation error. Affected file is
+ lib/silcutil/unix/silcunixnet.c.
+
+Sat Nov 3 23:23:38 EET 2007 Pekka Riikonen <priikone at silcnet.org>
+
+ * Do not free packet engine before uninitializing scheduler.
+ Do not disconnct already disconnected streams. Affected
+ files are in apps/silcd/.
+
+ * Fixed setting correct ID for re-encrypted channel messages
+ in router-to-router connections. Affected file is
+ apps/silcd/packet_send.c.
+
+Sun Sep 30 15:16:18 EEST 2007 Pekka Riikonen <priikone at silcnet.org>
+
+ * Fixed channel private key deleting when deleting the channel.
+ Affected file is lib/silcclient/client_channel.c.
+
+Sun Sep 9 17:52:49 EEST 2007 Pekka Riikonen <priikone at silcnet.org>
+
+ * SILC Toolkit 1.1.3.
+
+ * 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.
* SILC Client 1.1.2.
Modified: silc-client/branches/upstream/current/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/Makefile.am?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/Makefile.am (original)
+++ silc-client/branches/upstream/current/Makefile.am Sat Nov 24 19:48:38 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:07:38 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/Makefile.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/Makefile.in (original)
+++ silc-client/branches/upstream/current/Makefile.in Sat Nov 24 19:48:38 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:07:38 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/TODO
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/TODO?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/TODO (original)
+++ silc-client/branches/upstream/current/TODO Sat Nov 24 19:48:38 2007
@@ -9,38 +9,32 @@
apps/silcd, The SILC Server ****PARTLY DONE****
===========================
- o Port all code to use SILC Toolkit 1.1 APIs.
-
- o Dynamic connection support for INFO and MOTD commands.
-
- o Dynamic connection support for JOIN command. Accept channel name
- strings of format channel at server.
-
- o Fix/test GETKEY.
-
- o Fix/test MOTD.
+ o Fix/test GETKEY. (***DONE)
+
+ o Fix/test MOTD. (***DONE)
+
+ o Rewrite rehash, HUP.
+
+ o Heartbeat-keepalive.
+
+ o Port all code to use SILC Toolkit 1.1 APIs. (***DONE)
o Remove protocol.[ch]. (***DONE)
- o Rewrite connecting accepting. (***TESTING NEEDED)
-
- o Rewrite async connecting. (***TESTING NEEDED)
-
- o Connecting from SILC router to SILC server.
-
- o Rewrite rehash, HUP.
-
- o Heartbeat-keepalive.
-
- o Test backup router resuming protocol.
-
- o Check all packet receive routines that they call silc_packet_free.
+ o Rewrite connecting accepting. (***DONE)
+
+ o Rewrite async connecting. (***DONE)
+
+ o Test backup router resuming protocol. (***DONE)
+
+ o Check all packet receive routines that they call silc_packet_free.
+ (***DONE)
o Add Web statistics module using lib/silchttp. Give out server
statistics. (***DONE)
-SILC Client ****PARTLY DONE****
+SILC Client ****DONE****
===========
o Porting to new Toolkit API and new Client Library API (***DONE)
@@ -48,7 +42,7 @@
o Improve help files, especially /cmode, /cumode and /key. (***DONE)
-lib/silcclient, The Client Library ***PARTLY DONE****
+lib/silcclient, The Client Library ***DONE****
==================================
o silcclient.h clean up and API rewrites. (***DONE)
@@ -60,8 +54,6 @@
freeing, finding, etc. rewrite. Also making them reference counted for
multi threads use. (***DONE)
- o Rewrite silc_client_get_clients_by_channel.
-
o Rewrite client side WHOIS command (for whois -details). (***DONE)
o Finish all the missing SILC packet processings, rewrites. (***DONE)
@@ -85,25 +77,25 @@
o Starting key exchange directly, rewrite. (***DONE)
o Channel messages, channel private keys, channel entires, channel
- search, etc. rewrite. (***TESTING NEEDED)
+ search, etc. rewrite. (***DONE)
o For many APIs leave the hash context allocations to the caller instead
of using client->sha1hash and client->md5hash, or some kind of thread
safe (no locking) concept. (***DONE)
- o Key agreement rewrite. (***TESTING NEEDED)
+ o Key agreement rewrite. (***DONE)
o Connecting to remote client (***DONE)
- o Private message waiting API (in threads) (***TESING NEEDED)
-
- o client_attrs.c, attributes rewrite. (***TESTING NEEDED)
+ o Private message waiting API (in threads) (***TESTING NEEDED)
+
+ o client_attrs.c, attributes rewrite. (***DONE)
o No SilcBuffer lists back to application in command_reply operations.
Convert them all to real lists and/or structures for easier use.
(***DONE)
- o Nickname formatting rewrite. (***TESTING NEEDED)
+ o Nickname formatting rewrite. (***DONE)
o UDP connections. (***TESTING NEEDED)
@@ -114,7 +106,7 @@
o Porting to use the new util library. (***DONE)
-lib/silccore/silcpacket.[ch] ****PARTLY DONE****
+lib/silccore/silcpacket.[ch] ****DONE****
============================
o SilcPacketEngine. (***DONE)
@@ -143,10 +135,10 @@
be. (***DONE)
-lib/silcske/silcske.[ch] ***PARTLY DONE****
+lib/silcske/silcske.[ch] ***DONE****
========================
- o Responder rekey (***TESTING NEEDED)
+ o Responder rekey (***DONE)
o IV Included flag support in SKE (***DONE)
@@ -156,7 +148,7 @@
o SilcConnAuth header file documentation. (***DONE)
-lib/silccrypt ****PARTLY DONE****
+lib/silccrypt ****DONE****
=============
o Implement PKCS #1 sign/verify with hash OID. (***TESTING NEEDED)
@@ -176,12 +168,12 @@
o Assembler AES (***DONE)
-lib/silcutil ****PARTLY DONE****
+lib/silcutil ****DONE****
============
o The regex code from lib/contrib might compile fine on all platforms.
No need to make it silcutil/unix/ specific. Add them to generic
- silcutil.c. (***TESTNG NEEDED)
+ silcutil.c. (***DONE)
o Silc FD Stream to WIN32 (lib/silcutil/silcfdstream.h) (***TESTING NEEDED)
@@ -224,7 +216,7 @@
o Add abstract SilcStream. (***DONE)
-lib/silcutil/silcsocketstream.[ch] ****PARTY DONE****
+lib/silcutil/silcsocketstream.[ch] ****DONE****
==================================
o Add SilcSocketStream (***DONE)
@@ -234,7 +226,7 @@
o Test QoS after the changes made to socket stream
-lib/silcutil/silcschedule*.[ch] ****PARTLY DONE****
+lib/silcutil/silcschedule*.[ch] ****DONE****
===============================
o Scheduler can be optimized for FD tasks by changing the fd_queue
@@ -262,7 +254,7 @@
o Change SILC_TASK_CALLBACK to non-static, and remove the macro
SILC_TASK_CALLBACK_GLOBAL. (***DONE)
- o SILC Schedule API changes to WIN32. (***TESTING NEEDED)
+ o SILC Schedule API changes to WIN32. (***DONE)
lib/silcutil/silcasync.[ch] ****DONE****
@@ -287,7 +279,7 @@
o SILC Finite State Machine API. Replaces SILC Protocol API (***DONE)
-lib/silcutil/silcnet*, lib/silcutil/*/silc*net* ****PARTLY DONE****
+lib/silcutil/silcnet*, lib/silcutil/*/silc*net* ****DONE****
===============================================
o Add UDP interface (***DONE)
@@ -297,17 +289,17 @@
o New network interfaces (***DONE)
-lib/silcmath ****PARTLY DONE****
-============
-
- o Test on x86_64.
+lib/silcmath ****DONE****
+============
+
+ o Test on x86_64. (***TESTING NEEDED)
o Change LTM and TFM function names when importing to SILC tree to avoid
rare linking problems on system that has same named symbols already in
the system. (***DONE)
-lib/silcutil/symbian/ ****PARTLY DONE****
+lib/silcutil/symbian/ ****DONE****
=====================
o lib/silcutil/symbian routines missing or not completed.
Modified: silc-client/branches/upstream/current/apps/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/apps/Makefile.am?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/apps/Makefile.am (original)
+++ silc-client/branches/upstream/current/apps/Makefile.am Sat Nov 24 19:48:38 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:07:36 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:08 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/apps/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/apps/Makefile.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/apps/Makefile.in (original)
+++ silc-client/branches/upstream/current/apps/Makefile.in Sat Nov 24 19:48:38 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:07:36 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:08 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/apps/irssi/irssi-version.h.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/apps/irssi/irssi-version.h.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/apps/irssi/irssi-version.h.in (original)
+++ silc-client/branches/upstream/current/apps/irssi/irssi-version.h.in Sat Nov 24 19:48:38 2007
@@ -1,4 +1,4 @@
/* automatically created by autogen.sh */
-#define IRSSI_VERSION "1.1.2 (Irssi base: @VERSION@ - SILC base: SILC 1.1.2)"
-#define IRSSI_VERSION_DATE 20070704
-#define IRSSI_VERSION_TIME 20070704
+#define IRSSI_VERSION "1.1.3 (Irssi base: @VERSION@ - SILC base: SILC 1.1.3)"
+#define IRSSI_VERSION_DATE 20071106
+#define IRSSI_VERSION_TIME 20071106
Modified: silc-client/branches/upstream/current/apps/irssi/silc-client.spec
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/apps/irssi/silc-client.spec?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/apps/irssi/silc-client.spec (original)
+++ silc-client/branches/upstream/current/apps/irssi/silc-client.spec Sat Nov 24 19:48:38 2007
@@ -1,6 +1,6 @@
Summary: SILC Client
Name: silc-client
-Version: 1.1.2
+Version: 1.1.3
Release: 0.fc7
License: GPL
Group: Applications/Communications
Modified: silc-client/branches/upstream/current/apps/irssi/src/fe-common/silc/module-formats.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/apps/irssi/src/fe-common/silc/module-formats.c?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/apps/irssi/src/fe-common/silc/module-formats.c (original)
+++ silc-client/branches/upstream/current/apps/irssi/src/fe-common/silc/module-formats.c Sat Nov 24 19:48:38 2007
@@ -108,7 +108,7 @@
{ "notice_private_signed", "{notice {flag_signed}$0{pvtnotice_host $1}}$2", 3, { 0, 0, 0 } },
{ "notice_private_unknown", "{notice {flag_unknown}$0{pvtnotice_host $1}}$2", 3, { 0, 0, 0 } },
{ "notice_private_failed", "{notice {flag_failed}$0{pvtnotice_host $1}}$2", 3, { 0, 0, 0 } },
- { "many", "There are now $0 {channick_hilight $1}'s on this channel", 2, { 0, 0 } },
+ { "many", "There are now $0 {channick_hilight $1}s on this channel", 2, { 0, 0 } },
{ "user_appears", "{channick_hilight $0} will appear as {channick_hilight $1}", 2, { 0, 0 } },
Modified: silc-client/branches/upstream/current/configure
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/configure?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/configure (original)
+++ silc-client/branches/upstream/current/configure Sat Nov 24 19:48:38 2007
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Client 1.1.2.
+# Generated by GNU Autoconf 2.61 for Client 1.1.3.
#
# Report bugs to <silc-devel at lists.silcnet.org>.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='Client'
PACKAGE_TARNAME='silc-client'
-PACKAGE_VERSION='1.1.2'
-PACKAGE_STRING='Client 1.1.2'
+PACKAGE_VERSION='1.1.3'
+PACKAGE_STRING='Client 1.1.3'
PACKAGE_BUGREPORT='silc-devel at lists.silcnet.org'
# Factoring default headers for most tests.
@@ -1480,7 +1480,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 Client 1.1.2 to adapt to many kinds of systems.
+\`configure' configures Client 1.1.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1551,7 +1551,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Client 1.1.2:";;
+ short | recursive ) echo "Configuration of Client 1.1.3:";;
esac
cat <<\_ACEOF
@@ -1679,7 +1679,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Client configure 1.1.2
+Client configure 1.1.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1693,7 +1693,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Client $as_me 1.1.2, which was
+It was created by Client $as_me 1.1.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2509,7 +2509,7 @@
# Define the identity of the package.
PACKAGE='silc-client'
- VERSION='1.1.2'
+ VERSION='1.1.3'
cat >>confdefs.h <<_ACEOF
@@ -25799,7 +25799,11 @@
if test "x$NASM" != "xno"; then
- SILC_ASSEMBLER="$NASM -O2 -felf"
+ if test x$cpu_x86_64 = xtrue; then
+ SILC_ASSEMBLER="$NASM -O2 -felf64"
+ else
+ SILC_ASSEMBLER="$NASM -O2 -felf"
+ fi
have_assembler=true
fi
@@ -25845,7 +25849,11 @@
if test "x$YASM" != "xno"; then
- SILC_ASSEMBLER="$YASM -Xgnu -felf"
+ if test x$cpu_x86_64 = xtrue; then
+ SILC_ASSEMBLER="$YASM -Xgnu -felf64"
+ else
+ SILC_ASSEMBLER="$YASM -Xgnu -felf"
+ fi
have_assembler=true
fi
fi
@@ -31751,7 +31759,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Client $as_me 1.1.2, which was
+This file was extended by Client $as_me 1.1.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -31804,7 +31812,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Client config.status 1.1.2
+Client 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-client/branches/upstream/current/configure.ac
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/configure.ac?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/configure.ac (original)
+++ silc-client/branches/upstream/current/configure.ac Sat Nov 24 19:48:38 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:07:38 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:10 EET 2007 by priikone
# Distribution: Client
# License:
@@ -23,7 +23,7 @@
# GNU General Public License for more details.
#
-AC_INIT([Client], [1.1.2], [silc-devel at lists.silcnet.org], [silc-client])
+AC_INIT([Client], [1.1.3], [silc-devel at lists.silcnet.org], [silc-client])
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE
AC_PREREQ(2.52)
@@ -341,13 +341,21 @@
if test x$want_asm = xtrue; then
AC_PATH_PROG([NASM], [nasm], [no])
if test "x$NASM" != "xno"; then
- SILC_ASSEMBLER="$NASM -O2 -felf"
+ if test x$cpu_x86_64 = xtrue; then
+ SILC_ASSEMBLER="$NASM -O2 -felf64"
+ else
+ SILC_ASSEMBLER="$NASM -O2 -felf"
+ fi
have_assembler=true
fi
AC_PATH_PROG([YASM], [yasm], [no])
if test "x$YASM" != "xno"; then
- SILC_ASSEMBLER="$YASM -Xgnu -felf"
+ if test x$cpu_x86_64 = xtrue; then
+ SILC_ASSEMBLER="$YASM -Xgnu -felf64"
+ else
+ SILC_ASSEMBLER="$YASM -Xgnu -felf"
+ fi
have_assembler=true
fi
fi
Modified: silc-client/branches/upstream/current/doc/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/doc/Makefile.am?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/doc/Makefile.am (original)
+++ silc-client/branches/upstream/current/doc/Makefile.am Sat Nov 24 19:48:38 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:07:36 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:08 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/doc/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/doc/Makefile.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/doc/Makefile.in (original)
+++ silc-client/branches/upstream/current/doc/Makefile.in Sat Nov 24 19:48:38 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:07:36 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:08 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/includes/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/includes/Makefile.am?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/includes/Makefile.am (original)
+++ silc-client/branches/upstream/current/includes/Makefile.am Sat Nov 24 19:48:38 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:07:36 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:08 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/includes/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/includes/Makefile.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/includes/Makefile.in (original)
+++ silc-client/branches/upstream/current/includes/Makefile.in Sat Nov 24 19:48:38 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:07:36 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:08 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/includes/silc.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/includes/silc.h?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/includes/silc.h (original)
+++ silc-client/branches/upstream/current/includes/silc.h Sat Nov 24 19:48:38 2007
@@ -262,8 +262,9 @@
#include "silcfsm.h"
#include "silcsocketstream.h"
#include "silcfdstream.h"
+#include "silcmime.h"
+
#include "silcvcard.h"
-#include "silcmime.h"
#include "silcasn1.h"
#include "silcber.h"
Modified: silc-client/branches/upstream/current/includes/silc.h.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/includes/silc.h.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/includes/silc.h.in (original)
+++ silc-client/branches/upstream/current/includes/silc.h.in Sat Nov 24 19:48:38 2007
@@ -262,8 +262,9 @@
#include "silcfsm.h"
#include "silcsocketstream.h"
#include "silcfdstream.h"
+#include "silcmime.h"
+
#include "silcvcard.h"
-#include "silcmime.h"
#include "silcasn1.h"
#include "silcber.h"
Modified: silc-client/branches/upstream/current/includes/silcdistdefs.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/includes/silcdistdefs.h?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/includes/silcdistdefs.h (original)
+++ silc-client/branches/upstream/current/includes/silcdistdefs.h Sat Nov 24 19:48:38 2007
@@ -1,7 +1,7 @@
/*
Automatically generated by Autodist 1.3.2. Do not edit.
- Generated: Wed Jul 4 08:07:12 EEST 2007 by priikone
+ Generated: Tue Nov 6 16:42:49 EET 2007 by priikone
Distribution: Client
License:
*/
Modified: silc-client/branches/upstream/current/includes/silcversion.h.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/includes/silcversion.h.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/includes/silcversion.h.in (original)
+++ silc-client/branches/upstream/current/includes/silcversion.h.in Sat Nov 24 19:48:38 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-client/branches/upstream/current/lib/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/Makefile.am?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/Makefile.am Sat Nov 24 19:48:38 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:07:37 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
@@ -11,7 +11,7 @@
#
# Author: Pekka Riikonen <priikone at silcnet.org>
#
-# Copyright (C) 2000 - 2005 Pekka Riikonen
+# Copyright (C) 2000 - 2005, 2007 Pekka Riikonen
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -28,15 +28,29 @@
# SILC Library dirs
SILCLIB_DIRS = contrib silccore silcutil silcapputil silccrypt silcskr silcmath silcasn1 silcske 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)
else
LIBTOOL_OPTS=
-LIBTOOL_SILC_VERSION =
-LIBTOOL_SILCCLIENT_VERSION =
-LIBTOOL_SILCSERVER_VERSION =
+LIBTOOL_SILC_VERSION =
+LIBTOOL_SILCCLIENT_VERSION =
+LIBTOOL_SILCSERVER_VERSION =
+endif
+
+if SILC_WIN32
+SILC_LINK_LIBS=$(LIBS)
+SILCCLIENT_LINK_LIBS=$(LIBS) -lsilc
+SILCSERVER_LIBS=$(LIBS) -lsilc
+else
+SILC_LINK_LIBS=
+SILCCLIENT_LINK_LIBS=
+SILCSERVER_LIBS=
endif
SILCLIB = libsilc.a
@@ -74,14 +88,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_LINK_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_LINK_LIBS) $(LIBTOOL_SILCCLIENT_VERSION) $(LIBTOOL_OPTS) -o libsilcclient.la
Modified: silc-client/branches/upstream/current/lib/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/Makefile.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/Makefile.in Sat Nov 24 19:48:38 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:07:37 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
@@ -27,7 +27,7 @@
#
# Author: Pekka Riikonen <priikone at silcnet.org>
#
-# Copyright (C) 2000 - 2005 Pekka Riikonen
+# Copyright (C) 2000 - 2005, 2007 Pekka Riikonen
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -278,13 +278,20 @@
# SILC Library dirs
SILCLIB_DIRS = contrib silccore silcutil silcapputil silccrypt silcskr silcmath silcasn1 silcske 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_LINK_LIBS =
+ at SILC_WIN32_TRUE@SILC_LINK_LIBS = $(LIBS)
+ at SILC_WIN32_FALSE@SILCCLIENT_LINK_LIBS =
+ at SILC_WIN32_TRUE@SILCCLIENT_LINK_LIBS = $(LIBS) -lsilc
+ at SILC_WIN32_FALSE@SILCSERVER_LIBS =
+ at SILC_WIN32_TRUE@SILCSERVER_LIBS = $(LIBS) -lsilc
SILCLIB = libsilc.a
# SILC Client Library dirs
@@ -637,10 +644,10 @@
@SILC_ENABLE_SHARED_TRUE@ -rm -rf $(DESTDIR)$(libdir)/libsilcclient.a
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_LINK_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_LINK_LIBS) $(LIBTOOL_SILCCLIENT_VERSION) $(LIBTOOL_OPTS) -o libsilcclient.la
install-data-hook:
Modified: silc-client/branches/upstream/current/lib/contrib/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/contrib/Makefile.am?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/contrib/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/contrib/Makefile.am Sat Nov 24 19:48:38 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:07:38 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
@@ -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-client/branches/upstream/current/lib/contrib/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/contrib/Makefile.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/contrib/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/contrib/Makefile.in Sat Nov 24 19:48:38 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:07:38 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
@@ -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 =
@@ -290,8 +288,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-client/branches/upstream/current/lib/silcapputil/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcapputil/Makefile.am?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcapputil/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silcapputil/Makefile.am Sat Nov 24 19:48:38 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:07:37 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcapputil/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcapputil/Makefile.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcapputil/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silcapputil/Makefile.in Sat Nov 24 19:48:38 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:07:37 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcasn1/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcasn1/Makefile.am?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcasn1/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silcasn1/Makefile.am Sat Nov 24 19:48:38 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:07:37 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcasn1/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcasn1/Makefile.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcasn1/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silcasn1/Makefile.in Sat Nov 24 19:48:38 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:07:37 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcclient/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcclient/Makefile.am?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcclient/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silcclient/Makefile.am Sat Nov 24 19:48:38 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:07:37 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcclient/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcclient/Makefile.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcclient/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silcclient/Makefile.in Sat Nov 24 19:48:38 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:07:37 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcclient/client_entry.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcclient/client_entry.c?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcclient/client_entry.c (original)
+++ silc-client/branches/upstream/current/lib/silcclient/client_entry.c Sat Nov 24 19:48:38 2007
@@ -16,7 +16,7 @@
GNU General Public License for more details.
*/
-/* $Id: client_entry.c,v 1.27.2.7 2007/07/02 13:34:02 priikone Exp $ */
+/* $Id: client_entry.c,v 1.27.2.8 2007/11/03 21:25:26 priikone Exp $ */
#include "silc.h"
#include "silcclient.h"
@@ -1722,6 +1722,7 @@
return FALSE;
silc_client_empty_channel(client, conn, channel);
+ silc_client_del_channel_private_keys(client, conn, channel);
silc_hash_table_free(channel->user_list);
silc_free(channel->channel_name);
silc_free(channel->topic);
@@ -1748,7 +1749,6 @@
if (channel->channel_pubkeys)
silc_argument_list_free(channel->channel_pubkeys,
SILC_ARGUMENT_PUBLIC_KEY);
- silc_client_del_channel_private_keys(client, conn, channel);
silc_atomic_uninit16(&channel->internal.refcnt);
silc_rwlock_free(channel->internal.lock);
silc_schedule_task_del_by_context(conn->client->schedule, channel);
Modified: silc-client/branches/upstream/current/lib/silcclient/client_entry.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcclient/client_entry.h?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcclient/client_entry.h (original)
+++ silc-client/branches/upstream/current/lib/silcclient/client_entry.h Sat Nov 24 19:48:38 2007
@@ -54,10 +54,10 @@
SilcChannelID *channel_id);
SilcBool silc_client_del_channel(SilcClient client, SilcClientConnection conn,
SilcChannelEntry channel);
-bool silc_client_replace_channel_id(SilcClient client,
- SilcClientConnection conn,
- SilcChannelEntry channel,
- SilcChannelID *new_id);
+SilcBool silc_client_replace_channel_id(SilcClient client,
+ SilcClientConnection conn,
+ SilcChannelEntry channel,
+ SilcChannelID *new_id);
SilcServerEntry silc_client_add_server(SilcClient client,
SilcClientConnection conn,
const char *server_name,
Modified: silc-client/branches/upstream/current/lib/silcclient/client_keyagr.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcclient/client_keyagr.c?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcclient/client_keyagr.c (original)
+++ silc-client/branches/upstream/current/lib/silcclient/client_keyagr.c Sat Nov 24 19:48:38 2007
@@ -59,6 +59,9 @@
{
SilcClientEntry client_entry = context;
SilcClientKeyAgreement ke = client_entry->internal.ke;
+
+ if (!ke)
+ return;
SILC_LOG_DEBUG(("Key agreement %p timeout", ke));
Modified: silc-client/branches/upstream/current/lib/silcclient/client_notify.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcclient/client_notify.c?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcclient/client_notify.c (original)
+++ silc-client/branches/upstream/current/lib/silcclient/client_notify.c Sat Nov 24 19:48:38 2007
@@ -16,7 +16,7 @@
GNU General Public License for more details.
*/
-/* $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-client/branches/upstream/current/lib/silcclient/command_reply.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcclient/command_reply.c?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcclient/command_reply.c (original)
+++ silc-client/branches/upstream/current/lib/silcclient/command_reply.c Sat Nov 24 19:48:38 2007
@@ -16,7 +16,7 @@
GNU General Public License for more details.
*/
-/* $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-client/branches/upstream/current/lib/silccore/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silccore/Makefile.am?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silccore/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silccore/Makefile.am Sat Nov 24 19:48:38 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:07:36 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:08 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silccore/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silccore/Makefile.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silccore/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silccore/Makefile.in Sat Nov 24 19:48:38 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:07:36 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:08 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silccore/silcattrs.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silccore/silcattrs.c?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silccore/silcattrs.c (original)
+++ silc-client/branches/upstream/current/lib/silccore/silcattrs.c Sat Nov 24 19:48:38 2007
@@ -17,7 +17,7 @@
*/
/* Implementation of Attribute Payload routines */
-/* $Id: silcattrs.c,v 1.24.2.1 2007/05/28 18:23:09 priikone Exp $ */
+/* $Id: silcattrs.c,v 1.24.2.2 2007/11/04 09:20:20 priikone Exp $ */
#include "silc.h"
#include "silcattrs.h"
Modified: silc-client/branches/upstream/current/lib/silccore/silcpacket.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silccore/silcpacket.c?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silccore/silcpacket.c (original)
+++ silc-client/branches/upstream/current/lib/silccore/silcpacket.c Sat Nov 24 19:48:38 2007
@@ -19,7 +19,7 @@
/*
* Created: Fri Jul 25 18:52:14 1997
*/
-/* $Id: silcpacket.c,v 1.106.2.5 2007/07/01 13:56:59 priikone Exp $ */
+/* $Id: silcpacket.c,v 1.106.2.7 2007/11/05 20:34:55 priikone Exp $ */
#include "silc.h"
@@ -785,6 +785,8 @@
return NULL;
}
+ SILC_LOG_DEBUG(("Created packet stream %p", ps));
+
return ps;
}
@@ -886,6 +888,8 @@
if (silc_atomic_sub_int8(&stream->refcnt, 1) > 0) {
stream->destroyed = TRUE;
+
+ SILC_LOG_DEBUG(("Marking packet stream %p destroyed", stream));
/* Close the underlaying stream */
if (!stream->udp && stream->stream)
@@ -1467,14 +1471,6 @@
unsigned char *iv = silc_cipher_get_iv(cipher);
SilcUInt32 pc1, pc2;
- /* Increment 64-bit packet counter */
- SILC_GET32_MSB(pc1, iv + 4);
- SILC_GET32_MSB(pc2, iv + 8);
- if (++pc2 == 0)
- ++pc1;
- SILC_PUT32_MSB(pc1, iv + 4);
- SILC_PUT32_MSB(pc2, iv + 8);
-
/* Reset block counter */
memset(iv + 12, 0, 4);
@@ -1485,11 +1481,24 @@
ret_iv[1] = ret_iv[0] + iv[4];
ret_iv[2] = ret_iv[0] ^ ret_iv[1];
ret_iv[3] = ret_iv[0] + ret_iv[2];
- SILC_PUT32_MSB(pc2, ret_iv + 4);
+
+ /* Increment 32-bit packet counter */
+ SILC_GET32_MSB(pc1, iv + 8);
+ pc1++;
+ SILC_PUT32_MSB(pc1, ret_iv + 4);
+
SILC_LOG_HEXDUMP(("IV"), ret_iv, 8);
/* Set new nonce to counter block */
- memcpy(iv + 4, ret_iv, 4);
+ memcpy(iv + 4, ret_iv, 8);
+ } else {
+ /* Increment 64-bit packet counter */
+ SILC_GET32_MSB(pc1, iv + 4);
+ SILC_GET32_MSB(pc2, iv + 8);
+ if (++pc2 == 0)
+ ++pc1;
+ SILC_PUT32_MSB(pc1, iv + 4);
+ SILC_PUT32_MSB(pc2, iv + 8);
}
SILC_LOG_HEXDUMP(("Counter Block"), iv, 16);
Modified: silc-client/branches/upstream/current/lib/silccore/silcpacket.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silccore/silcpacket.h?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silccore/silcpacket.h (original)
+++ silc-client/branches/upstream/current/lib/silccore/silcpacket.h Sat Nov 24 19:48:38 2007
@@ -402,6 +402,12 @@
* Returns list of packet streams added to the packet engine. The caller
* must free the list with silc_packet_engine_free_streams_list.
*
+ * NOTES
+ *
+ * This function may also return disconnected and destroyed streams. The
+ * caller should use silc_packet_stream_is_valid to check if the stream
+ * is valid.
+ *
***/
SilcDList silc_packet_engine_get_streams(SilcPacketEngine engine);
Modified: silc-client/branches/upstream/current/lib/silccrypt/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silccrypt/Makefile.am?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silccrypt/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silccrypt/Makefile.am Sat Nov 24 19:48:38 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:07:37 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silccrypt/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silccrypt/Makefile.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silccrypt/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silccrypt/Makefile.in Sat Nov 24 19:48:38 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:07:37 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silccrypt/aes.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silccrypt/aes.c?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silccrypt/aes.c (original)
+++ silc-client/branches/upstream/current/lib/silccrypt/aes.c Sat Nov 24 19:48:38 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-client/branches/upstream/current/lib/silccrypt/silcpk.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silccrypt/silcpk.c?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silccrypt/silcpk.c (original)
+++ silc-client/branches/upstream/current/lib/silccrypt/silcpk.c Sat Nov 24 19:48:38 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));
Modified: silc-client/branches/upstream/current/lib/silcmath/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcmath/Makefile.am?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcmath/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silcmath/Makefile.am Sat Nov 24 19:48:38 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:07:38 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcmath/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcmath/Makefile.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcmath/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silcmath/Makefile.in Sat Nov 24 19:48:38 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:07:38 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcsftp/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcsftp/Makefile.am?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcsftp/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silcsftp/Makefile.am Sat Nov 24 19:48:38 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:07:37 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcsftp/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcsftp/Makefile.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcsftp/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silcsftp/Makefile.in Sat Nov 24 19:48:38 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:07:37 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcske/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcske/Makefile.am?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcske/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silcske/Makefile.am Sat Nov 24 19:48:38 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:07:37 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcske/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcske/Makefile.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcske/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silcske/Makefile.in Sat Nov 24 19:48:38 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:07:37 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcske/silcske.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcske/silcske.c?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcske/silcske.c (original)
+++ silc-client/branches/upstream/current/lib/silcske/silcske.c Sat Nov 24 19:48:38 2007
@@ -16,7 +16,7 @@
GNU General Public License for more details.
*/
-/* $Id: silcske.c,v 1.92.2.3 2007/07/01 11:12:46 priikone Exp $ */
+/* $Id: silcske.c,v 1.92.2.5 2007/11/05 21:12:56 priikone Exp $ */
#include "silc.h"
#include "silcske.h"
@@ -3285,7 +3285,7 @@
SilcHmac *ret_hmac_receive,
SilcHash *ret_hash)
{
- unsigned char iv[32];
+ unsigned char iv[SILC_HASH_MAXLEN];
SilcBool iv_included = (prop->flags & SILC_SKE_SP_FLAG_IV_INCLUDED);
/* Allocate ciphers to be used in the communication */
@@ -3309,6 +3309,12 @@
if (ret_hmac_receive) {
if (!silc_hmac_alloc((char *)silc_hmac_get_name(prop->hmac), NULL,
ret_hmac_receive))
+ return FALSE;
+ }
+
+ /* Allocate hash */
+ if (ret_hash) {
+ if (!silc_hash_alloc(silc_hash_get_name(prop->hash), ret_hash))
return FALSE;
}
@@ -3320,10 +3326,24 @@
keymat->enc_key_len, TRUE);
if (silc_cipher_get_mode(*ret_send_key) == SILC_CIPHER_MODE_CTR) {
- memcpy(iv, ske->hash, 4);
- memcpy(iv + 4, keymat->receive_iv, iv_included ? 4 : 8);
+ /* Counter mode */
+ if (!ske->rekeying) {
+ /* Set IV. */
+ memcpy(iv, ske->hash, 4);
+ if (!iv_included)
+ memcpy(iv + 4, keymat->receive_iv, 8);
+ } else {
+ /* Rekey, recompute the truncated hash value. */
+ silc_hash_make(prop->hash, keymat->receive_iv, 8, iv);
+ if (!iv_included)
+ memcpy(iv + 4, keymat->receive_iv, 8);
+ else
+ memset(iv + 4, 0, 12);
+ }
+
silc_cipher_set_iv(*ret_send_key, iv);
} else {
+ /* Other modes */
silc_cipher_set_iv(*ret_send_key, keymat->receive_iv);
}
}
@@ -3332,10 +3352,24 @@
keymat->enc_key_len, FALSE);
if (silc_cipher_get_mode(*ret_receive_key) == SILC_CIPHER_MODE_CTR) {
- memcpy(iv, ske->hash, 4);
- memcpy(iv + 4, keymat->send_iv, iv_included ? 4 : 8);
+ /* Counter mode */
+ if (!ske->rekeying) {
+ /* Set IV. */
+ memcpy(iv, ske->hash, 4);
+ if (!iv_included)
+ memcpy(iv + 4, keymat->send_iv, 8);
+ } else {
+ /* Rekey, recompute the truncated hash value. */
+ silc_hash_make(prop->hash, keymat->send_iv, 8, iv);
+ if (!iv_included)
+ memcpy(iv + 4, keymat->send_iv, 8);
+ else
+ memset(iv + 4, 0, 12);
+ }
+
silc_cipher_set_iv(*ret_receive_key, iv);
} else {
+ /* Other modes */
silc_cipher_set_iv(*ret_receive_key, keymat->send_iv);
}
}
@@ -3351,10 +3385,24 @@
keymat->enc_key_len, TRUE);
if (silc_cipher_get_mode(*ret_send_key) == SILC_CIPHER_MODE_CTR) {
- memcpy(iv, ske->hash, 4);
- memcpy(iv + 4, keymat->send_iv, iv_included ? 4 : 8);
+ /* Counter mode */
+ if (!ske->rekeying) {
+ /* Set IV. */
+ memcpy(iv, ske->hash, 4);
+ if (!iv_included)
+ memcpy(iv + 4, keymat->send_iv, 8);
+ } else {
+ /* Rekey, recompute the truncated hash value. */
+ silc_hash_make(prop->hash, keymat->send_iv, 8, iv);
+ if (!iv_included)
+ memcpy(iv + 4, keymat->send_iv, 8);
+ else
+ memset(iv + 4, 0, 12);
+ }
+
silc_cipher_set_iv(*ret_send_key, iv);
} else {
+ /* Other modes */
silc_cipher_set_iv(*ret_send_key, keymat->send_iv);
}
}
@@ -3363,10 +3411,25 @@
keymat->enc_key_len, FALSE);
if (silc_cipher_get_mode(*ret_receive_key) == SILC_CIPHER_MODE_CTR) {
- memcpy(iv, ske->hash, 4);
- memcpy(iv + 4, keymat->receive_iv, iv_included ? 4 : 8);
+ /* Counter mode */
+ if (!ske->rekeying) {
+ /* Set IV. If IV Included flag was negotiated we only set the
+ truncated hash value. */
+ memcpy(iv, ske->hash, 4);
+ if (!iv_included)
+ memcpy(iv + 4, keymat->receive_iv, 8);
+ } else {
+ /* Rekey, recompute the truncated hash value. */
+ silc_hash_make(prop->hash, keymat->receive_iv, 8, iv);
+ if (!iv_included)
+ memcpy(iv + 4, keymat->receive_iv, 8);
+ else
+ memset(iv + 4, 0, 12);
+ }
+
silc_cipher_set_iv(*ret_receive_key, iv);
} else {
+ /* Other modes */
silc_cipher_set_iv(*ret_receive_key, keymat->receive_iv);
}
}
@@ -3376,12 +3439,6 @@
if (ret_hmac_receive)
silc_hmac_set_key(*ret_hmac_receive, keymat->receive_hmac_key,
keymat->hmac_key_len);
- }
-
- /* Allocate hash */
- if (ret_hash) {
- if (!silc_hash_alloc(silc_hash_get_name(prop->hash), ret_hash))
- return FALSE;
}
return TRUE;
Modified: silc-client/branches/upstream/current/lib/silcskr/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcskr/Makefile.am?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcskr/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silcskr/Makefile.am Sat Nov 24 19:48:38 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:07:37 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcskr/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcskr/Makefile.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcskr/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silcskr/Makefile.in Sat Nov 24 19:48:38 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:07:37 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcutil/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/Makefile.am?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silcutil/Makefile.am Sat Nov 24 19:48:38 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:07:36 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcutil/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/Makefile.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silcutil/Makefile.in Sat Nov 24 19:48:38 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:07:36 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcutil/silcatomic.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/silcatomic.h?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/silcatomic.h (original)
+++ silc-client/branches/upstream/current/lib/silcutil/silcatomic.h Sat Nov 24 19:48:38 2007
@@ -437,7 +437,7 @@
SILC_ATOMIC_SET_INT_F(bits) \
{ \
/* Windows */ \
- InterlockedExchange((LONG)&atomic->value, (LONG)value); \
+ InterlockedExchange((LONG *)&atomic->value, (LONG)value); \
}
#elif defined(__GNUC__) && (defined(SILC_I486) || defined(SILC_X86_64))
@@ -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; \
@@ -895,7 +895,7 @@
SILC_ATOMIC_INC_F(bits) \
{ \
/* Windows */ \
- InterlockedIncrement((LONG)&atomic->value); \
+ InterlockedIncrement((LONG *)&atomic->value); \
}
#elif defined(__GNUC__) && (defined(SILC_I486) || defined(SILC_X86_64))
@@ -1001,7 +1001,7 @@
SILC_ATOMIC_DEC_F(bits) \
{ \
/* Windows */ \
- InterlockedDecrement((LONG)&atomic->value); \
+ InterlockedDecrement((LONG *)&atomic->value); \
}
#elif defined(__GNUC__) && (defined(SILC_I486) || defined(SILC_X86_64))
@@ -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-client/branches/upstream/current/lib/silcutil/silcconfig.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/silcconfig.c?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/silcconfig.c (original)
+++ silc-client/branches/upstream/current/lib/silcutil/silcconfig.c Sat Nov 24 19:48:38 2007
@@ -16,7 +16,7 @@
GNU General Public License for more details.
*/
-/* $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-client/branches/upstream/current/lib/silcutil/silcnet.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/silcnet.h?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/silcnet.h (original)
+++ silc-client/branches/upstream/current/lib/silcutil/silcnet.h Sat Nov 24 19:48:38 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-client/branches/upstream/current/lib/silcutil/silcschedule.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/silcschedule.c?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/silcschedule.c (original)
+++ silc-client/branches/upstream/current/lib/silcutil/silcschedule.c Sat Nov 24 19:48:38 2007
@@ -16,7 +16,7 @@
GNU General Public License for more details.
*/
-/* $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-client/branches/upstream/current/lib/silcutil/unix/silcunixnet.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/unix/silcunixnet.c?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/unix/silcunixnet.c (original)
+++ silc-client/branches/upstream/current/lib/silcutil/unix/silcunixnet.c Sat Nov 24 19:48:38 2007
@@ -16,7 +16,7 @@
GNU General Public License for more details.
*/
-/* $Id: silcunixnet.c,v 1.37.2.2 2007/06/24 14:13:11 priikone Exp $ */
+/* $Id: silcunixnet.c,v 1.37.2.3 2007/11/04 14:18:04 priikone Exp $ */
#include "silc.h"
#include "silcnet.h"
@@ -363,8 +363,10 @@
if (remote_ip_addr && remote_port) {
if (sock->ipv6) {
+#ifdef HAVE_IPV6
from = (struct sockaddr *)&s.sin6;
flen = sizeof(s.sin6);
+#endif /* HAVE_IPV6 */
} else {
from = (struct sockaddr *)&s.sin;
flen = sizeof(s.sin);
@@ -395,9 +397,13 @@
/* Return remote address */
if (remote_ip_addr && remote_port) {
if (sock->ipv6) {
+#ifdef HAVE_IPV6
*remote_port = ntohs(s.sin6.sin6_port);
inet_ntop(AF_INET6, &s.sin6.sin6_addr, remote_ip_addr,
remote_ip_addr_size);
+#else
+ *remote_port = 0;
+#endif /* HAVE_IPV6 */
} else {
*remote_port = ntohs(s.sin.sin_port);
inet_ntop(AF_INET, &s.sin.sin_addr, remote_ip_addr,
Modified: silc-client/branches/upstream/current/lib/silcutil/unix/silcunixschedule.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/unix/silcunixschedule.c?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/unix/silcunixschedule.c (original)
+++ silc-client/branches/upstream/current/lib/silcutil/unix/silcunixschedule.c Sat Nov 24 19:48:38 2007
@@ -16,7 +16,7 @@
GNU General Public License for more details.
*/
-/* $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-client/branches/upstream/current/lib/silcutil/win32/silcwin32schedule.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/win32/silcwin32schedule.c?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/win32/silcwin32schedule.c (original)
+++ silc-client/branches/upstream/current/lib/silcutil/win32/silcwin32schedule.c Sat Nov 24 19:48:38 2007
@@ -16,7 +16,7 @@
GNU General Public License for more details.
*/
-/* $Id: silcwin32schedule.c,v 1.39 2007/05/10 15:28:04 priikone Exp $ */
+/* $Id: silcwin32schedule.c,v 1.39.2.1 2007/10/28 15:21:00 priikone Exp $ */
#include "silc.h"
@@ -130,7 +130,7 @@
static LRESULT CALLBACK
silc_schedule_wnd_proc(HWND hwnd, UINT wMsg, WPARAM wParam, LPARAM lParam)
{
- SilcSchedule schedule = (SilcSchedule)GetWindowLong(hwnd, GWL_USERDATA);
+ SilcSchedule schedule = (SilcSchedule)GetWindowLongPtr(hwnd, GWL_USERDATA);
SilcWin32Scheduler internal;
SilcUInt32 fd;
SilcTaskFd task;
@@ -268,7 +268,7 @@
}
/* Set the scheduler as the window's context */
- SetWindowLong(internal->window, GWL_USERDATA, (void *)schedule);
+ SetWindowLongPtr(internal->window, GWL_USERDATA, (void *)schedule);
SetWindowPos(internal->window, HWND_BOTTOM, 0, 0, 0, 0, SWP_FRAMECHANGED);
internal->wakeup_sema = CreateSemaphore(NULL, 0, 100, NULL);
Modified: silc-client/branches/upstream/current/lib/silcvcard/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcvcard/Makefile.am?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcvcard/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silcvcard/Makefile.am Sat Nov 24 19:48:38 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:07:37 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcvcard/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcvcard/Makefile.in?rev=194&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcvcard/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silcvcard/Makefile.in Sat Nov 24 19:48:38 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:07:37 EEST 2007 by priikone
+# Generated: Tue Nov 6 16:43:09 EET 2007 by priikone
# Distribution: Client
# License:
More information about the Pkg-silc-commits
mailing list