Merge branch 'silc.1.1.branch' of silc repo
authorPekka Riikonen <priikone@silcnet.org>
Mon, 9 Jun 2008 13:50:02 +0000 (16:50 +0300)
committerPekka Riikonen <priikone@silcnet.org>
Mon, 9 Jun 2008 13:50:02 +0000 (16:50 +0300)
Conflicts:

CHANGES
Makefile.ad
Makefile.defines_int.in
README.PLUGIN
TODO
apps/Makefile.ad
apps/autodist/CHANGES
apps/autodist/autodist.in
apps/autodist/doc/autodist.1.in
apps/autodist/doc/autodist.texi
apps/irssi/Makefile.am
apps/irssi/configure.ad
apps/irssi/configure.in
apps/irssi/docs/Makefile.am
apps/irssi/docs/help/Makefile.am.gen
apps/irssi/docs/help/in/cmode.in
apps/irssi/docs/help/in/cumode.in
apps/irssi/docs/help/in/key.in
apps/irssi/scripts/Makefile.am
apps/irssi/scripts/examples/Makefile.am
apps/irssi/src/Makefile.am
apps/irssi/src/core/Makefile.am
apps/irssi/src/core/modules-load.c
apps/irssi/src/fe-common/silc/Makefile.am
apps/irssi/src/fe-common/silc/fe-common-silc.c
apps/irssi/src/fe-common/silc/fe-silc-messages.c
apps/irssi/src/fe-common/silc/module-formats.c
apps/irssi/src/fe-text/Makefile.am
apps/irssi/src/perl/Makefile.am
apps/irssi/src/silc/core/Makefile.am
apps/irssi/src/silc/core/client_ops.c
apps/irssi/src/silc/core/clientutil.c
apps/irssi/src/silc/core/silc-core.c
apps/irssi/src/silc/core/silc-servers.c
apps/silcd/Makefile.am
apps/silcd/command.c
apps/silcd/command_reply.c
apps/silcd/idlist.c
apps/silcd/idlist.h
apps/silcd/packet_receive.c
apps/silcd/packet_send.c
apps/silcd/server.c
apps/silcd/server.h
apps/silcd/server_backup.c
apps/silcd/server_http.c
apps/silcd/server_internal.h
apps/silcd/server_query.c
apps/silcd/server_query.h
apps/silcd/server_util.c
apps/silcd/server_util.h
apps/silcd/serverconfig.c
apps/silcd/serverconfig.h
apps/silcd/serverid.c
apps/silcd/silcd.c
configure.ad
distdir/autodist
distdir/client
distdir/common
distdir/default
distdir/post-dist
distdir/pre-dist-client
distdir/pre-dist-toolkit
distdir/server
distdir/toolkit
doc/Makefile.ad
doc/example_silcd.conf.in
doc/examples/silcd.prv
doc/examples/silcd.pub
doc/silcalgs.conf
doc/silcd.conf.yo
includes/silc.h.in
includes/silcversion.h.in
lib/Makefile.ad
lib/configure.ad
lib/contrib/Makefile.ad
lib/doc/command_reply_args.html
lib/doc/notifyargs.html
lib/doc/porting.html
lib/doc/silcclient_using.html
lib/silcapputil/silcapputil.c
lib/silcapputil/silcidcache.c
lib/silcapputil/silcidcache.h
lib/silcasn1/silcasn1_decode.c
lib/silcasn1/silcasn1_encode.c
lib/silcclient/client.c
lib/silcclient/client_connect.c
lib/silcclient/client_entry.c
lib/silcclient/client_entry.h
lib/silcclient/client_keyagr.c
lib/silcclient/client_notify.c
lib/silcclient/client_register.c
lib/silcclient/command.c
lib/silcclient/command_reply.c
lib/silcclient/silcclient.h
lib/silcclient/silcclient_entry.h
lib/silccore/DIRECTORY
lib/silccore/README
lib/silccore/silcargument.c
lib/silccore/silcattrs.c
lib/silccore/silcnotify.c
lib/silccore/silcpacket.c
lib/silccore/silcpacket.h
lib/silccrypt/Makefile.ad
lib/silccrypt/aes.c
lib/silccrypt/aes_x86.asm
lib/silccrypt/aes_x86_64.asm
lib/silccrypt/ciphers.h
lib/silccrypt/configure.ad
lib/silccrypt/rijndael_internal.h
lib/silccrypt/silccipher.c
lib/silccrypt/silcpk.c
lib/silccrypt/silcpkcs.c
lib/silccrypt/silcpkcs1.c
lib/silcmath/configure.ad
lib/silcsftp/sftp_client.c
lib/silcsftp/sftp_fs_memory.c
lib/silcsim/Makefile.ad
lib/silcske/silcconnauth.c
lib/silcske/silcske.c
lib/silcske/silcske.h
lib/silcskr/silcskr.c
lib/silcutil/silcatomic.h
lib/silcutil/silcbuffer.h
lib/silcutil/silcbuffmt.c
lib/silcutil/silcdlist.h
lib/silcutil/silcfsm.c
lib/silcutil/silclog.c
lib/silcutil/silcmime.c
lib/silcutil/silcnet.h
lib/silcutil/silcschedule.c
lib/silcutil/silcschedule.h
lib/silcutil/silcschedule_i.h
lib/silcutil/silcsocketstream_i.h
lib/silcutil/silcstack.h
lib/silcutil/silctime.c
lib/silcutil/silcutil.c
lib/silcutil/stacktrace.c
lib/silcutil/tests/test_silcschedule.c
lib/silcutil/unix/silcunixnet.c
lib/silcutil/unix/silcunixthread.c
tutorial/mybot/Makefile
tutorial/mybot/mybot.c
win32/libsilc/libsilc.def
win32/libsilcclient/libsilcclient.def

1  2 
CHANGES
distdir/post-dist
lib/silcutil/silcbuffmt.c
lib/silcutil/silcconfig.c
lib/silcutil/silcfdstream.c
lib/silcutil/silcsocketstream.c
lib/silcutil/silcsocketstream_i.h
lib/silcutil/unix/silcunixnet.c
lib/silcutil/unix/silcunixschedule.c
lib/silcutil/unix/silcunixsocketstream.c

diff --cc CHANGES
index c5f1ab5111d546ea09568ecaad423ac39a62ea4f,128c76fc0e4f0c678163c10a901c6b3d6d69f297..9128a66f2e584adfbce11922e600ca969e654456
+++ b/CHANGES
 -      
+ Thu Mar 13 13:31:35 EET 2008  Pekka Riikonen <priikone@silcnet.org>
+       * Fixed silcd crash in NEW_CLIENT packet handling when nickname
+         is not present in the packet.  Affected files are
+         apps/silcd/packet_receive.c.
+ Fri Feb 22 16:12:27 EET 2008  Pekka Riikonen <priikone@silcnet.org>
+       * Fixed partial encryption in CTR mode in AES.  Change does not
+         affect interoperability in SILC due to the way CTR is used in
+         SILC.  But, fixed anyway.  Affected files are
+         lib/silccrypt/aes.c and rijndael_internal.h.
+ Tue Jan  8 09:41:57 EET 2008  Pekka Riikonen <priikone@silcnet.org>
+       * Fixed printable fingerprint bufferoverlfow, RedHat bug 372021.
+         Affected file is lib/silcutil/silcutil.c.
+ Sun Dec 30 14:00:46 EET 2007  Pekka Riikonen <priikone@silcnet.org>
+       * Fixed unix signal delivery in SILC scheduler.  Affected file
+         is lib/silcutil/unix/silcunixschedule.c.
+ Sun Nov 18 16:43:04 CET 2007  Jochen Eisinger <coffee@silcnet.org>
+       * Add -avoid-version and -rpath flags when compiling the plugin.
+         Affected file is apps/irssi/src/fe-common/silc/Makefile.in
+ Thu Nov 15 18:03:53 EET 2007  Pekka Riikonen <priikone@silcnet.org>
+       * Reprocess JOIN command synchronously after resolving channel
+         user list.  Affected file is lib/silcclient/command_reply.c.
+       * In JOIN command reply check if the channel key is already
+         saved.  If it is we have received new key from server while
+         resolving user and must not save the old key.  Affected file
+         is lib/silcclient/command_reply.c.
+       * Remove all channel keys and hmacs after giving LEAVE command.
+         Affected file is lib/silcclient/command_reply.c.
+ Tue Nov 13 18:24:56 EET 2007  Pekka Riikonen <priikone@silcnet.org>
+       * Added missing channel unreferencing in CMODE, CUMODE,
+         TOPIC, INVITE, BAN and KICK command replies.  Affected
+         file is lib/silcclient/command_reply.c.
+ Sun Nov 11 23:04:54 EET 2007 Pekka Riikonen <priikone@silcnet.org>
+       * Free stream data and abort ongoing protocols correctly
+         for primary router connections receiving end of stream.
+         Affected file is apps/silcd/server.c.
+ Sun Nov 11 16:02:12 EET 2007 Pekka Riikonen <priikone@silcnet.org>
+       * SILC Server 1.1 Beta4.
+ Sun Nov 11 14:15:48 EET 2007  Pekka Riikonen <priikone@silcnet.org>
+       * SILC Toolkit 1.1.5.
++
+ Sun Nov 11 11:22:35 EET 2007  Pekka Riikonen <priikone@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@silcnet.org>
+       * SILC Client 1.1.3.
+ Mon Nov  5 23:07:58 EET 2007  Pekka Riikonen <priikone@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@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@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@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@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@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@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@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@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@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@silcnet.org>
+       * SILC Toolkit 1.1.2.
+       * SILC Client 1.1.2.
+ Mon Jul  2 17:28:47 CEST 2007  Pekka Riikonen <priikone@silcnet.org>
+       * In silc_client_free check that scheduler is allocated before
+         trying to free it.  Affected file is lib/silcclient/client.c.
+       * Fixed buffer overflow in NICK_CHANGE notify.  The destination
+         buffer for old nickname was too small.  Affected file is
+         lib/silclient/client_notify.c.
  Sun Jul  1 19:15:15 EEST 2007  Pekka Riikonen <priikone@silcnet.org>
  
        * SILC Server 1.1 Beta1.
index cf1f93bdc670098ac3fc24250688dfee898ee5c3,8323ec7e3e6b713952a36784f10838dc61f8916a..3f27c9e9a5d58b7b290c1beadf1a8f49c031d262
@@@ -6,8 -6,9 +6,8 @@@ package=$
  distdir=$4
  
  if test -f $distdir.tar.gz; then
-   sha1sum $distdir.tar.gz > $distdir.tar.gz.sha1
+   sha512sum $distdir.tar.gz > $distdir.tar.gz.sum
  fi
  if test -f $distdir.tar.bz2; then
-   sha1sum $distdir.tar.bz2 > $distdir.tar.bz2.sha1
+   sha512sum $distdir.tar.bz2 > $distdir.tar.bz2.sum
  fi
 -
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge