From b496cc008a9a29d09bdcf269da4821a81d44b37d Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Thu, 6 Jul 2000 07:09:22 +0000 Subject: [PATCH] updates --- CHANGES | 26 +++++++++++++++++++++++++- README | 4 ---- apps/silcd/server_version.c | 2 +- configure.in | 2 +- doc/draft-riikonen-silc-spec-00.nroff | 25 ++++++++++++++++--------- doc/example_silc.conf | 4 ++-- doc/example_silcd.conf | 14 +++++++------- includes/version.h | 2 +- public_html/faq.html | 2 +- public_html/index.html | 15 +++++++++++++++ public_html/todo.html | 16 ++++++---------- 11 files changed, 75 insertions(+), 37 deletions(-) diff --git a/CHANGES b/CHANGES index 27de725c..1e48e0d1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,27 @@ +Wed Jul 5 19:19:02 EEST 2000 Pekka Riikonen + + * Added into silcpkcs[ch]: silc_pkcs_public_key[_data]_set and + silc_pkcs_private_key[_data]_set. + + * Made the password and public authentication more cleaner in + server's protocol.c. + + * Removed historic and obsolete protocol `channel_auth' from + both client and server. + + * Removed wrong way of sending command status messages from + server to client in server's command.c. The old way violated + protocol specification. + + Changes to silccore/silccommand.[ch]: removed + silc_command_encode_status_payload -> not needed anymore, + changed silc_command_encode_payload_va to accept extra + argument on variable argument list. The argument type must + now be provided to the function. Also, added new function: + silc_command_encode_reply_payload_va which is same as + normal command_encode_payload_va except command status type + is provided as extra argument. + Tue Jul 4 18:26:39 EEST 2000 Pekka Riikonen * Added ~./silc directory handling. The directory includes the @@ -31,7 +55,7 @@ Mon Jul 3 18:51:27 EEST 2000 Pekka Riikonen * Implemented NAMES command on client and server. The server side supports currently only normal server not router server yet. - Some changes to NAMES definition is SILC Protocol Specification. + Some changes to NAMES definition in SILC protocol specification. Sun Jul 2 18:23:01 EEST 2000 Pekka Riikonen diff --git a/README b/README index 9b94d5ca..b4ed9738 100644 --- a/README +++ b/README @@ -71,10 +71,6 @@ Following commands has been, at least partly, implemented: Leaves the channel. If /leave * is given the client leaves the current channel. - /NAMES - - Lists clients currently joined to the channel. - /MSG Sends private message to remote client. Support for diff --git a/apps/silcd/server_version.c b/apps/silcd/server_version.c index 7f392c4d..683dbbe6 100644 --- a/apps/silcd/server_version.c +++ b/apps/silcd/server_version.c @@ -20,4 +20,4 @@ #include "serverincludes.h" -const char server_version[] = "07072000"; +const char server_version[] = "06072000"; diff --git a/configure.in b/configure.in index c0720a16..4f7dd097 100644 --- a/configure.in +++ b/configure.in @@ -33,7 +33,7 @@ case "$target" in ;; esac -AM_INIT_AUTOMAKE(silc, 07072000) +AM_INIT_AUTOMAKE(silc, 06072000) AC_PREREQ(2.3) AM_CONFIG_HEADER(includes/silcdefs.h) diff --git a/doc/draft-riikonen-silc-spec-00.nroff b/doc/draft-riikonen-silc-spec-00.nroff index e3f5d3aa..a0dd359f 100644 --- a/doc/draft-riikonen-silc-spec-00.nroff +++ b/doc/draft-riikonen-silc-spec-00.nroff @@ -545,13 +545,15 @@ distributing it to the router. .ti 0 3.2.3 SILC Server Ports -SILC uses currently TCP port 334 on SILC network. However, this is not -official port assigned for SILC. Official port has been requested by -the IANA. +Following ports has been assigned by IANA for the SILC protocol: + +.in 10 +silc 706/tcp SILC +silc 706/udp SILC +.in 3 If there are needs to create new SILC networks in the future the port -numbers must be officially assigned by the IANA. Most convenience case -would be to assign port numbers upwards from 334. +numbers must be officially assigned by the IANA. Server on network above privileged ports (>1023) should not be trusted as they could have been set up by untrusted party. @@ -2693,10 +2695,15 @@ List of all defined commands in SILC follows. Max Arguments: 3 Arguments: (1) (2) - (3) - - This command replies with the comma separated list of users on - the channel and the Channel ID of the channel requested. + (3) (4) + + This command replies with the Channel ID of the requested channel, + comma separated list of users on the channel and Client ID list + of the users on the list. The Client ID list has Client ID's + of all users in the list. First Client ID in the list must be + the Client ID of the first user in . The Client ID + List is formed by adding Client ID's each after each. Note that + the Client ID list is binary data. Status messages: diff --git a/doc/example_silc.conf b/doc/example_silc.conf index 65adef9f..8dbe7ef9 100644 --- a/doc/example_silc.conf +++ b/doc/example_silc.conf @@ -41,7 +41,7 @@ sha1::64:20 # maybe `passwd' or `pubkey'. # [connection] -#lassi.kuo.fi.ssh.com:passwd::334 +#lassi.kuo.fi.ssh.com:passwd::706 # # Commands. These are executed when SILC client is run. Normal @@ -50,4 +50,4 @@ sha1::64:20 # Format: # [commands] -/server silc.pspt.fi:334 +/server silc.pspt.fi diff --git a/doc/example_silcd.conf b/doc/example_silcd.conf index 2a814b6f..26b6ef13 100644 --- a/doc/example_silcd.conf +++ b/doc/example_silcd.conf @@ -5,7 +5,7 @@ # # If the cipher is builtin the maybe omitted. # -[cipher] +[Cipher] twofish:../lib/silcsim/modules/twofish.sim.so:16:16 rc6:../lib/silcsim/modules/rc6.sim.so:16:16 mars:../lib/silcsim/modules/mars.sim.so:16:16 @@ -18,7 +18,7 @@ none:../lib/silcsim/modules/none.sim.so:0:0 # # If the hash function is builtin the maybe omitted. # -[hash] +[FashFunction] md5::64:16 sha1::64:20 @@ -29,7 +29,7 @@ sha1::64:20 # # NOTE: must be omitted as PKCS cannot be modules currently. # -#[pkcs] +#[PKCS] #rsa::1024 #dss::1024 @@ -47,7 +47,7 @@ Kuopio, Finland:Test Server:Pekka Riikonen:priikone@poseidon.pspt.fi # Format: +::: # [ServerInfo] -lassi.kuo.fi.ssh.com:10.2.1.6:Kuopio, Finland:334 +lassi.kuo.fi.ssh.com:10.2.1.6:Kuopio, Finland:706 # # Listenning ports. @@ -55,7 +55,7 @@ lassi.kuo.fi.ssh.com:10.2.1.6:Kuopio, Finland:334 # Format: :: # [ListenPort] -10.2.1.6:10.2.1.6:334 +10.2.1.6:10.2.1.6:706 # # Log files. @@ -115,7 +115,7 @@ infologfile:silcd.log:10000 # Format: ::::: # [ServerConnection] -10.2.1.7:passwd:veryscret:334:1:1 +10.2.1.7:passwd:veryscret:706:1:1 # # Configured router connections. @@ -128,7 +128,7 @@ infologfile:silcd.log:10000 # Format: ::::: # [RouterConnection] -#10.2.1.100:passwd:veryverysecret:334:1:1 +#10.2.1.100:passwd:veryverysecret:706:1:1 # # Denied connections. diff --git a/includes/version.h b/includes/version.h index 564bc29f..2a74df44 100644 --- a/includes/version.h +++ b/includes/version.h @@ -33,7 +33,7 @@ typedef unsigned char SilcVersion; #define SILC_VERSION_1 '\1' /* SILC version string */ -const char *silc_version = "28062000"; +const char *silc_version = "06072000"; const char *silc_name = "SILC"; const char *silc_fullname = "Secure Internet Live Conferencing"; diff --git a/public_html/faq.html b/public_html/faq.html index 44008caf..39eb90b7 100644 --- a/public_html/faq.html +++ b/public_html/faq.html @@ -64,7 +64,7 @@ A: Answer for both question is no. IRC client is in no way compatible Q: Why client/server protocol is based on IRC? Would it be more interesting to implement something extensible and more powerful?
-A: They are not, non the least. Have you read the protocol specification? +A: They are not, none the least. Have you read the protocol specification? The client superficially resembles IRC client but everything that happens under the hood is nothing alike IRC. SILC could *never* support IRC because the entire network toppology is different diff --git a/public_html/index.html b/public_html/index.html index 702f8797..55e67644 100644 --- a/public_html/index.html +++ b/public_html/index.html @@ -58,6 +58,21 @@ Changes: SILC 03072000 Changes +   + +
+

Official Port For SILC Has Been Assigned

+
+ +

+IANA has assigned official port for SILC protocol. The port is TCP 706 +and the latest release already supports this port. +

+

+


+

+ +   
diff --git a/public_html/todo.html b/public_html/todo.html index 8a89da28..97ba3e04 100644 --- a/public_html/todo.html +++ b/public_html/todo.html @@ -12,6 +12,9 @@ align=center>

TODO

+TODO
+====
+
 This is more or less complete list of tasks that has to be done before
 SILC 1.0 could ever be released.  It is clear that the list does not
 include all the bugs that exists.  At the end of list are tasks that 
@@ -136,8 +139,6 @@ TODO In SILC Client
    be selected.  I'm open for ideas.
 
  o All allocations and freeing needs to be checked for memory leaks.
-   Also, return values from various allocations and functions needs to
-   checked.
 
 
 TODO In SILC Server
@@ -157,6 +158,9 @@ TODO In SILC Server
    are suitable.  They should be tested on high load which I haven't done
    at all yet.
 
+ o INVITE command must set the channel's invite list if channel is 
+   invite-only channel.
+
  o Public and private key generation is now done everytime the program
    is run.  Now, this is only for testing period as I've been lazy to
    do it any better for now.  This must be fixed.
@@ -210,8 +214,6 @@ TODO In SILC Server
    to gather some statistics.
 
  o All allocations and freeing needs to be checked for memory leaks.
-   Also, return values from various allocations and functions needs to
-   checked.
 
 
 TODO In SILC Libraries
@@ -303,12 +305,6 @@ TODO In SILC Libraries
 
  o All allocations and freeing needs to be checked for memory leaks.
 
- o There are also checks missing from allocations whether the allocation
-   returns valid memory or NULL.  These are missing in library as well
-   in client and server.  Either all checks has to be added or we will
-   have to make sure that silc_*alloc()s always return valid memory
-   and assert()s if the system's memory allocator (*alloc()) fails.
-
  o silc_buffer_[un]format() needs to be made more stable as it may
    crash the SILC if malformed data is sent as argument.  There are a
    lot of places in client and server where we trust directly data coming
-- 
2.24.0