[Pkg-silc-commits] r191 - in /silc-toolkit/trunk: ./ apps/ debian/ doc/ doc/toolkit/ includes/ lib/ lib/contrib/ lib/silcapputil/ lib/silcasn1/ lib/silcclient/ lib/silccore/ lib/silccrypt/ lib/silchttp/ lib/silcmath/ lib/silcsftp/ lib/silcsim/ lib/silcske/ lib/silcskr/ lib/silcutil/ lib/silcutil/unix/ lib/silcutil/win32/ lib/silcvcard/ win32/libsilcclient/
micah at users.alioth.debian.org
micah at users.alioth.debian.org
Sat Nov 24 19:12:42 UTC 2007
Author: micah
Date: Sat Nov 24 19:12:42 2007
New Revision: 191
URL: http://svn.debian.org/wsvn/pkg-silc/?sc=1&rev=191
Log:
prepare for new release
Modified:
silc-toolkit/trunk/CHANGES
silc-toolkit/trunk/Makefile.am
silc-toolkit/trunk/Makefile.in
silc-toolkit/trunk/TODO
silc-toolkit/trunk/apps/Makefile.am
silc-toolkit/trunk/apps/Makefile.in
silc-toolkit/trunk/configure
silc-toolkit/trunk/configure.ac
silc-toolkit/trunk/debian/changelog
silc-toolkit/trunk/doc/Makefile.am
silc-toolkit/trunk/doc/Makefile.in
silc-toolkit/trunk/doc/silcalgs.conf
silc-toolkit/trunk/doc/toolkit/index.html
silc-toolkit/trunk/doc/toolkit/silcpacket-silc_packet_engine_get_streams.html
silc-toolkit/trunk/includes/Makefile.am
silc-toolkit/trunk/includes/Makefile.in
silc-toolkit/trunk/includes/silc.h.in
silc-toolkit/trunk/includes/silcdistdefs.h
silc-toolkit/trunk/lib/Makefile.am
silc-toolkit/trunk/lib/Makefile.in
silc-toolkit/trunk/lib/contrib/Makefile.am
silc-toolkit/trunk/lib/contrib/Makefile.in
silc-toolkit/trunk/lib/silcapputil/Makefile.am
silc-toolkit/trunk/lib/silcapputil/Makefile.in
silc-toolkit/trunk/lib/silcasn1/Makefile.am
silc-toolkit/trunk/lib/silcasn1/Makefile.in
silc-toolkit/trunk/lib/silcclient/Makefile.am
silc-toolkit/trunk/lib/silcclient/Makefile.in
silc-toolkit/trunk/lib/silcclient/client_entry.c
silc-toolkit/trunk/lib/silcclient/client_entry.h
silc-toolkit/trunk/lib/silcclient/client_keyagr.c
silc-toolkit/trunk/lib/silccore/Makefile.am
silc-toolkit/trunk/lib/silccore/Makefile.in
silc-toolkit/trunk/lib/silccore/silcattrs.c
silc-toolkit/trunk/lib/silccore/silcpacket.c
silc-toolkit/trunk/lib/silccore/silcpacket.h
silc-toolkit/trunk/lib/silccrypt/Makefile.am
silc-toolkit/trunk/lib/silccrypt/Makefile.in
silc-toolkit/trunk/lib/silchttp/Makefile.am
silc-toolkit/trunk/lib/silchttp/Makefile.in
silc-toolkit/trunk/lib/silcmath/Makefile.am
silc-toolkit/trunk/lib/silcmath/Makefile.in
silc-toolkit/trunk/lib/silcsftp/Makefile.am
silc-toolkit/trunk/lib/silcsftp/Makefile.in
silc-toolkit/trunk/lib/silcsim/Makefile.am
silc-toolkit/trunk/lib/silcsim/Makefile.in
silc-toolkit/trunk/lib/silcske/Makefile.am
silc-toolkit/trunk/lib/silcske/Makefile.in
silc-toolkit/trunk/lib/silcske/silcconnauth.c
silc-toolkit/trunk/lib/silcske/silcske.c
silc-toolkit/trunk/lib/silcskr/Makefile.am
silc-toolkit/trunk/lib/silcskr/Makefile.in
silc-toolkit/trunk/lib/silcskr/silcskr.c
silc-toolkit/trunk/lib/silcutil/Makefile.am
silc-toolkit/trunk/lib/silcutil/Makefile.in
silc-toolkit/trunk/lib/silcutil/silcatomic.h
silc-toolkit/trunk/lib/silcutil/unix/silcunixnet.c
silc-toolkit/trunk/lib/silcutil/win32/silcwin32schedule.c
silc-toolkit/trunk/lib/silcvcard/Makefile.am
silc-toolkit/trunk/lib/silcvcard/Makefile.in
silc-toolkit/trunk/silc-toolkit.spec
silc-toolkit/trunk/win32/libsilcclient/libsilcclient.def
Modified: silc-toolkit/trunk/CHANGES
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/CHANGES?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/CHANGES (original)
+++ silc-toolkit/trunk/CHANGES Sat Nov 24 19:12:42 2007
@@ -1,4 +1,75 @@
+Sun Nov 11 14:15:48 EET 2007 Pekka Riikonen <priikone at silcnet.org>
+
+ * SILC Toolkit 1.1.5.
+
+Sun Nov 11 11:22:35 EET 2007 Pekka Riikonen <priikone at silcnet.org>
+
+ * Fixed connection authentication with public keys to use
+ correct public key as responder. Affected file is
+ lib/silcske/silcconnauth.c.
+
+ * Fixed public key authentication in server. Affected file is
+ apps/silcd/serverconfig.c.
+
+ * Fixed OPER and SILCOPER public key authentication. Affected
+ file is apps/silcd/server.c.
+
+ * Fixed prefer_passphrase_auth flag in server. Fixed
+ disconnection of unauthenticated connection. Affected file is
+ apps/silcd/server.c.
+
+ * Fixed client resuming in server. Affected file is
+ apps/silcd/packet_receive.c.
+
+ * Fixed IDENTIFY and WHOWAS command reply to correctly update
+ client entries (fixes a crash). Affected file is
+ apps/silcd/command_reply.c.
+
+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
@@ -115,7 +186,7 @@
* Use SILC_VERIFY to assert that silc_rwlock_wrlock can be
called only once per thread on Unix. Affected file is
lib/silcutil/unix/silcunixthread.c. Added same for mutex
- as well. Documented same on the API in
+ as well. Documented same on the API in
lib/silcutil/silcmutex.h.
* Fixed USERS command reply write-lock unlocking. Affected file
@@ -138,7 +209,7 @@
apps/irssi/src/core/modules-load.c
* Don't delete hilight entry (because it's just a pointer, not a
- copy). Affected file is
+ copy). Affected file is
apps/irssi/src/fe-common/silc/fe-silc-messages.c
Mon Jun 11 22:10:17 EEST 2007 Pekka Riikonen <priikone at silcnet.org>
@@ -189,7 +260,7 @@
Wed Jun 6 18:33:05 EEST 2007 Pekka Riikonen <priikone at silcnet.org>
- * Added notify callback to silc_schedule_init which can be used to
+ * Added notify callback to silc_schedule_init which can be used to
set a notify callback for scheduler which is called when task is
added to scheduler or deleted from scheduler. Affected file
is lib/silcutil/silcschedule.[ch].
@@ -198,7 +269,7 @@
was very short. Affected file is lib/silcutil/silcschedule.c.
* Rewrote the SILC scheduler handling in SILC Client to not poll
- every few msecs but to use the new notify callback. Affected
+ every few msecs but to use the new notify callback. Affected
file is apps/irssi/src/silc/core/silc-core.c.
* Fixed SFTP client library read buffer size which was too small.
@@ -374,7 +445,7 @@
better. Affected file is lib/silccilent/client_entry.c.
* Added "foo#2 appears as foo" support to SILC Client when user
- leaves or quits and one formatted nickname remain. Affected file
+ leaves or quits and one formatted nickname remain. Affected file
is apps/irssi/src/silc/core/client_ops.c.
* Send SilcChannelEntry to application in SILC_NOTIFY_TYPE_SIGNOFF.
@@ -436,7 +507,7 @@
Tue May 15 23:55:41 EEST 2007 Pekka Riikonen <priikone at silcnet.org>
* Added SILC_VERIFY macro which is equivalent to SILC_ASSERT
- but is compiled always in. Affected file is
+ but is compiled always in. Affected file is
lib/silcutil/silclog.h.
* Use SILC_VERIFY in FSM macros instead of SILC_ASSERT which is
@@ -515,7 +586,7 @@
on WIN32. Affected files are lib/silcutil/silclog_i.h and
silclog.c.
- * Rewrote WIN32 SILC Scheduler. It now handles non-blocking file
+ * Rewrote WIN32 SILC Scheduler. It now handles non-blocking file
descriptors and sockets better. Though, room for optimization
remains. Affected file is lib/silcutil/win32/silcwin32schedule.c.
Modified: silc-toolkit/trunk/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/Makefile.am?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/Makefile.am (original)
+++ silc-toolkit/trunk/Makefile.am Sat Nov 24 19:12:42 2007
@@ -2,7 +2,7 @@
# To make changes edit the ./Makefile.ad file in the source tree.
# Source: ./Makefile.ad
-# Generated: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:22:00 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/Makefile.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/Makefile.in (original)
+++ silc-toolkit/trunk/Makefile.in Sat Nov 24 19:12:42 2007
@@ -18,7 +18,7 @@
# To make changes edit the ./Makefile.ad file in the source tree.
# Source: ./Makefile.ad
-# Generated: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:22:00 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/TODO
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/TODO?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/TODO (original)
+++ silc-toolkit/trunk/TODO Sat Nov 24 19:12:42 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-toolkit/trunk/apps/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/apps/Makefile.am?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/apps/Makefile.am (original)
+++ silc-toolkit/trunk/apps/Makefile.am Sat Nov 24 19:12:42 2007
@@ -2,7 +2,7 @@
# To make changes edit the ./apps/Makefile.ad file in the source tree.
# Source: ./apps/Makefile.ad
-# Generated: Sun Sep 9 17:58:51 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/apps/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/apps/Makefile.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/apps/Makefile.in (original)
+++ silc-toolkit/trunk/apps/Makefile.in Sat Nov 24 19:12:42 2007
@@ -18,7 +18,7 @@
# To make changes edit the ./apps/Makefile.ad file in the source tree.
# Source: ./apps/Makefile.ad
-# Generated: Sun Sep 9 17:58:51 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/configure
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/configure?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/configure (original)
+++ silc-toolkit/trunk/configure Sat Nov 24 19:12:42 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.3.
+# Generated by GNU Autoconf 2.61 for Toolkit 1.1.5.
#
# 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.3'
-PACKAGE_STRING='Toolkit 1.1.3'
+PACKAGE_VERSION='1.1.5'
+PACKAGE_STRING='Toolkit 1.1.5'
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.3 to adapt to many kinds of systems.
+\`configure' configures Toolkit 1.1.5 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.3:";;
+ short | recursive ) echo "Configuration of Toolkit 1.1.5:";;
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.3
+Toolkit configure 1.1.5
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.3, which was
+It was created by Toolkit $as_me 1.1.5, 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.3'
+ VERSION='1.1.5'
cat >>confdefs.h <<_ACEOF
@@ -25792,7 +25792,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
@@ -25838,7 +25842,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
@@ -30194,12 +30202,12 @@
# libsilc versions
LIBSILC_CURRENT=3 # prev = 2
-LIBSILC_REVISION=0 # prev = 0
+LIBSILC_REVISION=0 # prev = 1
LIBSILC_AGE=1 # prev = 1
# libsilcclient versions
LIBSILCCLIENT_CURRENT=2 # prev = 1
-LIBSILCCLIENT_REVISION=0 # prev = 0
+LIBSILCCLIENT_REVISION=0 # prev = 1
LIBSILCCLIENT_AGE=0 # prev = 0
# libsilcserver versions
@@ -31703,7 +31711,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.3, which was
+This file was extended by Toolkit $as_me 1.1.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -31756,7 +31764,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Toolkit config.status 1.1.3
+Toolkit config.status 1.1.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Modified: silc-toolkit/trunk/configure.ac
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/configure.ac?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/configure.ac (original)
+++ silc-toolkit/trunk/configure.ac Sat Nov 24 19:12:42 2007
@@ -2,7 +2,7 @@
# To make changes edit the configure.ad file in the source tree.
# Source: configure.ad
-# Generated: Sun Sep 9 17:58:53 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:22:00 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
@@ -23,7 +23,7 @@
# information.
#
-AC_INIT([Toolkit], [1.1.3], [silc-devel at lists.silcnet.org], [silc-toolkit])
+AC_INIT([Toolkit], [1.1.5], [silc-devel at lists.silcnet.org], [silc-toolkit])
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE
AC_PREREQ(2.52)
@@ -360,13 +360,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
@@ -1312,12 +1320,12 @@
# libsilc versions
LIBSILC_CURRENT=3 # prev = 2
-LIBSILC_REVISION=0 # prev = 0
+LIBSILC_REVISION=0 # prev = 1
LIBSILC_AGE=1 # prev = 1
# libsilcclient versions
LIBSILCCLIENT_CURRENT=2 # prev = 1
-LIBSILCCLIENT_REVISION=0 # prev = 0
+LIBSILCCLIENT_REVISION=0 # prev = 1
LIBSILCCLIENT_AGE=0 # prev = 0
# libsilcserver versions
Modified: silc-toolkit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/changelog?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/debian/changelog (original)
+++ silc-toolkit/trunk/debian/changelog Sat Nov 24 19:12:42 2007
@@ -1,5 +1,9 @@
-silc-toolkit (1.1.3-2) UNRELEASED; urgency=low
+silc-toolkit (1.1.5-1) UNRELEASED; urgency=low
+ [ Micah Anderson ]
+ * New upstream release
+
+ [ Jérémy Bobbio ]
* Make the clean rule policy compliant. (Closes: #442731)
* Fix debian/copyright issues mentioned by ftpmaster.
Modified: silc-toolkit/trunk/doc/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/doc/Makefile.am?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/doc/Makefile.am (original)
+++ silc-toolkit/trunk/doc/Makefile.am Sat Nov 24 19:12:42 2007
@@ -2,7 +2,7 @@
# To make changes edit the ./doc/Makefile.ad file in the source tree.
# Source: ./doc/Makefile.ad
-# Generated: Sun Sep 9 17:58:51 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/doc/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/doc/Makefile.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/doc/Makefile.in (original)
+++ silc-toolkit/trunk/doc/Makefile.in Sat Nov 24 19:12:42 2007
@@ -18,7 +18,7 @@
# To make changes edit the ./doc/Makefile.ad file in the source tree.
# Source: ./doc/Makefile.ad
-# Generated: Sun Sep 9 17:58:51 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/doc/silcalgs.conf
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/doc/silcalgs.conf?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/doc/silcalgs.conf (original)
+++ silc-toolkit/trunk/doc/silcalgs.conf Sat Nov 24 19:12:42 2007
@@ -18,13 +18,28 @@
# of the cipher (bytes).
#
cipher {
+ name = "aes-256-ctr";
+ keylength = 32;
+ blocklength = 16;
+};
+cipher {
name = "aes-256-cbc";
keylength = 32;
blocklength = 16;
};
cipher {
+ name = "aes-192-ctr";
+ keylength = 24;
+ blocklength = 16;
+};
+cipher {
name = "aes-192-cbc";
keylength = 24;
+ blocklength = 16;
+};
+cipher {
+ name = "aes-128-ctr";
+ keylength = 16;
blocklength = 16;
};
cipher {
@@ -47,13 +62,6 @@
keylength = 16;
blocklength = 16;
};
-
-# "none" cipher should not be used
-#cipher {
-# name = "none";
-# keylength = 0;
-# blocklength = 0;
-#};
#
# Configured hash functions
@@ -107,6 +115,6 @@
#
# Configured PKCS
#
-PKCS {
- name = "rsa";
+PKCS {
+ name = "rsa";
};
Modified: silc-toolkit/trunk/doc/toolkit/index.html
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/doc/toolkit/index.html?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/doc/toolkit/index.html (original)
+++ silc-toolkit/trunk/doc/toolkit/index.html Sat Nov 24 19:12:42 2007
@@ -63,9 +63,9 @@
<big><b>SILC Toolkit Reference Manual</b></big>
<br />
<small>
-Version: 1.1.3<br />
+Version: 1.1.5<br />
Copyright © 1997 - 2007 The SILC Project<br />
-Updated: Sun Sep 9 18:01:29 EEST 2007
+Updated: Sun Nov 11 14:23:32 EET 2007
</small>
<br /><br /><br />
Welcome to the SILC Toolkit Reference Manual. The manual is a complete
Modified: silc-toolkit/trunk/doc/toolkit/silcpacket-silc_packet_engine_get_streams.html
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/doc/toolkit/silcpacket-silc_packet_engine_get_streams.html?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/doc/toolkit/silcpacket-silc_packet_engine_get_streams.html (original)
+++ silc-toolkit/trunk/doc/toolkit/silcpacket-silc_packet_engine_get_streams.html Sat Nov 24 19:12:42 2007
@@ -169,6 +169,14 @@
Returns list of packet streams added to the packet engine. The caller
must free the list with <A HREF="silcpacket-silc_packet_engine_free_streams_list.html">silc_packet_engine_free_streams_list</A>.
+</FONT></PRE><FONT SIZE="+1"><B>
+<FONT COLOR="#000055">NOTES
+</FONT></B></FONT>
+<PRE><FONT FACE="Helvetiva,Arial,Sans-serif">
+ This function may also return disconnected and destroyed streams. The
+ caller should use <A HREF="silcpacket-silc_packet_stream_is_valid.html">silc_packet_stream_is_valid</A> to check if the stream
+ is valid.
+
</FONT></PRE>
<br /><br /><br /><br />
</td></tr>
Modified: silc-toolkit/trunk/includes/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/includes/Makefile.am?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/includes/Makefile.am (original)
+++ silc-toolkit/trunk/includes/Makefile.am Sat Nov 24 19:12:42 2007
@@ -2,7 +2,7 @@
# To make changes edit the ./includes/Makefile.ad file in the source tree.
# Source: ./includes/Makefile.ad
-# Generated: Sun Sep 9 17:58:50 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/includes/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/includes/Makefile.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/includes/Makefile.in (original)
+++ silc-toolkit/trunk/includes/Makefile.in Sat Nov 24 19:12:42 2007
@@ -18,7 +18,7 @@
# To make changes edit the ./includes/Makefile.ad file in the source tree.
# Source: ./includes/Makefile.ad
-# Generated: Sun Sep 9 17:58:50 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/includes/silc.h.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/includes/silc.h.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/includes/silc.h.in (original)
+++ silc-toolkit/trunk/includes/silc.h.in Sat Nov 24 19:12:42 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-toolkit/trunk/includes/silcdistdefs.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/includes/silcdistdefs.h?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/includes/silcdistdefs.h (original)
+++ silc-toolkit/trunk/includes/silcdistdefs.h Sat Nov 24 19:12:42 2007
@@ -1,7 +1,7 @@
/*
Automatically generated by Autodist 1.3.2. Do not edit.
- Generated: Sun Sep 9 17:58:49 EEST 2007 by priikone
+ Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
Distribution: Toolkit
License: distdir/TOOLKIT
*/
Modified: silc-toolkit/trunk/lib/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/Makefile.am?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/Makefile.am (original)
+++ silc-toolkit/trunk/lib/Makefile.am Sat Nov 24 19:12:42 2007
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/Makefile.ad file in the source tree.
# Source: ./lib/Makefile.ad
-# Generated: Sun Sep 9 17:58:51 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
@@ -11,7 +11,7 @@
#
# Author: Pekka Riikonen <priikone at silcnet.org>
#
-# Copyright (C) 2000 - 2005 Pekka Riikonen
+# Copyright (C) 2000 - 2005, 2007 Pekka Riikonen
#
# The contents of this file are subject to one of the Licenses specified
# in the COPYING file; You may not use this file except in compliance
@@ -38,18 +38,18 @@
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_LIBS=$(LIBS)
-SILCCLIENT_LIBS=$(LIBS) -lsilc
+SILC_LINK_LIBS=$(LIBS)
+SILCCLIENT_LINK_LIBS=$(LIBS) -lsilc
SILCSERVER_LIBS=$(LIBS) -lsilc
else
-SILC_LIBS=
-SILCCLIENT_LIBS=
+SILC_LINK_LIBS=
+SILCCLIENT_LINK_LIBS=
SILCSERVER_LIBS=
endif
@@ -82,14 +82,14 @@
LIBSILC_AGE=@LIBSILC_AGE@
libsilc.a:
- find $(SILCLIB_DIRS) -type f -name *.lo | xargs $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(SILC_LIBS) $(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) $(SILCCLIENT_LIBS) $(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
pkgconfigdir = $(libdir)/pkgconfig
Modified: silc-toolkit/trunk/lib/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/Makefile.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/Makefile.in (original)
+++ silc-toolkit/trunk/lib/Makefile.in Sat Nov 24 19:12:42 2007
@@ -18,7 +18,7 @@
# To make changes edit the ./lib/Makefile.ad file in the source tree.
# Source: ./lib/Makefile.ad
-# Generated: Sun Sep 9 17:58:51 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
@@ -27,7 +27,7 @@
#
# Author: Pekka Riikonen <priikone at silcnet.org>
#
-# Copyright (C) 2000 - 2005 Pekka Riikonen
+# Copyright (C) 2000 - 2005, 2007 Pekka Riikonen
#
# The contents of this file are subject to one of the Licenses specified
# in the COPYING file; You may not use this file except in compliance
@@ -289,10 +289,10 @@
@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@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
@SILC_WIN32_FALSE at SILCSERVER_LIBS =
@SILC_WIN32_TRUE at SILCSERVER_LIBS = $(LIBS) -lsilc
SILCLIB = libsilc.a
@@ -675,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) $(SILC_LIBS) $(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) $(SILCCLIENT_LIBS) $(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
toolkit-install:
-mkdir -p $(docdir)/toolkit/
-$(INSTALL_DATA) $(top_srcdir)/doc/toolkit/* $(docdir)/toolkit
Modified: silc-toolkit/trunk/lib/contrib/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/contrib/Makefile.am?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/contrib/Makefile.am (original)
+++ silc-toolkit/trunk/lib/contrib/Makefile.am Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:22:00 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/contrib/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/contrib/Makefile.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/contrib/Makefile.in (original)
+++ silc-toolkit/trunk/lib/contrib/Makefile.in Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:22:00 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcapputil/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcapputil/Makefile.am?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcapputil/Makefile.am (original)
+++ silc-toolkit/trunk/lib/silcapputil/Makefile.am Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:22:00 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcapputil/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcapputil/Makefile.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcapputil/Makefile.in (original)
+++ silc-toolkit/trunk/lib/silcapputil/Makefile.in Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:22:00 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcasn1/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcasn1/Makefile.am?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcasn1/Makefile.am (original)
+++ silc-toolkit/trunk/lib/silcasn1/Makefile.am Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:51 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcasn1/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcasn1/Makefile.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcasn1/Makefile.in (original)
+++ silc-toolkit/trunk/lib/silcasn1/Makefile.in Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:51 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcclient/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcclient/Makefile.am?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcclient/Makefile.am (original)
+++ silc-toolkit/trunk/lib/silcclient/Makefile.am Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcclient/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcclient/Makefile.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcclient/Makefile.in (original)
+++ silc-toolkit/trunk/lib/silcclient/Makefile.in Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcclient/client_entry.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcclient/client_entry.c?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcclient/client_entry.c (original)
+++ silc-toolkit/trunk/lib/silcclient/client_entry.c Sat Nov 24 19:12:42 2007
@@ -16,7 +16,7 @@
information.
*/
-/* $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-toolkit/trunk/lib/silcclient/client_entry.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcclient/client_entry.h?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcclient/client_entry.h (original)
+++ silc-toolkit/trunk/lib/silcclient/client_entry.h Sat Nov 24 19:12:42 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-toolkit/trunk/lib/silcclient/client_keyagr.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcclient/client_keyagr.c?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcclient/client_keyagr.c (original)
+++ silc-toolkit/trunk/lib/silcclient/client_keyagr.c Sat Nov 24 19:12:42 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-toolkit/trunk/lib/silccore/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silccore/Makefile.am?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silccore/Makefile.am (original)
+++ silc-toolkit/trunk/lib/silccore/Makefile.am Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:51 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silccore/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silccore/Makefile.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silccore/Makefile.in (original)
+++ silc-toolkit/trunk/lib/silccore/Makefile.in Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:51 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silccore/silcattrs.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silccore/silcattrs.c?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silccore/silcattrs.c (original)
+++ silc-toolkit/trunk/lib/silccore/silcattrs.c Sat Nov 24 19:12:42 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-toolkit/trunk/lib/silccore/silcpacket.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silccore/silcpacket.c?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silccore/silcpacket.c (original)
+++ silc-toolkit/trunk/lib/silccore/silcpacket.c Sat Nov 24 19:12:42 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-toolkit/trunk/lib/silccore/silcpacket.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silccore/silcpacket.h?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silccore/silcpacket.h (original)
+++ silc-toolkit/trunk/lib/silccore/silcpacket.h Sat Nov 24 19:12:42 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-toolkit/trunk/lib/silccrypt/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silccrypt/Makefile.am?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silccrypt/Makefile.am (original)
+++ silc-toolkit/trunk/lib/silccrypt/Makefile.am Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:22:00 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silccrypt/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silccrypt/Makefile.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silccrypt/Makefile.in (original)
+++ silc-toolkit/trunk/lib/silccrypt/Makefile.in Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:22:00 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silchttp/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silchttp/Makefile.am?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silchttp/Makefile.am (original)
+++ silc-toolkit/trunk/lib/silchttp/Makefile.am Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:22:00 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silchttp/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silchttp/Makefile.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silchttp/Makefile.in (original)
+++ silc-toolkit/trunk/lib/silchttp/Makefile.in Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:22:00 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcmath/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcmath/Makefile.am?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcmath/Makefile.am (original)
+++ silc-toolkit/trunk/lib/silcmath/Makefile.am Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:22:00 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcmath/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcmath/Makefile.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcmath/Makefile.in (original)
+++ silc-toolkit/trunk/lib/silcmath/Makefile.in Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:22:00 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcsftp/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcsftp/Makefile.am?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcsftp/Makefile.am (original)
+++ silc-toolkit/trunk/lib/silcsftp/Makefile.am Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:22:00 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcsftp/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcsftp/Makefile.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcsftp/Makefile.in (original)
+++ silc-toolkit/trunk/lib/silcsftp/Makefile.in Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:22:00 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcsim/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcsim/Makefile.am?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcsim/Makefile.am (original)
+++ silc-toolkit/trunk/lib/silcsim/Makefile.am Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcsim/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcsim/Makefile.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcsim/Makefile.in (original)
+++ silc-toolkit/trunk/lib/silcsim/Makefile.in Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcske/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcske/Makefile.am?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcske/Makefile.am (original)
+++ silc-toolkit/trunk/lib/silcske/Makefile.am Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcske/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcske/Makefile.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcske/Makefile.in (original)
+++ silc-toolkit/trunk/lib/silcske/Makefile.in Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcske/silcconnauth.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcske/silcconnauth.c?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcske/silcconnauth.c (original)
+++ silc-toolkit/trunk/lib/silcske/silcconnauth.c Sat Nov 24 19:12:42 2007
@@ -591,14 +591,15 @@
/* Allocate search constraints for finding the key */
find = silc_skr_find_alloc();
- if (!find || !connauth->auth_data) {
+ if (!find || !connauth->auth_data || !connauth->ske->prop->public_key) {
/** Out of memory */
silc_fsm_next(fsm, silc_connauth_st_responder_failure);
return SILC_FSM_CONTINUE;
}
- silc_skr_find_set_pkcs_type(find, connauth->ske->pk_type);
- silc_skr_find_set_public_key(find, connauth->ske->public_key);
+ silc_skr_find_set_pkcs_type(
+ find, silc_pkcs_get_type(connauth->ske->prop->public_key));
+ silc_skr_find_set_public_key(find, connauth->ske->prop->public_key);
silc_skr_find_set_usage(find, (SILC_SKR_USAGE_AUTH |
SILC_SKR_USAGE_KEY_AGREEMENT));
@@ -652,6 +653,8 @@
silc_free(connauth->auth_data);
+ SILC_LOG_DEBUG(("Signature is Ok"));
+
/** Authentication successful */
silc_fsm_next(fsm, silc_connauth_st_responder_success);
return SILC_FSM_CONTINUE;
Modified: silc-toolkit/trunk/lib/silcske/silcske.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcske/silcske.c?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcske/silcske.c (original)
+++ silc-toolkit/trunk/lib/silcske/silcske.c Sat Nov 24 19:12:42 2007
@@ -16,7 +16,7 @@
information.
*/
-/* $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-toolkit/trunk/lib/silcskr/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcskr/Makefile.am?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcskr/Makefile.am (original)
+++ silc-toolkit/trunk/lib/silcskr/Makefile.am Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:51 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcskr/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcskr/Makefile.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcskr/Makefile.in (original)
+++ silc-toolkit/trunk/lib/silcskr/Makefile.in Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:51 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcskr/silcskr.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcskr/silcskr.c?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcskr/silcskr.c (original)
+++ silc-toolkit/trunk/lib/silcskr/silcskr.c Sat Nov 24 19:12:42 2007
@@ -492,6 +492,9 @@
{
SilcSKRKeyInternal key;
SilcSKRStatus status = SILC_SKR_ERROR;
+#if defined(SILC_DEBUG)
+ char tmp[256];
+#endif /* SILC_DEBUG */
SILC_LOG_DEBUG(("Adding SILC public key"));
@@ -515,6 +518,12 @@
key->key.usage = usage;
key->key.key = public_key;
key->key.key_context = key_context;
+
+#if defined(SILC_DEBUG)
+ silc_skr_type_string(SILC_SKR_FIND_USAGE, SILC_32_TO_PTR(usage),
+ tmp, sizeof(tmp) - 1);
+ SILC_LOG_DEBUG(("Search cons %s", tmp));
+#endif /* SILC_DEBUG */
/* Add key specifics */
Modified: silc-toolkit/trunk/lib/silcutil/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcutil/Makefile.am?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcutil/Makefile.am (original)
+++ silc-toolkit/trunk/lib/silcutil/Makefile.am Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:51 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcutil/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcutil/Makefile.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcutil/Makefile.in (original)
+++ silc-toolkit/trunk/lib/silcutil/Makefile.in Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:51 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcutil/silcatomic.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcutil/silcatomic.h?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcutil/silcatomic.h (original)
+++ silc-toolkit/trunk/lib/silcutil/silcatomic.h Sat Nov 24 19:12:42 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))
@@ -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))
Modified: silc-toolkit/trunk/lib/silcutil/unix/silcunixnet.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcutil/unix/silcunixnet.c?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcutil/unix/silcunixnet.c (original)
+++ silc-toolkit/trunk/lib/silcutil/unix/silcunixnet.c Sat Nov 24 19:12:42 2007
@@ -16,7 +16,7 @@
information.
*/
-/* $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-toolkit/trunk/lib/silcutil/win32/silcwin32schedule.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcutil/win32/silcwin32schedule.c?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcutil/win32/silcwin32schedule.c (original)
+++ silc-toolkit/trunk/lib/silcutil/win32/silcwin32schedule.c Sat Nov 24 19:12:42 2007
@@ -16,7 +16,7 @@
information.
*/
-/* $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-toolkit/trunk/lib/silcvcard/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcvcard/Makefile.am?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcvcard/Makefile.am (original)
+++ silc-toolkit/trunk/lib/silcvcard/Makefile.am Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/lib/silcvcard/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcvcard/Makefile.in?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcvcard/Makefile.in (original)
+++ silc-toolkit/trunk/lib/silcvcard/Makefile.in Sat Nov 24 19:12:42 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: Sun Sep 9 17:58:52 EEST 2007 by priikone
+# Generated: Sun Nov 11 14:21:59 EET 2007 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
Modified: silc-toolkit/trunk/silc-toolkit.spec
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/silc-toolkit.spec?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/silc-toolkit.spec (original)
+++ silc-toolkit/trunk/silc-toolkit.spec Sat Nov 24 19:12:42 2007
@@ -1,6 +1,6 @@
Summary: SILC Toolkit
Name: silc-toolkit
-Version: 1.1.3
+Version: 1.1.5
Release: 0.fc7
License: GPL/BSD dual licensed
Group: System Environment/Libraries
Modified: silc-toolkit/trunk/win32/libsilcclient/libsilcclient.def
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/win32/libsilcclient/libsilcclient.def?rev=191&op=diff
==============================================================================
--- silc-toolkit/trunk/win32/libsilcclient/libsilcclient.def (original)
+++ silc-toolkit/trunk/win32/libsilcclient/libsilcclient.def Sat Nov 24 19:12:42 2007
@@ -72,3 +72,4 @@
silc_client_private_message_wait_uninit @ 71 ;
silc_client_send_private_message @ 72 ;
silc_client_set_away_message @ 73 ;
+ silc_client_stop @ 74 ;
More information about the Pkg-silc-commits
mailing list