Initial client library rewrite, connects to remote server already.

[silc.git] / lib / silcclient / protocol.c

diff --git a/lib/silcclient/protocol.c b/lib/silcclient/protocol.c
index 9d9918a0812e50a25a4c89dabb9d0bf79d4cd2dc..078c832f2b4dcc82bc9c25713f919ac950c6ae57 100644 (file)
--- a/lib/silcclient/protocol.c
+++ b/lib/silcclient/protocol.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2004 Pekka Riikonen
+  Copyright (C) 1997 - 2004, 2006 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 */
 /* $Id$ */
 
-#include "silcincludes.h"
+#include "silc.h"
 #include "silcclient.h"
 #include "client_internal.h"
 
@@ -55,7 +55,7 @@ typedef struct {
   void *completion_context;
 } *VerifyKeyContext;
 
-static void silc_client_verify_key_cb(bool success, void *context)
+static void silc_client_verify_key_cb(SilcBool success, void *context)
 {
   VerifyKeyContext verify = (VerifyKeyContext)context;
 
@@ -110,7 +110,7 @@ void silc_client_protocol_ke_set_keys(SilcSKE ske,
                                      SilcHash hash,
                                      SilcHmac hmac,
                                      SilcSKEDiffieHellmanGroup group,
-                                     bool is_responder)
+                                     SilcBool is_responder)
 {
   SilcClientConnection conn = (SilcClientConnection)sock->user_data;
   const char *cname = silc_cipher_get_name(cipher);
@@ -768,7 +768,7 @@ silc_client_protocol_rekey_validate(SilcClient client,
                                    SilcClientRekeyInternalContext *ctx,
                                    SilcSocketConnection sock,
                                    SilcSKEKeyMaterial *keymat,
-                                   bool send)
+                                   SilcBool send)
 {
   SilcClientConnection conn = (SilcClientConnection)sock->user_data;
 
@@ -819,7 +819,7 @@ silc_client_protocol_rekey_validate(SilcClient client,
 static void
 silc_client_protocol_rekey_generate(SilcClient client,
                                    SilcClientRekeyInternalContext *ctx,
-                                   bool send)
+                                   SilcBool send)
 {
   SilcClientConnection conn = (SilcClientConnection)ctx->sock->user_data;
   SilcSKEKeyMaterial *keymat;
@@ -848,7 +848,7 @@ silc_client_protocol_rekey_generate(SilcClient client,
 static void
 silc_client_protocol_rekey_generate_pfs(SilcClient client,
                                        SilcClientRekeyInternalContext *ctx,
-                                       bool send)
+                                       SilcBool send)
 {
   SilcClientConnection conn = (SilcClientConnection)ctx->sock->user_data;
   SilcSKEKeyMaterial *keymat;
@@ -1185,27 +1185,3 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
   }
 
 }
-
-/* Registers protocols used in client */
-
-void silc_client_protocols_register(void)
-{
-  silc_protocol_register(SILC_PROTOCOL_CLIENT_CONNECTION_AUTH,
-                        silc_client_protocol_connection_auth);
-  silc_protocol_register(SILC_PROTOCOL_CLIENT_KEY_EXCHANGE,
-                        silc_client_protocol_key_exchange);
-  silc_protocol_register(SILC_PROTOCOL_CLIENT_REKEY,
-                        silc_client_protocol_rekey);
-}
-
-/* Unregisters protocols */
-
-void silc_client_protocols_unregister(void)
-{
-  silc_protocol_unregister(SILC_PROTOCOL_CLIENT_CONNECTION_AUTH,
-                          silc_client_protocol_connection_auth);
-  silc_protocol_unregister(SILC_PROTOCOL_CLIENT_KEY_EXCHANGE,
-                          silc_client_protocol_key_exchange);
-  silc_protocol_unregister(SILC_PROTOCOL_CLIENT_REKEY,
-                          silc_client_protocol_rekey);
-}