WIN32 compilation error fixes.

diff --git a/includes/silcwin32.h b/includes/silcwin32.h
index cd9420096305bd015d22e29fbb26b2f0281cf29f..a80120c8be4879df076cde1b067395e1f3b89692 100644 (file)
--- a/includes/silcwin32.h
+++ b/includes/silcwin32.h
@@ -25,6 +25,10 @@
 #include <io.h>
 #include <process.h>
 
+#if defined(HAVE_SILCDEFS_H)
+#include "regexpr.h"
+#endif /* HAVE_SILCDEFS_H */
+
 #define snprintf _snprintf
 #define vsnprintf _vsnprintf
 

diff --git a/lib/silchttp/silchttpphp.c b/lib/silchttp/silchttpphp.c
index 6b699d94d87c0dc95c9e642fe779417c0609f28f..d1cb24e09d968ef098c3c388d6b2dd651eeb8aa6 100644 (file)
--- a/lib/silchttp/silchttpphp.c
+++ b/lib/silchttp/silchttpphp.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2006 Pekka Riikonen
+  Copyright (C) 2006 - 2007 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -81,7 +81,11 @@ SilcBuffer silc_http_php_file(const char *filename)
     len = fread(tmp, 1, sizeof(tmp), fd);
     if (len < 0) {
       silc_buffer_free(ret);
-      pclose(fd);
+#ifdef SILC_WIN32\r
+      _pclose(fd);
+#else\r
+      pclose(fd);\r
+#endif /* SILC_WIN32 */\r
       return NULL;
     }
 
@@ -89,7 +93,11 @@ SilcBuffer silc_http_php_file(const char *filename)
       if (!ret) {
        ret = silc_buffer_alloc(0);
        if (!ret) {
-         pclose(fd);
+#ifdef SILC_WIN32\r
+      _pclose(fd);\r
+#else\r
+      pclose(fd);\r
+#endif /* SILC_WIN32 */\r
          return NULL;
        }
       }

diff --git a/lib/silcutil/silcfileutil.c b/lib/silcutil/silcfileutil.c
index c57cc42beb0457ea33b07c1f317a80457e0fb010..e824a2f12b886d51bc39c43dc573179b6a14d8b0 100644 (file)
--- a/lib/silcutil/silcfileutil.c
+++ b/lib/silcutil/silcfileutil.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2005 Pekka Riikonen
+  Copyright (C) 1997 - 2007 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -82,7 +82,9 @@ int silc_file_writefile(const char *filename, const char *buffer,
     return -1;
   }
 
+#ifdef SILC_UNIX
   fsync(fd);
+#endif /* SILC_UNIX */
 
   return silc_file_close(fd);
 }
@@ -112,7 +114,9 @@ int silc_file_writefile_mode(const char *filename, const char *buffer,
     return -1;
   }
 
+#ifdef SILC_UNIX
   fsync(fd);
+#endif /* SILC_UNIX */
 
   return silc_file_close(fd);
 }

diff --git a/lib/silcutil/win32/silcwin32net.c b/lib/silcutil/win32/silcwin32net.c
index 8cf1dd0e5bf1023cd6d875abf894d5e57e801c54..87fc12f84e025fcf56d533ca55016c38b0ec2bf8 100644 (file)
--- a/lib/silcutil/win32/silcwin32net.c
+++ b/lib/silcutil/win32/silcwin32net.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2005, 2007 Pekka Riikonen
+  Copyright (C) 1997 - 2007 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -136,7 +136,7 @@ silc_net_tcp_create_listener(const char **local_ip_addr,
   SilcNetListener listener = NULL;
   SOCKET sock;
   SilcSockaddr server;
-  int i, sock, rval;
+  int i, rval;
   const char *ipany = "0.0.0.0";
 
   SILC_LOG_DEBUG(("Creating TCP listener"));
@@ -348,8 +348,10 @@ int silc_net_udp_receive(SilcStream stream, char *remote_ip_addr,
 
   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);
@@ -380,13 +382,16 @@ int silc_net_udp_receive(SilcStream stream, char *remote_ip_addr,
   /* 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);
+#endif /* HAVE_IPV6 */
     } else {
+      const char *ip = inet_ntoa(s.sin.sin_addr);
+      if (ip)
+       silc_snprintf(remote_ip_addr, remote_ip_addr_size, ip);
       *remote_port = ntohs(s.sin.sin_port);
-      inet_ntop(AF_INET, &s.sin.sin_addr, remote_ip_addr,
-               remote_ip_addr_size);
     }
 
     SILC_LOG_DEBUG(("UDP packet from %s:%d", remote_ip_addr, *remote_port));
@@ -476,10 +481,10 @@ static void silc_net_connect_wait_stream(SilcSocketStreamStatus status,
 
 SILC_FSM_STATE(silc_net_connect_st_thread)
 {
-  SilcNetConnect conn = context;
+  SilcNetConnect conn = fsm_context;
 
   /* Connect in real thread as as to not block the application. */
-  silc_fsm_thread_init(&conn->thread, conn, NULL, NULL, TRUE);
+  silc_fsm_thread_init(&conn->thread, fsm, conn, NULL, NULL, TRUE);
   silc_fsm_start(&conn->thread, silc_net_connect_st_start);
 
   /* Wait for the thread to finish */
@@ -590,7 +595,7 @@ SILC_FSM_STATE(silc_net_connect_st_start)
   silc_fsm_next(fsm, silc_net_connect_st_stream);
   SILC_FSM_CALL((conn->sop = silc_socket_tcp_stream_create(
                                     conn->sock, FALSE, FALSE,
-                                    schedule,
+                                    silc_fsm_get_schedule(fsm),
                                     silc_net_connect_wait_stream, conn)));
 }
 
@@ -739,6 +744,7 @@ SilcBool silc_net_addr2bin(const char *addr, void *bin, SilcUInt32 bin_len)
     memcpy(bin, (unsigned char *)&ret, 4);
     return ret != INADDR_NONE;
   } else {
+#ifdef HAVE_IPV6
     struct addrinfo hints, *ai;
     SilcSockaddr *s;
 
@@ -758,12 +764,15 @@ SilcBool silc_net_addr2bin(const char *addr, void *bin, SilcUInt32 bin_len)
     }
 
     return TRUE;
+#else
+    return FALSE;
+#endif /* HAVE_IPV6 */
   }
 }
 
 /* Set socket to non-blocking mode. */
 
-int silc_net_set_socket_nonblock(int sock)
+int silc_net_set_socket_nonblock(SilcSocket sock)
 {
   unsigned long on = 1;
   return ioctlsocket(sock, FIONBIO, &on);

diff --git a/lib/silcutil/win32/silcwin32schedule.c b/lib/silcutil/win32/silcwin32schedule.c
index 126f18b201d0ad697474c3bffe9f89013066174d..f8ee3be7a904e584a0659050332bc7adc8ce8748 100644 (file)
--- a/lib/silcutil/win32/silcwin32schedule.c
+++ b/lib/silcutil/win32/silcwin32schedule.c
@@ -20,6 +20,8 @@
 
 #include "silc.h"
 
+const SilcScheduleOps schedule_ops;
+
 /* Our "select()" for WIN32. This mimics the behaviour of select() system
    call. It does not call the Winsock's select() though. Its functions
    are derived from GLib's g_poll() and from some old Xemacs's sys_select().
@@ -48,13 +50,14 @@
 
 */
 
-int silc_select(SilcSchedule schedule, void *context);
+int silc_select(SilcSchedule schedule, void *context)
 {
   SilcHashTableList htl;
   SilcTaskFd task;
   HANDLE handles[MAXIMUM_WAIT_OBJECTS];
   DWORD ready, curtime;
   LONG timeo;
+  UINT timer;
   MSG msg;
   int nhandles = 0, fd;
 
@@ -87,7 +90,7 @@ int silc_select(SilcSchedule schedule, void *context);
      and wait just for windows messages. */
   if (nhandles == 0 && schedule->has_timeout) {
     SILC_SCHEDULE_UNLOCK(schedule);
-    UINT timer = SetTimer(NULL, 0, timeo, NULL);
+    timer = SetTimer(NULL, 0, timeo, NULL);
     curtime = GetTickCount();
     while (timer) {
       WaitMessage();

diff --git a/lib/silcutil/win32/silcwin32thread.c b/lib/silcutil/win32/silcwin32thread.c
index f8121fcbfc4a2d809b9e65e78486b73ef047e7f3..9b7e4bba0b0d5cd950d5800e4dbbe0d6af863028 100644 (file)
--- a/lib/silcutil/win32/silcwin32thread.c
+++ b/lib/silcutil/win32/silcwin32thread.c
@@ -116,7 +116,7 @@ SilcThread silc_thread_self(void)
   }
 
   return (SilcThread)self;
-       #else
+#else
   return NULL;
 #endif
 }
@@ -254,7 +254,7 @@ SilcBool silc_rwlock_alloc(SilcRwLock *rwlock)
 void silc_rwlock_free(SilcRwLock rwlock)
 {
 #ifdef SILC_THREADS
-  if (mutex) {
+  if (rwlock) {
     silc_mutex_free(rwlock->mutex);
     silc_cond_free(rwlock->cond);
     silc_free(rwlock);
@@ -357,7 +357,7 @@ void silc_cond_broadcast(SilcCond cond)
 void silc_cond_wait(SilcCond cond, SilcMutex mutex)
 {
 #ifdef SILC_THREADS
-  silc_cond_timedwait(cond, mutex, NULL);
+  silc_cond_timedwait(cond, mutex, 0);
 #endif /* SILC_THREADS*/
 }
 

diff --git a/lib/silcutil/win32/silcwin32util.c b/lib/silcutil/win32/silcwin32util.c
index 2a4fa83dc846c452058f365001643aff5ed57266..1e6549b78b519977c4eddadf9628ef47dc255465 100644 (file)
--- a/lib/silcutil/win32/silcwin32util.c
+++ b/lib/silcutil/win32/silcwin32util.c
@@ -55,5 +55,5 @@ char *silc_get_real_name(void)
 
 int silc_file_set_nonblock(int fd)
 {
-  return fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK);
+  return 0;
 }

diff --git a/win32/libsilc/libsilc.def b/win32/libsilc/libsilc.def
index 611cd6bc595798e5860e5dc0dc5ed20615038f2e..8a7e69a3824ada9e911e1796376a0de112cbf5fd 100644 (file)
--- a/win32/libsilc/libsilc.def
+++ b/win32/libsilc/libsilc.def
@@ -1,602 +1,864 @@
-;\r
-; Exports file for SILC Core DLL.\r
-;\r
-; This file is generated from MinGW compiled object files using the\r
-; following command:\r
-;\r
-; dlltool --export-all --output-def libsilc.def libsilc.a\r
-;\r
-; ----------------------------------------------------------------------------\r
-;\r
-; If you edit this file by adding or removing any exports be sure to\r
-; preserve the ordinal values (the @ n in the exports) and add new exports\r
-; always at the end of the list with new ordinal value. Do not ever\r
-; add new export with old ordinal value if you need to preserve backwards\r
-; compatiblity. -Pekka\r
-;\r
 EXPORTS\r
-       silc_aes_context_len @ 235 ;\r
-       silc_aes_decrypt_cbc @ 236 ;\r
-       silc_aes_encrypt_cbc @ 237 ;\r
-       silc_aes_set_key @ 238 ;\r
-       silc_aes_set_key_with_string @ 239 ;\r
-       silc_argument_get_arg_num @ 240 ;\r
-       silc_argument_get_arg_type @ 241 ;\r
-       silc_argument_get_first_arg @ 242 ;\r
-       silc_argument_get_next_arg @ 243 ;\r
-       silc_argument_payload_encode @ 244 ;\r
-       silc_argument_payload_encode_payload @ 245 ;\r
-       silc_argument_payload_free @ 246 ;\r
-       silc_argument_payload_parse @ 247 ;\r
-       silc_auth_get_data @ 248 ;\r
-       silc_auth_get_method @ 249 ;\r
-       silc_auth_payload_encode @ 250 ;\r
-       silc_auth_payload_free @ 251 ;\r
-       silc_auth_payload_parse @ 252 ;\r
-       silc_auth_public_key_auth_generate @ 253 ;\r
-       silc_auth_public_key_auth_verify @ 254 ;\r
-       silc_auth_public_key_auth_verify_data @ 255 ;\r
-       silc_auth_verify @ 256 ;\r
-       silc_auth_verify_data @ 257 ;\r
-       silc_blowfish_context_len @ 258 ;\r
-       silc_blowfish_decrypt_cbc @ 259 ;\r
-       silc_blowfish_encrypt_cbc @ 260 ;\r
-       silc_blowfish_set_key @ 261 ;\r
-       silc_blowfish_set_key_with_string @ 262 ;\r
-       silc_buffer_format @ 263 ;\r
-       silc_buffer_unformat @ 264 ;\r
-       silc_calloc @ 265 ;\r
-       silc_cast_context_len @ 266 ;\r
-       silc_cast_decrypt_cbc @ 267 ;\r
-       silc_cast_encrypt_cbc @ 268 ;\r
-       silc_cast_set_key @ 269 ;\r
-       silc_cast_set_key_with_string @ 270 ;\r
-       silc_channel_get_id @ 271 ;\r
-       silc_channel_get_id_parse @ 272 ;\r
-       silc_channel_get_mode @ 273 ;\r
-       silc_channel_get_name @ 274 ;\r
-       silc_channel_key_get_cipher @ 275 ;\r
-       silc_channel_key_get_id @ 276 ;\r
-       silc_channel_key_get_key @ 277 ;\r
-       silc_channel_key_payload_encode @ 278 ;\r
-       silc_channel_key_payload_free @ 279 ;\r
-       silc_channel_key_payload_parse @ 280 ;\r
-       silc_channel_payload_encode @ 289 ;\r
-       silc_channel_payload_free @ 290 ;\r
-       silc_channel_payload_list_free @ 291 ;\r
-       silc_channel_payload_parse @ 292 ;\r
-       silc_channel_payload_parse_list @ 293 ;\r
-       silc_check_line @ 294 ;\r
-       silc_cipher_alloc @ 295 ;\r
-       silc_cipher_decrypt @ 296 ;\r
-       silc_cipher_encrypt @ 297 ;\r
-       silc_cipher_free @ 298 ;\r
-       silc_cipher_get_block_len @ 299 ;\r
-       silc_cipher_get_iv @ 300 ;\r
-       silc_cipher_get_key_len @ 301 ;\r
-       silc_cipher_get_supported @ 302 ;\r
-       silc_cipher_is_supported @ 303 ;\r
-       silc_cipher_list @ 304 ;\r
-       silc_cipher_register @ 305 ;\r
-       silc_cipher_register_default @ 306 ;\r
-       silc_cipher_set_iv @ 307 ;\r
-       silc_cipher_set_key @ 308 ;\r
-       silc_cipher_unregister @ 309 ;\r
-       silc_client_chmode @ 310 ;\r
-       silc_client_chumode @ 311 ;\r
-       silc_client_chumode_char @ 312 ;\r
-       silc_command_get @ 313 ;\r
-       silc_command_get_args @ 314 ;\r
-       silc_command_get_ident @ 315 ;\r
-       silc_command_payload_encode @ 316 ;\r
-       silc_command_payload_encode_payload @ 317 ;\r
-       silc_command_payload_encode_va @ 318 ;\r
-       silc_command_payload_encode_vap @ 319 ;\r
-       silc_command_payload_free @ 320 ;\r
-       silc_command_payload_parse @ 321 ;\r
-       silc_command_reply_payload_encode_va @ 322 ;\r
-       silc_command_set_command @ 323 ;\r
-       silc_command_set_ident @ 324 ;\r
-       silc_config_open @ 327 ;\r
-       silc_log_debug @ 328;\r
-       silc_pem_decode @ 329 ;\r
-       silc_default_ciphers @ 330 DATA ;\r
-       silc_default_hash @ 331 DATA ;\r
-       silc_default_hmacs @ 332 DATA ;\r
-       silc_default_pkcs @ 333 DATA ;\r
-       silc_pem_encode @ 334 ;\r
-       silc_pem_encode_file @ 335 ;\r
-       silc_file_readfile @ 336 ;\r
-       silc_file_writefile @ 337 ;\r
-       silc_file_writefile_mode @ 338 ;\r
-       silc_format @ 339 ;\r
-       silc_free @ 340 ;\r
-       silc_get_time @ 341 ;\r
-       silc_gets @ 342 ;\r
-       silc_gettimeofday @ 343 ;\r
-       silc_hash_alloc @ 344 ;\r
-       silc_hash_client_id_compare @ 345 ;\r
-       silc_hash_data @ 346 ;\r
-       silc_hash_data_compare @ 347 ;\r
-       silc_hash_fingerprint @ 348 ;\r
-       silc_hash_free @ 349 ;\r
-       silc_hash_get_supported @ 350 ;\r
-       silc_hash_id @ 351 ;\r
-       silc_hash_id_compare @ 352 ;\r
-       silc_hash_is_supported @ 353 ;\r
-       silc_hash_len @ 354 ;\r
-       silc_hash_list @ 355 ;\r
-       silc_hash_make @ 356 ;\r
-       silc_hash_ptr @ 357 ;\r
-       silc_hash_register @ 358 ;\r
-       silc_hash_register_default @ 359 ;\r
-       silc_hash_string @ 360 ;\r
-       silc_hash_string_compare @ 361 ;\r
-       silc_hash_table_add @ 362 ;\r
-       silc_hash_table_add_ext @ 363 ;\r
-       silc_hash_table_alloc @ 364 ;\r
-       silc_hash_table_count @ 365 ;\r
-       silc_hash_table_del @ 366 ;\r
-       silc_hash_table_del_by_context @ 367 ;\r
-       silc_hash_table_del_by_context_ext @ 368 ;\r
-       silc_hash_table_del_ext @ 369 ;\r
-       silc_hash_table_find @ 370 ;\r
-       silc_hash_table_find_ext @ 371 ;\r
-       silc_hash_table_find_foreach @ 372 ;\r
-       silc_hash_table_find_foreach_ext @ 373 ;\r
-       silc_hash_table_foreach @ 374 ;\r
-       silc_hash_table_free @ 375 ;\r
-       silc_hash_table_get @ 376 ;\r
-       silc_hash_table_list @ 377 ;\r
-       silc_hash_table_rehash @ 378 ;\r
-       silc_hash_table_rehash_ext @ 379 ;\r
-       silc_hash_table_replace @ 380 ;\r
-       silc_hash_table_replace_ext @ 381 ;\r
-       silc_hash_table_size @ 382 ;\r
-       silc_hash_uint @ 383 ;\r
-       silc_hash_unregister @ 384 ;\r
-       silc_hmac_alloc @ 385 ;\r
-       silc_hmac_free @ 386 ;\r
-       silc_hmac_get_supported @ 387 ;\r
-       silc_hmac_is_supported @ 388 ;\r
-       silc_hmac_len @ 389 ;\r
-       silc_hmac_list @ 390 ;\r
-       silc_hmac_make @ 391 ;\r
-       silc_hmac_make_truncated @ 393 ;\r
-       silc_hmac_make_with_key @ 394 ;\r
-       silc_hmac_register @ 395 ;\r
-       silc_hmac_register_default @ 396 ;\r
-       silc_hmac_set_key @ 397 ;\r
-       silc_hmac_unregister @ 398 ;\r
-       silc_id_dup @ 399 ;\r
-       silc_id_get_len @ 400 ;\r
-       silc_id_id2str @ 401 ;\r
-       silc_id_payload_encode @ 402 ;\r
-       silc_id_payload_free @ 403 ;\r
-       silc_id_payload_get_data @ 404 ;\r
-       silc_id_payload_get_id @ 405 ;\r
-       silc_id_payload_get_len @ 406 ;\r
-       silc_id_payload_get_type @ 407 ;\r
-       silc_id_payload_parse @ 408 ;\r
-       silc_id_payload_parse_id @ 410 ;\r
-       silc_id_render @ 411 ;\r
-       silc_id_str2id @ 412 ;\r
-       silc_idcache_add @ 413 ;\r
-       silc_idcache_alloc @ 414 ;\r
-       silc_idcache_del @ 415 ;\r
-       silc_idcache_del_all @ 416 ;\r
-       silc_idcache_del_by_context @ 417 ;\r
-       silc_idcache_del_by_id @ 418 ;\r
-       silc_idcache_del_by_id_ext @ 419 ;\r
-       silc_idcache_find_by_context @ 420 ;\r
-       silc_idcache_find_by_id @ 421 ;\r
-       silc_idcache_find_by_id_one @ 422 ;\r
-       silc_idcache_find_by_id_one_ext @ 423 ;\r
-       silc_idcache_find_by_name @ 424 ;\r
-       silc_idcache_find_by_name_one @ 425 ;\r
-       silc_idcache_free @ 426 ;\r
-       silc_idcache_get_all @ 427 ;\r
-       silc_idcache_list_count @ 428 ;\r
-       silc_idcache_list_first @ 429 ;\r
-       silc_idcache_list_free @ 430 ;\r
-       silc_idcache_list_next @ 431 ;\r
-       silc_idcache_purge @ 432 ;\r
-       silc_idcache_purge_by_context @ 433 ;\r
-       silc_key_agreement_get_hostname @ 434 ;\r
-       silc_key_agreement_get_port @ 435 ;\r
-       silc_key_agreement_payload_encode @ 436 ;\r
-       silc_key_agreement_payload_free @ 437 ;\r
-       silc_key_agreement_payload_parse @ 438 ;\r
-       silc_log_output @ 439 ;\r
-       silc_log_output_debug @ 440 ;\r
-       silc_log_output_hexdump @ 441 ;\r
-       silc_log_reset_callbacks @ 442 ;\r
-       silc_log_reset_debug_callbacks @ 443 ;\r
-       silc_log_set_callback @ 444 ;\r
-       silc_log_set_debug_callbacks @ 445 ;\r
-       silc_log_set_file @ 446 ;\r
-       silc_malloc @ 448 ;\r
-       silc_math_gen_prime @ 454 ;\r
-       silc_math_prime_test @ 455 ;\r
-       silc_md5_context_len @ 456 ;\r
-       silc_md5_final @ 457 ;\r
-       silc_md5_init @ 458 ;\r
-       silc_md5_transform @ 459 ;\r
-       silc_md5_update @ 460 ;\r
-       silc_mp_abs @ 461 ;\r
-       silc_mp_add @ 462 ;\r
-       silc_mp_add_ui @ 463 ;\r
-       silc_mp_and @ 464 ;\r
-       silc_mp_bin2mp @ 465 ;\r
-       silc_mp_cmp @ 466 ;\r
-       silc_mp_cmp_si @ 467 ;\r
-       silc_mp_cmp_ui @ 468 ;\r
-       silc_mp_div @ 469 ;\r
-       silc_mp_div_2exp @ 470 ;\r
-       silc_mp_div_2exp_qr @ 471 ;\r
-       silc_mp_div_qr @ 472 ;\r
-       silc_mp_div_ui @ 473 ;\r
-       silc_mp_gcd @ 474 ;\r
-       silc_mp_gcdext @ 475 ;\r
-       silc_mp_get_str @ 476 ;\r
-       silc_mp_get_ui @ 477 ;\r
-       silc_mp_init @ 478 ;\r
-       silc_mp_mod @ 479 ;\r
-       silc_mp_mod_2exp @ 480 ;\r
-       silc_mp_mod_ui @ 481 ;\r
-       silc_mp_modinv @ 482 ;\r
-       silc_mp_mp2bin @ 483 ;\r
-       silc_mp_mp2bin_noalloc @ 484 ;\r
-       silc_mp_mul @ 485 ;\r
-       silc_mp_mul_2exp @ 486 ;\r
-       silc_mp_mul_ui @ 487 ;\r
-       silc_mp_neg @ 488 ;\r
-       silc_mp_or @ 489 ;\r
-       silc_mp_pow @ 490 ;\r
-       silc_mp_pow_mod @ 491 ;\r
-       silc_mp_pow_mod_ui @ 492 ;\r
-       silc_mp_pow_ui @ 493 ;\r
-       silc_mp_set @ 494 ;\r
-       silc_mp_set_si @ 495 ;\r
-       silc_mp_set_str @ 496 ;\r
-       silc_mp_set_ui @ 497 ;\r
-       silc_mp_size @ 498 ;\r
-       silc_mp_sizeinbase @ 499 ;\r
-       silc_mp_sqrt @ 500 ;\r
-       silc_mp_sub @ 501 ;\r
-       silc_mp_sub_ui @ 502 ;\r
-       silc_mp_uninit @ 503 ;\r
-       silc_mp_xor @ 504 ;\r
-       silc_mutex_alloc @ 505 ;\r
-       silc_mutex_free @ 506 ;\r
-       silc_mutex_lock @ 507 ;\r
-       silc_mutex_unlock @ 508 ;\r
-       silc_net_accept_connection @ 509 ;\r
-       silc_net_addr2bin @ 510 ;\r
-       silc_net_check_host_by_sock @ 511 ;\r
-       silc_net_check_local_by_sock @ 512 ;\r
-       silc_net_close_connection @ 513 ;\r
-       silc_net_close_server @ 514 ;\r
-       silc_net_create_connection @ 515 ;\r
-       silc_net_create_connection_async @ 516 ;\r
-       silc_net_create_server @ 517 ;\r
-       silc_net_get_local_port @ 518 ;\r
-       silc_net_get_remote_port @ 519 ;\r
-       silc_net_get_socket_opt @ 520 ;\r
-       silc_net_is_ip @ 521 ;\r
-       silc_net_localhost @ 522 ;\r
-       silc_net_set_socket_nonblock @ 523 ;\r
-       silc_net_set_socket_opt @ 524 ;\r
-       silc_net_win32_init @ 525 ;\r
-       silc_net_win32_uninit @ 526 ;\r
-       silc_none_context_len @ 527 ;\r
-       silc_none_decrypt_cbc @ 528 ;\r
-       silc_none_encrypt_cbc @ 529 ;\r
-       silc_none_set_key @ 530 ;\r
-       silc_none_set_key_with_string @ 531 ;\r
-       silc_notify_get_arg_num @ 532 ;\r
-       silc_notify_get_args @ 533 ;\r
-       silc_notify_get_type @ 534 ;\r
-       silc_notify_payload_encode @ 535 ;\r
-       silc_notify_payload_encode_args @ 536 ;\r
-       silc_notify_payload_free @ 537 ;\r
-       silc_notify_payload_parse @ 538 ;\r
-       silc_packet_assemble @ 539 ;\r
-       silc_packet_context_alloc @ 540 ;\r
-       silc_packet_context_dup @ 541 ;\r
-       silc_packet_context_free @ 542 ;\r
-       silc_packet_encrypt @ 544 ;\r
-       silc_packet_parse @ 545 ;\r
-       silc_packet_parse_special @ 546 ;\r
-       silc_packet_receive @ 547 ;\r
-       silc_packet_receive_process @ 548 ;\r
-       silc_packet_send @ 549 ;\r
-       silc_packet_send_prepare @ 550 ;\r
-       silc_parse_command_line @ 551 ;\r
-       silc_parse_userfqdn @ 552 ;\r
-       silc_pkcs1_decrypt @ 553 ;\r
-       silc_pkcs1_encrypt @ 554 ;\r
-       silc_pkcs1_sign @ 555 ;\r
-       silc_pkcs1_verify @ 556 ;\r
-       silc_pkcs_alloc @ 557 ;\r
-       silc_pkcs_decode_identifier @ 558 ;\r
-       silc_pkcs_decrypt @ 559 ;\r
-       silc_pkcs_encode_identifier @ 560 ;\r
-       silc_pkcs_encrypt @ 561 ;\r
-       silc_pkcs_free @ 562 ;\r
-       silc_pkcs_free_identifier @ 563 ;\r
-       silc_pkcs_get_key_len @ 564 ;\r
-       silc_pkcs_get_private_key @ 565 ;\r
-       silc_pkcs_get_public_key @ 566 ;\r
-       silc_pkcs_get_supported @ 567 ;\r
-       silc_pkcs_is_supported @ 568 ;\r
-       silc_pkcs_list @ 569 ;\r
-       silc_pkcs_load_private_key @ 570 ;\r
-       silc_pkcs_load_public_key @ 571 ;\r
-       silc_pkcs_private_key_alloc @ 572 ;\r
-       silc_pkcs_private_key_data_encode @ 573 ;\r
-       silc_pkcs_private_key_data_set @ 574 ;\r
-       silc_pkcs_private_key_decode @ 575 ;\r
-       silc_pkcs_private_key_encode @ 576 ;\r
-       silc_pkcs_private_key_free @ 577 ;\r
-       silc_pkcs_private_key_set @ 578 ;\r
-       silc_pkcs_public_key_alloc @ 579 ;\r
-       silc_pkcs_public_key_data_encode @ 580 ;\r
-       silc_pkcs_public_key_data_set @ 581 ;\r
-       silc_pkcs_public_key_decode @ 582 ;\r
-       silc_pkcs_public_key_encode @ 583 ;\r
-       silc_pkcs_public_key_free @ 584 ;\r
-       silc_pkcs_public_key_set @ 585 ;\r
-       silc_pkcs_register @ 586 ;\r
-       silc_pkcs_register_default @ 587 ;\r
-       silc_pkcs_save_private_key @ 588 ;\r
-       silc_pkcs_save_public_key @ 590 ;\r
-       silc_pkcs_save_public_key_data @ 591 ;\r
-       silc_pkcs_sign @ 592 ;\r
-       silc_pkcs_sign_with_hash @ 593 ;\r
-       silc_pkcs_unregister @ 594 ;\r
-       silc_pkcs_verify @ 595 ;\r
-       silc_pkcs_verify_with_hash @ 596 ;\r
-       silc_protocol_alloc @ 602 ;\r
-       silc_protocol_cancel @ 603 ;\r
-       silc_protocol_execute @ 604 ;\r
-       silc_protocol_execute_final @ 605 ;\r
-       silc_protocol_free @ 606 ;\r
-       silc_protocol_list @ 607 ;\r
-       silc_protocol_register @ 608 ;\r
-       silc_protocol_unregister @ 609 ;\r
-       silc_rc5_context_len @ 610 ;\r
-       silc_rc5_decrypt_cbc @ 611 ;\r
-       silc_rc5_encrypt_cbc @ 612 ;\r
-       silc_rc5_set_key @ 613 ;\r
-       silc_rc5_set_key_with_string @ 614 ;\r
-       silc_realloc @ 620 ;\r
-       silc_rng_add_noise @ 621 ;\r
-       silc_rng_alloc @ 622 ;\r
-       silc_rng_free @ 623 ;\r
-       silc_rng_get_byte @ 624 ;\r
-       silc_rng_get_rn16 @ 625 ;\r
-       silc_rng_get_rn32 @ 626 ;\r
-       silc_rng_get_rn_data @ 627 ;\r
-       silc_rng_get_rn_string @ 628 ;\r
-       silc_rng_global_add_noise @ 629 ;\r
-       silc_rng_global_get_byte @ 630 ;\r
-       silc_rng_global_get_rn16 @ 631 ;\r
-       silc_rng_global_get_rn32 @ 632 ;\r
-       silc_rng_global_get_rn_data @ 633 ;\r
-       silc_rng_global_get_rn_string @ 634 ;\r
-       silc_rng_global_init @ 635 ;\r
-       silc_rng_global_uninit @ 636 ;\r
-       silc_rng_init @ 637 ;\r
-       silc_rsa_clear_keys @ 638 ;\r
-       silc_rsa_context_len @ 639 ;\r
-       silc_rsa_decrypt @ 640 ;\r
-       silc_rsa_encrypt @ 641 ;\r
-       silc_rsa_get_private_key @ 642 ;\r
-       silc_rsa_get_public_key @ 643 ;\r
-       silc_rsa_init @ 644 ;\r
-       silc_rsa_set_private_key @ 645 ;\r
-       silc_rsa_set_public_key @ 646 ;\r
-       silc_rsa_sign @ 647 ;\r
-       silc_rsa_verify @ 648 ;\r
-       silc_schedule @ 649 ;\r
-       silc_schedule_init @ 650 ;\r
-       silc_schedule_one @ 651 ;\r
-       silc_schedule_set_listen_fd @ 652 ;\r
-       silc_schedule_stop @ 653 ;\r
-       silc_schedule_task_add @ 654 ;\r
-       silc_schedule_task_del @ 655 ;\r
-       silc_schedule_task_del_by_callback @ 656 ;\r
-       silc_schedule_task_del_by_context @ 657 ;\r
-       silc_schedule_task_del_by_fd @ 658 ;\r
-       silc_schedule_uninit @ 659 ;\r
-       silc_schedule_unset_listen_fd @ 660 ;\r
-       silc_schedule_wakeup @ 661 ;\r
-       silc_select @ 665 ;\r
-       silc_sha1_context_len @ 666 ;\r
-       silc_sha1_final @ 667 ;\r
-       silc_sha1_init @ 668 ;\r
-       silc_sha1_transform @ 669 ;\r
-       silc_sha1_update @ 670 ;\r
-       silc_ske_abort @ 671 ;\r
-       silc_ske_alloc @ 672 ;\r
-       silc_ske_assemble_security_properties @ 673 ;\r
-       silc_ske_end @ 675 ;\r
-       silc_ske_free @ 676 ;\r
-       silc_ske_free_key_material @ 677 ;\r
-       silc_ske_group_get_by_name @ 678 ;\r
-       silc_ske_group_get_by_number @ 679 ;\r
-       silc_ske_get_supported_groups @ 680 ;\r
-       silc_ske_group_get_number @ 681 ;\r
-       silc_ske_groups @ 682 ;\r
-       silc_ske_initiator_finish @ 683 ;\r
-       silc_ske_initiator_phase_1 @ 684 ;\r
-       silc_ske_initiator_phase_2 @ 685 ;\r
-       silc_ske_initiator_start @ 686 ;\r
-       silc_ske_payload_ke_decode @ 688 ;\r
-       silc_ske_payload_ke_encode @ 689 ;\r
-       silc_ske_payload_ke_free @ 690 ;\r
-       silc_ske_payload_start_decode @ 691 ;\r
-       silc_ske_payload_start_encode @ 692 ;\r
-       silc_ske_payload_start_free @ 693 ;\r
-       silc_ske_process_key_material @ 694 ;\r
-       silc_ske_process_key_material_data @ 695 ;\r
-       silc_ske_responder_finish @ 696 ;\r
-       silc_ske_responder_phase_1 @ 697 ;\r
-       silc_ske_responder_phase_2 @ 698 ;\r
-       silc_ske_responder_start @ 699 ;\r
-       silc_ske_select_security_properties @ 700 ;\r
-       silc_ske_set_callbacks @ 701 ;\r
-       silc_socket_alloc @ 702 ;\r
-       silc_socket_dup @ 703 ;\r
-       silc_socket_free @ 704 ;\r
-       silc_socket_host_lookup @ 705 ;\r
-       silc_socket_read @ 706 ;\r
-       silc_socket_set_heartbeat @ 707 ;\r
-       silc_socket_write @ 708 ;\r
-       silc_string_compare @ 709 ;\r
-       silc_thread_create @ 710 ;\r
-       silc_thread_exit @ 711 ;\r
-       silc_thread_self @ 712 ;\r
-       silc_thread_wait @ 713 ;\r
-       silc_to_upper @ 715 ;\r
-       silc_twofish_context_len @ 716 ;\r
-       silc_twofish_decrypt_cbc @ 717 ;\r
-       silc_twofish_encrypt_cbc @ 718 ;\r
-       silc_twofish_set_key @ 719 ;\r
-       silc_twofish_set_key_with_string @ 720 ;\r
-       silc_buffer_format_vp @ 789 ;\r
-       silc_buffer_unformat_vp @ 790 ;\r
-       silc_sftp_client_start @ 791 ;\r
-       silc_sftp_client_shutdown @ 792 ;\r
-       silc_sftp_client_receive_process @ 793 ;\r
-       silc_sftp_open @ 794 ;\r
-       silc_sftp_close @ 795 ;\r
-       silc_sftp_read @ 796 ;\r
-       silc_sftp_write @ 797 ;\r
-       silc_sftp_remove @ 798 ;\r
-       silc_sftp_rename @ 799 ;\r
-       silc_sftp_mkdir @ 800 ;\r
-       silc_sftp_rmdir @ 801 ;\r
-       silc_sftp_opendir @ 802 ;\r
-       silc_sftp_readdir @ 803 ;\r
-       silc_sftp_stat @ 804 ;\r
-       silc_sftp_lstat @ 805 ;\r
-       silc_sftp_fstat @ 806 ;\r
-       silc_sftp_setstat @ 807 ;\r
-       silc_sftp_fsetstat @ 808 ;\r
-       silc_sftp_readlink @ 809 ;\r
-       silc_sftp_symlink @ 810 ;\r
-       silc_sftp_realpath @ 811 ;\r
-       silc_sftp_extended @ 812 ;\r
-       silc_sftp_server_start @ 813 ;\r
-       silc_sftp_server_shutdown @ 814 ;\r
-       silc_sftp_server_receive_process @ 815 ;\r
-       silc_sftp_fs_memory @ 816 ;\r
-       silc_sftp_fs_memory_alloc @ 817 ;\r
-       silc_sftp_fs_memory_free @ 818 ;\r
-       silc_sftp_fs_memory_add_dir @ 819 ;\r
-       silc_sftp_fs_memory_del_dir @ 820 ;\r
-       silc_sftp_fs_memory_add_file @ 821 ;\r
-       silc_sftp_fs_memory_del_file @ 822 ;\r
-       silc_file_open @ 824 ;\r
-       silc_file_close @ 825 ;\r
-       silc_file_read @ 826 ;\r
-       silc_file_write @ 827 ;\r
-       silc_file_size @ 828 ;\r
-       silc_hmac_init @ 829 ;\r
-       silc_hmac_update @ 830 ;\r
-       silc_hmac_final @ 831 ;\r
-       silc_hmac_init_with_key @ 832 ;\r
-       silc_hmac_get_name @ 833 ;\r
-       silc_hmac_get_hash @ 834 ;\r
-       silc_net_localip @ 835 ;\r
-       silc_sftp_server_set_monitor @ 836 ;\r
-       silc_net_gethostbyname @ 837 ;\r
-       silc_net_gethostbyaddr @ 838 ;\r
-       silc_net_gethostbyname_async @ 839 ;\r
-       silc_net_gethostbyaddr_async @ 840 ;\r
-       silc_net_is_ip4 @ 841 ;\r
-       silc_net_is_ip6 @ 842 ;\r
-       silc_log_set_debug_string @ 843 ;\r
-       silc_log_reset_all @ 844 ;\r
-       silc_log_flush_all @ 845 ;\r
-       silc_log_get_file @ 846 ;\r
-       silc_log_quick @ 847;\r
-       silc_log_flushdelay @ 848;\r
-       silc_hash_table_list_reset @ 849 ;\r
-       silc_log_debug_hexdump @ 850;\r
-       silc_memdup @ 851 ;\r
-       silc_command_get_status @ 852 ;\r
-       silc_utf8_encode @ 853 ;\r
-       silc_utf8_decode @ 854 ;\r
-       silc_utf8_encoded_len @ 855 ;\r
-       silc_utf8_valid @ 856 ;\r
-       silc_mime_parse @ 857 ;\r
-       silc_get_status_message @ 858 ;\r
-       silc_get_mode_list @ 859 ;\r
-       silc_hash_table_find_by_context @ 860 ;\r
-       silc_string_is_ascii @ 862 ;\r
-       silc_parse_version_string @ 863 ;\r
-       silc_version_to_num @ 864 ;\r
-       silc_fingerprint @ 865 ;\r
-        silc_get_packet_name @ 866 ;\r
-        silc_get_command_name @ 867 ;\r
-        silc_strncat @ 868 ;\r
-        silc_attribute_payload_parse @ 869 ;\r
-        silc_attribute_payload_encode @ 870 ;\r
-        silc_attribute_payload_alloc @ 871 ;\r
-        silc_attribute_payload_free @ 872 ;\r
-        silc_attribute_payload_list_free @ 873 ;\r
-        silc_attribute_payload_encode_data @ 874 ;\r
-        silc_attribute_get_attribute @ 875 ;\r
-        silc_attribute_get_data @ 876 ;\r
-        silc_attribute_get_object @ 877 ;\r
-        silc_attribute_get_flags @ 878 ;\r
-        silc_attribute_get_verify_data @ 879 ;\r
-        silc_hash_get_name @ 880 ;\r
-       silc_create_key_pair @ 881 ;\r
-       silc_load_key_pair @ 882 ;\r
-       silc_show_public_key @ 883 ;\r
-       silc_change_private_key_passphrase @ 884 ;\r
-       silc_argument_payload_encode_one @ 885 ;\r
-       silc_message_payload_decrypt @ 886 ;\r
-       silc_message_payload_parse @ 887 ;\r
-       silc_message_payload_encrypt @ 888 ;\r
-       silc_message_payload_encode @ 889 ;\r
-       silc_message_payload_free @ 890 ;\r
-       silc_message_get_flags @ 891 ;\r
-       silc_message_get_data @ 892 ;\r
-       silc_message_get_mac @ 893 ;\r
-       silc_message_get_iv @ 894 ;\r
-       silc_message_signed_payload_parse @ 895 ;\r
-       silc_message_signed_payload_encode @ 896 ;\r
-       silc_message_signed_payload_free @ 897 ;\r
-       silc_message_signed_verify @ 898 ;\r
-        silc_message_signed_get_public_key @ 899 ;\r
-        silc_hmac_unregister_all @ 900 ;\r
-        silc_hash_unregister_all @ 901 ;\r
-        silc_pkcs_unregister_all @ 902 ;\r
-        silc_cipher_unregister_all @ 903 ;\r
-        silc_rng_get_byte_fast @ 904 ;\r
-        silc_cipher_get_name @ 905 ;\r
-        silc_pkcs_public_key_payload_encode @ 908 ;\r
-        silc_pkcs_public_key_payload_decode @ 909 ;\r
-       silc_auth_get_public_data @ 910 ;\r
-       silc_auth_public_key_auth_generate_wpub @ 911 ;\r
-       silc_status_get_args @ 912 ;\r
-       silc_vcard_encode @ 913 ;\r
-       silc_vcard_decode @ 914 ;\r
-       silc_vcard_alloc @ 915 ;\r
-       silc_vcard_free @ 916 ;\r
-       silc_vcard_fprintf @ 917 ;\r
-       silc_hash_babbleprint @ 918 ;\r
-       silc_get_real_name @ 919 ;\r
-       silc_get_username @ 920 ;\r
-       silc_utf8_strcasecmp @ 921 ;\r
-       silc_utf8_strncasecmp @ 922 ;\r
-       silc_stringprep @ 923;\r
-       silc_identifier_check @ 924 ;\r
-       silc_identifier_verify @ 925 ;\r
-       silc_channel_name_check @ 926 ;\r
-       silc_channel_name_verify @ 927 ;\r
+       silc_argument_get_arg_num @ 1 ;\r
+       silc_argument_get_arg_type @ 2 ;\r
+       silc_argument_get_decoded @ 3 ;\r
+       silc_argument_get_first_arg @ 4 ;\r
+       silc_argument_get_next_arg @ 5 ;\r
+       silc_argument_list_free @ 6 ;\r
+       silc_argument_list_parse @ 7 ;\r
+       silc_argument_list_parse_decoded @ 8 ;\r
+       silc_argument_payload_encode @ 9 ;\r
+       silc_argument_payload_encode_one @ 10 ;\r
+       silc_argument_payload_encode_payload @ 11 ;\r
+       silc_argument_payload_free @ 12 ;\r
+       silc_argument_payload_parse @ 13 ;\r
+       silc_command_get @ 14 ;\r
+       silc_command_get_args @ 15 ;\r
+       silc_command_get_ident @ 16 ;\r
+       silc_command_get_status @ 17 ;\r
+       silc_command_payload_encode @ 18 ;\r
+       silc_command_payload_encode_payload @ 19 ;\r
+       silc_command_payload_encode_va @ 20 ;\r
+       silc_command_payload_encode_vap @ 21 ;\r
+       silc_command_payload_free @ 22 ;\r
+       silc_command_payload_parse @ 23 ;\r
+       silc_command_reply_payload_encode_va @ 24 ;\r
+       silc_command_reply_payload_encode_vap @ 25 ;\r
+       silc_command_set_command @ 26 ;\r
+       silc_command_set_ident @ 27 ;\r
+       silc_auth_get_data @ 28 ;\r
+       silc_auth_get_method @ 29 ;\r
+       silc_auth_get_public_data @ 30 ;\r
+       silc_auth_payload_encode @ 31 ;\r
+       silc_auth_payload_free @ 32 ;\r
+       silc_auth_payload_parse @ 33 ;\r
+       silc_auth_public_key_auth_generate @ 34 ;\r
+       silc_auth_public_key_auth_generate_wpub @ 35 ;\r
+       silc_auth_public_key_auth_verify @ 36 ;\r
+       silc_auth_public_key_auth_verify_data @ 37 ;\r
+       silc_auth_verify @ 38 ;\r
+       silc_auth_verify_data @ 39 ;\r
+       silc_key_agreement_get_hostname @ 40 ;\r
+       silc_key_agreement_get_port @ 41 ;\r
+       silc_key_agreement_get_protocol @ 42 ;\r
+       silc_key_agreement_payload_encode @ 43 ;\r
+       silc_key_agreement_payload_free @ 44 ;\r
+       silc_key_agreement_payload_parse @ 45 ;\r
+       silc_id_dup @ 46 ;\r
+       silc_id_get_len @ 47 ;\r
+       silc_id_id2str @ 48 ;\r
+       silc_id_payload_encode @ 49 ;\r
+       silc_id_payload_encode_data @ 50 ;\r
+       silc_id_payload_free @ 51 ;\r
+       silc_id_payload_get_data @ 52 ;\r
+       silc_id_payload_get_id @ 53 ;\r
+       silc_id_payload_get_len @ 54 ;\r
+       silc_id_payload_get_type @ 55 ;\r
+       silc_id_payload_parse @ 56 ;\r
+       silc_id_payload_parse_id @ 57 ;\r
+       silc_id_str2id @ 58 ;\r
+       silc_id_str2id2 @ 59 ;\r
+       silc_attribute_get_attribute @ 60 ;\r
+       silc_attribute_get_data @ 61 ;\r
+       silc_attribute_get_flags @ 62 ;\r
+       silc_attribute_get_object @ 63 ;\r
+       silc_attribute_get_verify_data @ 64 ;\r
+       silc_attribute_payload_alloc @ 65 ;\r
+       silc_attribute_payload_encode @ 66 ;\r
+       silc_attribute_payload_encode_data @ 67 ;\r
+       silc_attribute_payload_free @ 68 ;\r
+       silc_attribute_payload_list_free @ 69 ;\r
+       silc_attribute_payload_parse @ 70 ;\r
+       silc_channel_get_id @ 71 ;\r
+       silc_channel_get_id_parse @ 72 ;\r
+       silc_channel_get_mode @ 73 ;\r
+       silc_channel_get_name @ 74 ;\r
+       silc_channel_key_get_cipher @ 75 ;\r
+       silc_channel_key_get_id @ 76 ;\r
+       silc_channel_key_get_key @ 77 ;\r
+       silc_channel_key_payload_encode @ 78 ;\r
+       silc_channel_key_payload_free @ 79 ;\r
+       silc_channel_key_payload_parse @ 80 ;\r
+       silc_channel_payload_encode @ 81 ;\r
+       silc_channel_payload_free @ 82 ;\r
+       silc_channel_payload_list_free @ 83 ;\r
+       silc_channel_payload_parse @ 84 ;\r
+       silc_channel_payload_parse_list @ 85 ;\r
+       silc_packet_engine_get_streams @ 86 ;\r
+       silc_packet_engine_start @ 87 ;\r
+       silc_packet_engine_stop @ 88 ;\r
+       silc_packet_error_string @ 89 ;\r
+       silc_packet_free @ 90 ;\r
+       silc_packet_get_context @ 91 ;\r
+       silc_packet_get_engine @ 92 ;\r
+       silc_packet_get_ids @ 93 ;\r
+       silc_packet_get_keys @ 94 ;\r
+       silc_packet_get_sender @ 95 ;\r
+       silc_packet_send @ 96 ;\r
+       silc_packet_send_ext @ 97 ;\r
+       silc_packet_send_va @ 98 ;\r
+       silc_packet_send_va_ext @ 99 ;\r
+       silc_packet_set_context @ 100 ;\r
+       silc_packet_set_ids @ 101 ;\r
+       silc_packet_set_keys @ 102 ;\r
+       silc_packet_set_sid @ 103 ;\r
+       silc_packet_stream_add_remote @ 104 ;\r
+       silc_packet_stream_create @ 105 ;\r
+       silc_packet_stream_destroy @ 106 ;\r
+       silc_packet_stream_get_stream @ 107 ;\r
+       silc_packet_stream_inject_packet @ 108 ;\r
+       silc_packet_stream_is_udp @ 109 ;\r
+       silc_packet_stream_is_valid @ 110 ;\r
+       silc_packet_stream_link @ 111 ;\r
+       silc_packet_stream_ref @ 112 ;\r
+       silc_packet_stream_set_iv_included @ 113 ;\r
+       silc_packet_stream_set_router @ 114 ;\r
+       silc_packet_stream_set_stream @ 115 ;\r
+       silc_packet_stream_unlink @ 116 ;\r
+       silc_packet_stream_unref @ 117 ;\r
+       silc_packet_stream_wrap @ 118 ;\r
+       silc_packet_wait @ 119 ;\r
+       silc_packet_wait_init @ 120 ;\r
+       silc_packet_wait_uninit @ 121 ;\r
+       silc_packet_wrap_close @ 122 ;\r
+       silc_packet_wrap_destroy @ 123 ;\r
+       silc_packet_wrap_get_schedule @ 124 ;\r
+       silc_packet_wrap_notifier @ 125 ;\r
+       silc_packet_wrap_read @ 126 ;\r
+       silc_packet_wrap_read_more @ 127 ;\r
+       silc_packet_wrap_write @ 128 ;\r
+       silc_notify_get_arg_num @ 129 ;\r
+       silc_notify_get_args @ 130 ;\r
+       silc_notify_get_type @ 131 ;\r
+       silc_notify_payload_encode @ 132 ;\r
+       silc_notify_payload_encode_args @ 133 ;\r
+       silc_notify_payload_free @ 134 ;\r
+       silc_notify_payload_parse @ 135 ;\r
+       silc_status_get_args @ 136 ;\r
+       silc_message_get_data @ 137 ;\r
+       silc_message_get_flags @ 138 ;\r
+       silc_message_get_mac @ 139 ;\r
+       silc_message_payload_decrypt @ 140 ;\r
+       silc_message_payload_encode @ 141 ;\r
+       silc_message_payload_encrypt @ 142 ;\r
+       silc_message_payload_free @ 143 ;\r
+       silc_message_payload_parse @ 144 ;\r
+       silc_message_signed_get_public_key @ 145 ;\r
+       silc_message_signed_verify @ 146 ;\r
+       silc_public_key_payload_decode @ 147 ;\r
+       silc_public_key_payload_encode @ 148 ;\r
+       silc_file_set_nonblock @ 149 ;\r
+       silc_get_real_name @ 150 ;\r
+       silc_get_username @ 151 ;\r
+       silc_gettimeofday @ 152 ;\r
+       silc_cond_alloc @ 153 ;\r
+       silc_cond_broadcast @ 154 ;\r
+       silc_cond_free @ 155 ;\r
+       silc_cond_signal @ 156 ;\r
+       silc_cond_timedwait @ 157 ;\r
+       silc_cond_wait @ 158 ;\r
+       silc_mutex_alloc @ 159 ;\r
+       silc_mutex_assert_locked @ 160 ;\r
+       silc_mutex_free @ 161 ;\r
+       silc_mutex_lock @ 162 ;\r
+       silc_mutex_unlock @ 163 ;\r
+       silc_rwlock_alloc @ 164 ;\r
+       silc_rwlock_free @ 165 ;\r
+       silc_rwlock_rdlock @ 166 ;\r
+       silc_rwlock_unlock @ 167 ;\r
+       silc_rwlock_wrlock @ 168 ;\r
+       silc_thread_create @ 169 ;\r
+       silc_thread_exit @ 170 ;\r
+       silc_thread_self @ 171 ;\r
+       silc_thread_wait @ 172 ;\r
+       silc_thread_yield @ 173 ;\r
+       silc_socket_stream_close @ 174 ;\r
+       silc_socket_stream_destroy @ 175 ;\r
+       silc_socket_stream_notifier @ 176 ;\r
+       silc_socket_stream_read @ 177 ;\r
+       silc_socket_stream_write @ 178 ;\r
+       silc_socket_udp_stream_read @ 179 ;\r
+       silc_socket_udp_stream_write @ 180 ;\r
+       silc_net_accept @ 181 ;\r
+       silc_net_addr2bin @ 182 ;\r
+       silc_net_close_connection @ 183 ;\r
+       silc_net_close_listener @ 184 ;\r
+       silc_net_set_socket_nonblock @ 185 ;\r
+       silc_net_tcp_connect @ 186 ;\r
+       silc_net_tcp_create_listener @ 187 ;\r
+       silc_net_udp_connect @ 188 ;\r
+       silc_net_udp_receive @ 189 ;\r
+       silc_net_udp_send @ 190 ;\r
+       silc_schedule_internal_init @ 191 ;\r
+       silc_schedule_internal_schedule_fd @ 192 ;\r
+       silc_schedule_internal_signal_register @ 193 ;\r
+       silc_schedule_internal_signal_unregister @ 194 ;\r
+       silc_schedule_internal_signals_block @ 195 ;\r
+       silc_schedule_internal_signals_call @ 196 ;\r
+       silc_schedule_internal_signals_unblock @ 197 ;\r
+       silc_schedule_internal_uninit @ 198 ;\r
+       silc_schedule_internal_wakeup @ 199 ;\r
+       silc_fd_stream_close @ 200 ;\r
+       silc_fd_stream_create @ 201 ;\r
+       silc_fd_stream_create2 @ 202 ;\r
+       silc_fd_stream_destroy @ 203 ;\r
+       silc_fd_stream_file @ 204 ;\r
+       silc_fd_stream_file2 @ 205 ;\r
+       silc_fd_stream_get_error @ 206 ;\r
+       silc_fd_stream_get_info @ 207 ;\r
+       silc_fd_stream_get_schedule @ 208 ;\r
+       silc_fd_stream_notifier @ 209 ;\r
+       silc_fd_stream_read @ 210 ;\r
+       silc_fd_stream_write @ 211 ;\r
+       silc_hash_table_add @ 212 ;\r
+       silc_hash_table_add_ext @ 213 ;\r
+       silc_hash_table_alloc @ 214 ;\r
+       silc_hash_table_count @ 215 ;\r
+       silc_hash_table_del @ 216 ;\r
+       silc_hash_table_del_by_context @ 217 ;\r
+       silc_hash_table_del_by_context_ext @ 218 ;\r
+       silc_hash_table_del_ext @ 219 ;\r
+       silc_hash_table_find @ 220 ;\r
+       silc_hash_table_find_by_context @ 221 ;\r
+       silc_hash_table_find_by_context_ext @ 222 ;\r
+       silc_hash_table_find_ext @ 223 ;\r
+       silc_hash_table_find_foreach @ 224 ;\r
+       silc_hash_table_find_foreach_ext @ 225 ;\r
+       silc_hash_table_foreach @ 226 ;\r
+       silc_hash_table_free @ 227 ;\r
+       silc_hash_table_get @ 228 ;\r
+       silc_hash_table_list @ 229 ;\r
+       silc_hash_table_list_reset @ 230 ;\r
+       silc_hash_table_rehash @ 231 ;\r
+       silc_hash_table_rehash_ext @ 232 ;\r
+       silc_hash_table_replace @ 233 ;\r
+       silc_hash_table_replace_ext @ 234 ;\r
+       silc_hash_table_size @ 235 ;\r
+       silc_schedule @ 236 ;\r
+       silc_schedule_get_context @ 237 ;\r
+       silc_schedule_get_fd_events @ 238 ;\r
+       silc_schedule_init @ 239 ;\r
+       silc_schedule_one @ 240 ;\r
+       silc_schedule_set_listen_fd @ 241 ;\r
+       silc_schedule_stop @ 242 ;\r
+       silc_schedule_task_add @ 243 ;\r
+       silc_schedule_task_del @ 244 ;\r
+       silc_schedule_task_del_by_all @ 245 ;\r
+       silc_schedule_task_del_by_callback @ 246 ;\r
+       silc_schedule_task_del_by_context @ 247 ;\r
+       silc_schedule_task_del_by_fd @ 248 ;\r
+       silc_schedule_uninit @ 249 ;\r
+       silc_schedule_unset_listen_fd @ 250 ;\r
+       silc_schedule_wakeup @ 251 ;\r
+       silc_calloc @ 252 ;\r
+       silc_free @ 253 ;\r
+       silc_malloc @ 254 ;\r
+       silc_memdup @ 255 ;\r
+       silc_realloc @ 256 ;\r
+       silc_scalloc @ 257 ;\r
+       silc_smalloc @ 258 ;\r
+       silc_smalloc_ua @ 259 ;\r
+       silc_smemdup @ 260 ;\r
+       silc_srealloc @ 261 ;\r
+       silc_srealloc_ua @ 262 ;\r
+       silc_sstrdup @ 263 ;\r
+       silc_config_close @ 264 ;\r
+       silc_config_get_filename @ 265 ;\r
+       silc_config_get_line @ 266 ;\r
+       silc_config_init @ 267 ;\r
+       silc_config_main @ 268 ;\r
+       silc_config_open @ 269 ;\r
+       silc_config_read_current_line @ 270 ;\r
+       silc_config_read_line @ 271 ;\r
+       silc_config_register @ 272 ;\r
+       silc_config_register_table @ 273 ;\r
+       silc_config_strerror @ 274 ;\r
+       silc_log_debug @ 275 ;\r
+       silc_log_debug_hexdump @ 276 ;\r
+       silc_log_fflush_callback @ 277 ;\r
+       silc_log_flush_all @ 278 ;\r
+       silc_log_flushdelay @ 279 ;\r
+       silc_log_get_file @ 280 ;\r
+       silc_log_output @ 281 ;\r
+       silc_log_output_debug @ 282 ;\r
+       silc_log_output_hexdump @ 283 ;\r
+       silc_log_quick @ 284 ;\r
+       silc_log_reset_all @ 285 ;\r
+       silc_log_reset_callbacks @ 286 ;\r
+       silc_log_reset_debug_callbacks @ 287 ;\r
+       silc_log_set_callback @ 288 ;\r
+       silc_log_set_debug_callbacks @ 289 ;\r
+       silc_log_set_debug_string @ 290 ;\r
+       silc_log_set_file @ 291 ;\r
+       silc_log_timestamp @ 292 ;\r
+       silc_net_accept_connection @ 293 ;\r
+       silc_net_check_host_by_sock @ 294 ;\r
+       silc_net_check_local_by_sock @ 295 ;\r
+       silc_net_get_error_string @ 296 ;\r
+       silc_net_get_local_port @ 297 ;\r
+       silc_net_get_remote_port @ 298 ;\r
+       silc_net_get_socket_opt @ 299 ;\r
+       silc_net_gethostbyaddr @ 300 ;\r
+       silc_net_gethostbyaddr_async @ 301 ;\r
+       silc_net_gethostbyname @ 302 ;\r
+       silc_net_gethostbyname_async @ 303 ;\r
+       silc_net_is_ip @ 304 ;\r
+       silc_net_is_ip4 @ 305 ;\r
+       silc_net_is_ip6 @ 306 ;\r
+       silc_net_listener_get_hostname @ 307 ;\r
+       silc_net_listener_get_ip @ 308 ;\r
+       silc_net_listener_get_port @ 309 ;\r
+       silc_net_localhost @ 310 ;\r
+       silc_net_localip @ 311 ;\r
+       silc_net_resolve_completion @ 312 ;\r
+       silc_net_set_socket_opt @ 313 ;\r
+       silc_stringprep @ 314 ;\r
+       silc_socket_host_lookup_finish @ 315 ;\r
+       silc_socket_stream_get_error @ 316 ;\r
+       silc_socket_stream_get_info @ 317 ;\r
+       silc_socket_stream_get_schedule @ 318 ;\r
+       silc_socket_stream_is_udp @ 319 ;\r
+       silc_socket_stream_set_info @ 320 ;\r
+       silc_socket_stream_set_qos @ 321 ;\r
+       silc_socket_tcp_stream_create @ 322 ;\r
+       silc_socket_udp_stream_create @ 323 ;\r
+       silc_compare_timeval @ 324 ;\r
+       silc_time @ 325 ;\r
+       silc_time_generalized @ 326 ;\r
+       silc_time_generalized_string @ 327 ;\r
+       silc_time_msec @ 328 ;\r
+       silc_time_string @ 329 ;\r
+       silc_time_universal @ 330 ;\r
+       silc_time_universal_string @ 331 ;\r
+       silc_time_usec @ 332 ;\r
+       silc_time_value @ 333 ;\r
+       silc_timezone @ 334 ;\r
+       silc_file_close @ 335 ;\r
+       silc_file_open @ 336 ;\r
+       silc_file_open_mode @ 337 ;\r
+       silc_file_read @ 338 ;\r
+       silc_file_readfile @ 339 ;\r
+       silc_file_size @ 340 ;\r
+       silc_file_write @ 341 ;\r
+       silc_file_writefile @ 342 ;\r
+       silc_file_writefile_mode @ 343 ;\r
+       silc_check_line @ 344 ;\r
+       silc_fingerprint @ 345 ;\r
+       silc_format @ 346 ;\r
+       silc_get_input @ 347 ;\r
+       silc_gets @ 348 ;\r
+       silc_hash_client_id_compare @ 349 ;\r
+       silc_hash_client_id_hash @ 350 ;\r
+       silc_hash_data @ 351 ;\r
+       silc_hash_data_compare @ 352 ;\r
+       silc_hash_id @ 353 ;\r
+       silc_hash_id_compare @ 354 ;\r
+       silc_hash_id_compare_full @ 355 ;\r
+       silc_hash_ptr @ 356 ;\r
+       silc_hash_public_key @ 357 ;\r
+       silc_hash_public_key_compare @ 358 ;\r
+       silc_hash_string @ 359 ;\r
+       silc_hash_string_compare @ 360 ;\r
+       silc_hash_uint @ 361 ;\r
+       silc_hash_utf8_compare @ 362 ;\r
+       silc_hash_utf8_string @ 363 ;\r
+       silc_parse_command_line @ 364 ;\r
+       silc_parse_userfqdn @ 365 ;\r
+       silc_string_is_ascii @ 366 ;\r
+       silc_to_lower @ 367 ;\r
+       silc_to_upper @ 368 ;\r
+       silc_utf8_decode @ 369 ;\r
+       silc_utf8_decoded_len @ 370 ;\r
+       silc_utf8_encode @ 371 ;\r
+       silc_utf8_encoded_len @ 372 ;\r
+       silc_utf8_strcasecmp @ 373 ;\r
+       silc_utf8_strncasecmp @ 374 ;\r
+       silc_utf8_valid @ 375 ;\r
+       silc_base64_decode @ 376 ;\r
+       silc_base64_encode @ 377 ;\r
+       silc_base64_encode_file @ 378 ;\r
+       silc_string_compare @ 379 ;\r
+       silc_string_match @ 380 ;\r
+       silc_string_regex_combine @ 381 ;\r
+       silc_string_regex_match @ 382 ;\r
+       silc_string_regexify @ 383 ;\r
+       silc_string_split @ 384 ;\r
+       silc_strncat @ 385 ;\r
+       silc_fsm_alloc @ 386 ;\r
+       silc_fsm_continue @ 387 ;\r
+       silc_fsm_continue_sync @ 388 ;\r
+       silc_fsm_event_alloc @ 389 ;\r
+       silc_fsm_event_free @ 390 ;\r
+       silc_fsm_event_init @ 391 ;\r
+       silc_fsm_event_signal @ 392 ;\r
+       silc_fsm_event_timedwait @ 393 ;\r
+       silc_fsm_event_wait @ 394 ;\r
+       silc_fsm_finish @ 395 ;\r
+       silc_fsm_free @ 396 ;\r
+       silc_fsm_get_context @ 397 ;\r
+       silc_fsm_get_machine @ 398 ;\r
+       silc_fsm_get_schedule @ 399 ;\r
+       silc_fsm_get_state_context @ 400 ;\r
+       silc_fsm_init @ 401 ;\r
+       silc_fsm_is_started @ 402 ;\r
+       silc_fsm_next @ 403 ;\r
+       silc_fsm_next_later @ 404 ;\r
+       silc_fsm_set_context @ 405 ;\r
+       silc_fsm_set_state_context @ 406 ;\r
+       silc_fsm_signal @ 407 ;\r
+       silc_fsm_start @ 408 ;\r
+       silc_fsm_start_sync @ 409 ;\r
+       silc_fsm_thread @ 410 ;\r
+       silc_fsm_thread_alloc @ 411 ;\r
+       silc_fsm_thread_init @ 412 ;\r
+       silc_fsm_thread_wait @ 413 ;\r
+       silc_buffer_format @ 414 ;\r
+       silc_buffer_format_vp @ 415 ;\r
+       silc_buffer_sformat @ 416 ;\r
+       silc_buffer_sformat_vp @ 417 ;\r
+       silc_buffer_sstrformat @ 418 ;\r
+       silc_buffer_strformat @ 419 ;\r
+       silc_buffer_sunformat @ 420 ;\r
+       silc_buffer_sunformat_vp @ 421 ;\r
+       silc_buffer_unformat @ 422 ;\r
+       silc_buffer_unformat_vp @ 423 ;\r
+       silc_stream_close @ 424 ;\r
+       silc_stream_destroy @ 425 ;\r
+       silc_stream_get_schedule @ 426 ;\r
+       silc_stream_read @ 427 ;\r
+       silc_stream_set_notifier @ 428 ;\r
+       silc_stream_write @ 429 ;\r
+       silc_async_abort @ 430 ;\r
+       silc_async_alloc @ 431 ;\r
+       silc_async_free @ 432 ;\r
+       silc_async_get_context @ 433 ;\r
+       silc_async_halt @ 434 ;\r
+       silc_async_init @ 435 ;\r
+       silc_async_resume @ 436 ;\r
+       silc_asprintf @ 437 ;\r
+       silc_snprintf @ 438 ;\r
+       silc_vasprintf @ 439 ;\r
+       silc_vsnprintf @ 440 ;\r
+       silc_mime_add_data @ 441 ;\r
+       silc_mime_add_field @ 442 ;\r
+       silc_mime_add_multipart @ 443 ;\r
+       silc_mime_alloc @ 444 ;\r
+       silc_mime_assemble @ 445 ;\r
+       silc_mime_assembler_alloc @ 446 ;\r
+       silc_mime_assembler_free @ 447 ;\r
+       silc_mime_decode @ 448 ;\r
+       silc_mime_encode @ 449 ;\r
+       silc_mime_encode_partial @ 450 ;\r
+       silc_mime_free @ 451 ;\r
+       silc_mime_get_data @ 452 ;\r
+       silc_mime_get_field @ 453 ;\r
+       silc_mime_get_multiparts @ 454 ;\r
+       silc_mime_is_multipart @ 455 ;\r
+       silc_mime_is_partial @ 456 ;\r
+       silc_mime_partial_free @ 457 ;\r
+       silc_mime_set_multipart @ 458 ;\r
+       silc_mime_steal_data @ 459 ;\r
+       silc_idcache_add @ 460 ;\r
+       silc_idcache_alloc @ 461 ;\r
+       silc_idcache_del @ 462 ;\r
+       silc_idcache_del_by_context @ 463 ;\r
+       silc_idcache_del_by_id @ 464 ;\r
+       silc_idcache_find_by_context @ 465 ;\r
+       silc_idcache_find_by_id @ 466 ;\r
+       silc_idcache_find_by_id_one @ 467 ;\r
+       silc_idcache_find_by_name @ 468 ;\r
+       silc_idcache_find_by_name_one @ 469 ;\r
+       silc_idcache_free @ 470 ;\r
+       silc_idcache_get_all @ 471 ;\r
+       silc_idcache_update @ 472 ;\r
+       silc_idcache_update_by_context @ 473 ;\r
+       silc_change_private_key_passphrase @ 474 ;\r
+       silc_channel_name_check @ 475 ;\r
+       silc_channel_name_verify @ 476 ;\r
+       silc_client_chmode @ 477 ;\r
+       silc_client_chumode @ 478 ;\r
+       silc_client_chumode_char @ 479 ;\r
+       silc_create_key_pair @ 480 ;\r
+       silc_get_command_name @ 481 ;\r
+       silc_get_mode_list @ 482 ;\r
+       silc_get_packet_name @ 483 ;\r
+       silc_get_status_message @ 484 ;\r
+       silc_id_render @ 485 ;\r
+       silc_identifier_check @ 486 ;\r
+       silc_identifier_verify @ 487 ;\r
+       silc_load_key_pair @ 488 ;\r
+       silc_parse_version_string @ 489 ;\r
+       silc_show_public_key @ 490 ;\r
+       silc_show_public_key_file @ 491 ;\r
+       silc_version_to_num @ 492 ;\r
+       silc_rc5_cbc_context_len @ 493 ;\r
+       silc_rc5_cbc_decrypt @ 494 ;\r
+       silc_rc5_cbc_encrypt @ 495 ;\r
+       silc_rc5_cbc_set_iv @ 496 ;\r
+       silc_rc5_cbc_set_key @ 497 ;\r
+       silc_sha256_context_len @ 498 ;\r
+       silc_sha256_final @ 499 ;\r
+       silc_sha256_init @ 500 ;\r
+       silc_sha256_transform @ 501 ;\r
+       silc_sha256_update @ 502 ;\r
+       silc_none_context_len @ 503 ;\r
+       silc_none_decrypt @ 504 ;\r
+       silc_none_encrypt @ 505 ;\r
+       silc_none_set_iv @ 506 ;\r
+       silc_none_set_key @ 507 ;\r
+       silc_sha1_context_len @ 508 ;\r
+       silc_sha1_final @ 509 ;\r
+       silc_sha1_init @ 510 ;\r
+       silc_sha1_transform @ 511 ;\r
+       silc_sha1_update @ 512 ;\r
+       silc_pkcs_algorithm_register @ 513 ;\r
+       silc_pkcs_algorithm_unregister @ 514 ;\r
+       silc_pkcs_decrypt @ 515 ;\r
+       silc_pkcs_encrypt @ 516 ;\r
+       silc_pkcs_find_algorithm @ 517 ;\r
+       silc_pkcs_find_pkcs @ 518 ;\r
+       silc_pkcs_get_algorithm @ 519 ;\r
+       silc_pkcs_get_context @ 520 ;\r
+       silc_pkcs_get_name @ 521 ;\r
+       silc_pkcs_get_pkcs @ 522 ;\r
+       silc_pkcs_get_supported @ 523 ;\r
+       silc_pkcs_get_type @ 524 ;\r
+       silc_pkcs_load_private_key @ 525 ;\r
+       silc_pkcs_load_public_key @ 526 ;\r
+       silc_pkcs_private_key_alloc @ 527 ;\r
+       silc_pkcs_private_key_free @ 528 ;\r
+       silc_pkcs_private_key_get_len @ 529 ;\r
+       silc_pkcs_public_key_alloc @ 530 ;\r
+       silc_pkcs_public_key_compare @ 531 ;\r
+       silc_pkcs_public_key_copy @ 532 ;\r
+       silc_pkcs_public_key_encode @ 533 ;\r
+       silc_pkcs_public_key_free @ 534 ;\r
+       silc_pkcs_public_key_get_len @ 535 ;\r
+       silc_pkcs_register @ 536 ;\r
+       silc_pkcs_register_default @ 537 ;\r
+       silc_pkcs_save_private_key @ 538 ;\r
+       silc_pkcs_save_public_key @ 539 ;\r
+       silc_pkcs_sign @ 540 ;\r
+       silc_pkcs_unregister @ 541 ;\r
+       silc_pkcs_unregister_all @ 542 ;\r
+       silc_pkcs_verify @ 543 ;\r
+       silc_hash_alloc @ 544 ;\r
+       silc_hash_alloc_by_oid @ 545 ;\r
+       silc_hash_babbleprint @ 546 ;\r
+       silc_hash_block_len @ 547 ;\r
+       silc_hash_final @ 548 ;\r
+       silc_hash_fingerprint @ 549 ;\r
+       silc_hash_free @ 550 ;\r
+       silc_hash_get_name @ 551 ;\r
+       silc_hash_get_oid @ 552 ;\r
+       silc_hash_get_supported @ 553 ;\r
+       silc_hash_init @ 554 ;\r
+       silc_hash_is_supported @ 555 ;\r
+       silc_hash_len @ 556 ;\r
+       silc_hash_make @ 557 ;\r
+       silc_hash_register @ 558 ;\r
+       silc_hash_register_default @ 559 ;\r
+       silc_hash_transform @ 560 ;\r
+       silc_hash_unregister @ 561 ;\r
+       silc_hash_unregister_all @ 562 ;\r
+       silc_hash_update @ 563 ;\r
+       silc_aes_cbc_context_len @ 564 ;\r
+       silc_aes_cbc_decrypt @ 565 ;\r
+       silc_aes_cbc_encrypt @ 566 ;\r
+       silc_aes_cbc_set_iv @ 567 ;\r
+       silc_aes_cbc_set_key @ 568 ;\r
+       silc_aes_ctr_context_len @ 569 ;\r
+       silc_aes_ctr_decrypt @ 570 ;\r
+       silc_aes_ctr_encrypt @ 571 ;\r
+       silc_aes_ctr_set_iv @ 572 ;\r
+       silc_aes_ctr_set_key @ 573 ;\r
+       silc_pkcs1_decode @ 574 ;\r
+       silc_pkcs1_decrypt @ 575 ;\r
+       silc_pkcs1_encode @ 576 ;\r
+       silc_pkcs1_encrypt @ 577 ;\r
+       silc_pkcs1_export_private_key @ 578 ;\r
+       silc_pkcs1_export_public_key @ 579 ;\r
+       silc_pkcs1_generate_key @ 580 ;\r
+       silc_pkcs1_import_private_key @ 581 ;\r
+       silc_pkcs1_import_public_key @ 582 ;\r
+       silc_pkcs1_private_key_bitlen @ 583 ;\r
+       silc_pkcs1_private_key_free @ 584 ;\r
+       silc_pkcs1_public_key_bitlen @ 585 ;\r
+       silc_pkcs1_public_key_compare @ 586 ;\r
+       silc_pkcs1_public_key_copy @ 587 ;\r
+       silc_pkcs1_public_key_free @ 588 ;\r
+       silc_pkcs1_sign @ 589 ;\r
+       silc_pkcs1_sign_no_oid @ 590 ;\r
+       silc_pkcs1_verify @ 591 ;\r
+       silc_pkcs1_verify_no_oid @ 592 ;\r
+       silc_cast_cbc_context_len @ 593 ;\r
+       silc_cast_cbc_decrypt @ 594 ;\r
+       silc_cast_cbc_encrypt @ 595 ;\r
+       silc_cast_cbc_set_iv @ 596 ;\r
+       silc_cast_cbc_set_key @ 597 ;\r
+       silc_cipher_alloc @ 598 ;\r
+       silc_cipher_decrypt @ 599 ;\r
+       silc_cipher_encrypt @ 600 ;\r
+       silc_cipher_free @ 601 ;\r
+       silc_cipher_get_block_len @ 602 ;\r
+       silc_cipher_get_iv @ 603 ;\r
+       silc_cipher_get_iv_len @ 604 ;\r
+       silc_cipher_get_key_len @ 605 ;\r
+       silc_cipher_get_mode @ 606 ;\r
+       silc_cipher_get_name @ 607 ;\r
+       silc_cipher_get_supported @ 608 ;\r
+       silc_cipher_is_supported @ 609 ;\r
+       silc_cipher_register @ 610 ;\r
+       silc_cipher_register_default @ 611 ;\r
+       silc_cipher_set_iv @ 612 ;\r
+       silc_cipher_set_key @ 613 ;\r
+       silc_cipher_unregister @ 614 ;\r
+       silc_cipher_unregister_all @ 615 ;\r
+       silc_md5_context_len @ 616 ;\r
+       silc_md5_final @ 617 ;\r
+       silc_md5_init @ 618 ;\r
+       silc_md5_transform @ 619 ;\r
+       silc_md5_update @ 620 ;\r
+       silc_rsa_generate_keys @ 621 ;\r
+       silc_rsa_private_operation @ 622 ;\r
+       silc_rsa_public_operation @ 623 ;\r
+       silc_blowfish_cbc_context_len @ 624 ;\r
+       silc_blowfish_cbc_decrypt @ 625 ;\r
+       silc_blowfish_cbc_encrypt @ 626 ;\r
+       silc_blowfish_cbc_set_iv @ 627 ;\r
+       silc_blowfish_cbc_set_key @ 628 ;\r
+       silc_twofish_cbc_context_len @ 629 ;\r
+       silc_twofish_cbc_decrypt @ 630 ;\r
+       silc_twofish_cbc_encrypt @ 631 ;\r
+       silc_twofish_cbc_set_iv @ 632 ;\r
+       silc_twofish_cbc_set_key @ 633 ;\r
+       silc_hmac_alloc @ 634 ;\r
+       silc_hmac_final @ 635 ;\r
+       silc_hmac_free @ 636 ;\r
+       silc_hmac_get_hash @ 637 ;\r
+       silc_hmac_get_key @ 638 ;\r
+       silc_hmac_get_name @ 639 ;\r
+       silc_hmac_get_supported @ 640 ;\r
+       silc_hmac_init @ 641 ;\r
+       silc_hmac_init_with_key @ 642 ;\r
+       silc_hmac_is_supported @ 643 ;\r
+       silc_hmac_len @ 644 ;\r
+       silc_hmac_make @ 645 ;\r
+       silc_hmac_make_truncated @ 646 ;\r
+       silc_hmac_make_with_key @ 647 ;\r
+       silc_hmac_register @ 648 ;\r
+       silc_hmac_register_default @ 649 ;\r
+       silc_hmac_set_key @ 650 ;\r
+       silc_hmac_unregister @ 651 ;\r
+       silc_hmac_unregister_all @ 652 ;\r
+       silc_hmac_update @ 653 ;\r
+       silc_rng_add_noise @ 654 ;\r
+       silc_rng_alloc @ 655 ;\r
+       silc_rng_free @ 656 ;\r
+       silc_rng_get_byte @ 657 ;\r
+       silc_rng_get_byte_fast @ 658 ;\r
+       silc_rng_get_rn16 @ 659 ;\r
+       silc_rng_get_rn32 @ 660 ;\r
+       silc_rng_get_rn_data @ 661 ;\r
+       silc_rng_get_rn_string @ 662 ;\r
+       silc_rng_global_add_noise @ 663 ;\r
+       silc_rng_global_get_byte @ 664 ;\r
+       silc_rng_global_get_byte_fast @ 665 ;\r
+       silc_rng_global_get_rn16 @ 666 ;\r
+       silc_rng_global_get_rn32 @ 667 ;\r
+       silc_rng_global_get_rn_data @ 668 ;\r
+       silc_rng_global_get_rn_string @ 669 ;\r
+       silc_rng_global_init @ 670 ;\r
+       silc_rng_global_uninit @ 671 ;\r
+       silc_rng_init @ 672 ;\r
+       silc_pkcs_silc_decode_identifier @ 673 ;\r
+       silc_pkcs_silc_decrypt @ 674 ;\r
+       silc_pkcs_silc_encode_identifier @ 675 ;\r
+       silc_pkcs_silc_encrypt @ 676 ;\r
+       silc_pkcs_silc_export_private_key @ 677 ;\r
+       silc_pkcs_silc_export_private_key_file @ 678 ;\r
+       silc_pkcs_silc_export_public_key @ 679 ;\r
+       silc_pkcs_silc_export_public_key_file @ 680 ;\r
+       silc_pkcs_silc_generate_key @ 681 ;\r
+       silc_pkcs_silc_get_algorithm @ 682 ;\r
+       silc_pkcs_silc_import_private_key @ 683 ;\r
+       silc_pkcs_silc_import_private_key_file @ 684 ;\r
+       silc_pkcs_silc_import_public_key @ 685 ;\r
+       silc_pkcs_silc_import_public_key_file @ 686 ;\r
+       silc_pkcs_silc_private_key_bitlen @ 687 ;\r
+       silc_pkcs_silc_private_key_free @ 688 ;\r
+       silc_pkcs_silc_public_key_bitlen @ 689 ;\r
+       silc_pkcs_silc_public_key_compare @ 690 ;\r
+       silc_pkcs_silc_public_key_copy @ 691 ;\r
+       silc_pkcs_silc_public_key_free @ 692 ;\r
+       silc_pkcs_silc_public_key_version @ 693 ;\r
+       silc_pkcs_silc_sign @ 694 ;\r
+       silc_pkcs_silc_verify @ 695 ;\r
+       silc_skr_add_public_key @ 696 ;\r
+       silc_skr_add_public_key_simple @ 697 ;\r
+       silc_skr_alloc @ 698 ;\r
+       silc_skr_del_public_key @ 699 ;\r
+       silc_skr_find @ 700 ;\r
+       silc_skr_find_alloc @ 701 ;\r
+       silc_skr_find_free @ 702 ;\r
+       silc_skr_find_set_context @ 703 ;\r
+       silc_skr_find_set_country @ 704 ;\r
+       silc_skr_find_set_email @ 705 ;\r
+       silc_skr_find_set_host @ 706 ;\r
+       silc_skr_find_set_org @ 707 ;\r
+       silc_skr_find_set_pkcs_type @ 708 ;\r
+       silc_skr_find_set_public_key @ 709 ;\r
+       silc_skr_find_set_realname @ 710 ;\r
+       silc_skr_find_set_usage @ 711 ;\r
+       silc_skr_find_set_username @ 712 ;\r
+       silc_skr_free @ 713 ;\r
+       silc_skr_init @ 714 ;\r
+       silc_skr_ref_public_key @ 715 ;\r
+       silc_skr_uninit @ 716 ;\r
+       silc_skr_unref_public_key @ 717 ;\r
+       silc_mp_abs @ 718 ;\r
+       silc_mp_add @ 719 ;\r
+       silc_mp_add_ui @ 720 ;\r
+       silc_mp_and @ 721 ;\r
+       silc_mp_cmp @ 722 ;\r
+       silc_mp_cmp_si @ 723 ;\r
+       silc_mp_cmp_ui @ 724 ;\r
+       silc_mp_div @ 725 ;\r
+       silc_mp_div_2exp @ 726 ;\r
+       silc_mp_div_2exp_qr @ 727 ;\r
+       silc_mp_div_qr @ 728 ;\r
+       silc_mp_div_ui @ 729 ;\r
+       silc_mp_gcd @ 730 ;\r
+       silc_mp_gcdext @ 731 ;\r
+       silc_mp_get_str @ 732 ;\r
+       silc_mp_get_ui @ 733 ;\r
+       silc_mp_init @ 734 ;\r
+       silc_mp_mod @ 735 ;\r
+       silc_mp_mod_2exp @ 736 ;\r
+       silc_mp_mod_ui @ 737 ;\r
+       silc_mp_mul @ 738 ;\r
+       silc_mp_mul_2exp @ 739 ;\r
+       silc_mp_mul_ui @ 740 ;\r
+       silc_mp_neg @ 741 ;\r
+       silc_mp_or @ 742 ;\r
+       silc_mp_pow @ 743 ;\r
+       silc_mp_pow_mod @ 744 ;\r
+       silc_mp_pow_mod_ui @ 745 ;\r
+       silc_mp_pow_ui @ 746 ;\r
+       silc_mp_set @ 747 ;\r
+       silc_mp_set_si @ 748 ;\r
+       silc_mp_set_str @ 749 ;\r
+       silc_mp_set_ui @ 750 ;\r
+       silc_mp_sinit @ 751 ;\r
+       silc_mp_size @ 752 ;\r
+       silc_mp_sizeinbase @ 753 ;\r
+       silc_mp_sqrt @ 754 ;\r
+       silc_mp_sub @ 755 ;\r
+       silc_mp_sub_ui @ 756 ;\r
+       silc_mp_uninit @ 757 ;\r
+       silc_mp_xor @ 758 ;\r
+       silc_math_gen_prime @ 759 ;\r
+       silc_math_prime_test @ 760 ;\r
+       silc_mp_bin2mp @ 761 ;\r
+       silc_mp_mp2bin @ 762 ;\r
+       silc_mp_mp2bin_noalloc @ 763 ;\r
+       silc_mp_modinv @ 764 ;\r
+       silc_asn1_encode @ 772 ;\r
+       silc_asn1_alloc @ 773 ;\r
+       silc_asn1_free @ 775 ;\r
+       silc_asn1_init @ 776 ;\r
+       silc_asn1_uninit @ 778 ;\r
+       silc_asn1_decode @ 779 ;\r
+       silc_ber_decode @ 780 ;\r
+       silc_ber_encode @ 781 ;\r
+       silc_ber_encoded_len @ 782 ;\r
+       silc_connauth_alloc @ 783 ;\r
+       silc_connauth_free @ 784 ;\r
+       silc_connauth_get_ske @ 785 ;\r
+       silc_connauth_initiator @ 786 ;\r
+       silc_connauth_responder @ 787 ;\r
+       silc_connauth_timeout @ 788 ;\r
+       silc_ske_alloc @ 789 ;\r
+       silc_ske_free @ 790 ;\r
+       silc_ske_free_key_material @ 791 ;\r
+       silc_ske_free_rekey_material @ 792 ;\r
+       silc_ske_get_context @ 793 ;\r
+       silc_ske_get_key_material @ 794 ;\r
+       silc_ske_get_security_properties @ 795 ;\r
+       silc_ske_initiator @ 796 ;\r
+       silc_ske_map_status @ 797 ;\r
+       silc_ske_packet_send_retry @ 798 ;\r
+       silc_ske_parse_version @ 799 ;\r
+       silc_ske_process_key_material @ 800 ;\r
+       silc_ske_process_key_material_data @ 801 ;\r
+       silc_ske_rekey_initiator @ 802 ;\r
+       silc_ske_rekey_responder @ 803 ;\r
+       silc_ske_responder @ 804 ;\r
+       silc_ske_set_callbacks @ 805 ;\r
+       silc_ske_set_keys @ 806 ;\r
+       silc_ske_payload_ke_decode @ 807 ;\r
+       silc_ske_payload_ke_encode @ 808 ;\r
+       silc_ske_payload_ke_free @ 809 ;\r
+       silc_ske_payload_start_decode @ 810 ;\r
+       silc_ske_payload_start_encode @ 811 ;\r
+       silc_ske_payload_start_free @ 812 ;\r
+       silc_ske_get_supported_groups @ 813 ;\r
+       silc_ske_group_free @ 814 ;\r
+       silc_ske_group_get_by_name @ 815 ;\r
+       silc_ske_group_get_by_number @ 816 ;\r
+       silc_ske_group_get_name @ 817 ;\r
+       silc_ske_group_get_number @ 818 ;\r
+       silc_http_php @ 819 ;\r
+       silc_http_php_file @ 820 ;\r
+       silc_http_server_add_header @ 821 ;\r
+       silc_http_server_alloc @ 822 ;\r
+       silc_http_server_free @ 823 ;\r
+       silc_http_server_get_header @ 824 ;\r
+       silc_http_server_send @ 825 ;\r
+       silc_http_server_send_error @ 826 ;\r
+       silc_sftp_fs_memory_add_dir @ 827 ;\r
+       silc_sftp_fs_memory_add_file @ 828 ;\r
+       silc_sftp_fs_memory_alloc @ 829 ;\r
+       silc_sftp_fs_memory_del_dir @ 830 ;\r
+       silc_sftp_fs_memory_del_file @ 831 ;\r
+       silc_sftp_fs_memory_free @ 832 ;\r
+       silc_sftp_attr_decode @ 833 ;\r
+       silc_sftp_attr_encode @ 834 ;\r
+       silc_sftp_attr_free @ 835 ;\r
+       silc_sftp_map_errno @ 836 ;\r
+       silc_sftp_name_add @ 837 ;\r
+       silc_sftp_name_decode @ 838 ;\r
+       silc_sftp_name_encode @ 839 ;\r
+       silc_sftp_name_free @ 840 ;\r
+       silc_sftp_packet_decode @ 841 ;\r
+       silc_sftp_packet_encode @ 842 ;\r
+       silc_sftp_packet_encode_vp @ 843 ;\r
+       silc_sftp_client_shutdown @ 844 ;\r
+       silc_sftp_client_start @ 845 ;\r
+       silc_sftp_close @ 846 ;\r
+       silc_sftp_extended @ 847 ;\r
+       silc_sftp_fsetstat @ 848 ;\r
+       silc_sftp_fstat @ 849 ;\r
+       silc_sftp_lstat @ 850 ;\r
+       silc_sftp_mkdir @ 851 ;\r
+       silc_sftp_open @ 852 ;\r
+       silc_sftp_opendir @ 853 ;\r
+       silc_sftp_read @ 854 ;\r
+       silc_sftp_readdir @ 855 ;\r
+       silc_sftp_readlink @ 856 ;\r
+       silc_sftp_realpath @ 857 ;\r
+       silc_sftp_remove @ 858 ;\r
+       silc_sftp_rename @ 859 ;\r
+       silc_sftp_rmdir @ 860 ;\r
+       silc_sftp_setstat @ 861 ;\r
+       silc_sftp_stat @ 862 ;\r
+       silc_sftp_symlink @ 863 ;\r
+       silc_sftp_write @ 864 ;\r
+       silc_sftp_server_set_monitor @ 865 ;\r
+       silc_sftp_server_shutdown @ 866 ;\r
+       silc_sftp_server_start @ 867 ;\r
+       silc_vcard_alloc @ 868 ;\r
+       silc_vcard_decode @ 869 ;\r
+       silc_vcard_encode @ 870 ;\r
+       silc_vcard_fprintf @ 871 ;\r
+       silc_vcard_free @ 872 ;\r

diff --git a/win32/libsilc/libsilc.dsp b/win32/libsilc/libsilc.dsp
index f5988af3a0df67f4c7197b912a1aed06fa01f1dd..c921afe5e7e22c9dbe11eddf1daba4030bf7c0ce 100644 (file)
--- a/win32/libsilc/libsilc.dsp
+++ b/win32/libsilc/libsilc.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILC_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W2 /GX /O2 /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcsftp" /I "..\..\lib\contrib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILC_EXPORTS" /D "MP_API_COMPATIBLE" /D "DLL" /D "HAVE_SILCDEFS_H" /FD /Zm300 /c\r
+# ADD CPP /nologo /MT /W2 /GX /O2 /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcsftp" /I "..\..\lib\contrib" /I "..\..\lib\silcapputil" /I "..\..\lib\silcvcard" /I "..\..\lib\silchttp" /I "..\..\lib\silcskr" /I "..\..\lib\silcasn1" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILC_EXPORTS" /D "MP_API_COMPATIBLE" /D "DLL" /D "HAVE_SILCDEFS_H" /FD /Zm400 /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILC_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W2 /Gm /GX /ZI /Od /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcsftp" /I "..\..\lib\contrib" /D "_DEBUG" /D "SILC_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILC_EXPORTS" /D "MP_API_COMPATIBLE" /D "DLL" /D "HAVE_SILCDEFS_H" /FD /GZ /Zm300 /c\r
+# ADD CPP /nologo /MTd /W2 /Gm /GX /ZI /Od /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcsftp" /I "..\..\lib\contrib" /I "..\..\lib\silcapputil" /I "..\..\lib\silcvcard" /I "..\..\lib\silchttp" /I "..\..\lib\silcskr" /I "..\..\lib\silcasn1" /D "_DEBUG" /D "SILC_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILC_EXPORTS" /D "MP_API_COMPATIBLE" /D "DLL" /D "HAVE_SILCDEFS_H" /FD /Zm400 /GZ /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /dll /debug /machine:I386 /def:"libsilc.def" /pdbtype:sept\r
+# ADD LINK32 ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /def:"libsilc.def" /pdbtype:sept\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r
@@ -121,10 +121,6 @@ SOURCE=..\..\lib\silccore\silcid.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silccore\silcidcache.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\lib\silccore\silcmessage.c\r
 # End Source File\r
 # Begin Source File\r
@@ -137,6 +133,10 @@ SOURCE=..\..\lib\silccore\silcpacket.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silccore\silcpubkey.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silccore\silcstatus.c\r
 # End Source File\r
 # End Group\r
@@ -153,6 +153,10 @@ SOURCE=..\..\lib\silcske\payload.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silcske\silcconnauth.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silcske\silcske.c\r
 # End Source File\r
 # End Group\r
@@ -161,7 +165,7 @@ SOURCE=..\..\lib\silcske\silcske.c
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcapputil.c\r
+SOURCE=..\..\lib\silcutil\silcasync.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -173,10 +177,18 @@ SOURCE=..\..\lib\silcutil\silcconfig.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silcutil\silcfdstream.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silcutil\silcfileutil.c\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silcutil\silcfsm.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silcutil\silchashtable.c\r
 # End Source File\r
 # Begin Source File\r
@@ -189,11 +201,11 @@ SOURCE=..\..\lib\silcutil\silcmemory.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcnet.c\r
+SOURCE=..\..\lib\silcutil\silcmime.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcprotocol.c\r
+SOURCE=..\..\lib\silcutil\silcnet.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -201,31 +213,39 @@ SOURCE=..\..\lib\silcutil\silcschedule.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcsockconn.c\r
+SOURCE=..\..\lib\silcutil\silcsnprintf.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcstringprep.c\r
+SOURCE=..\..\lib\silcutil\silcsocketstream.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcstrutil.c\r
+SOURCE=..\..\lib\silcutil\silcstack.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcutf8.c\r
+SOURCE=..\..\lib\silcutil\silcstream.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcutil.c\r
+SOURCE=..\..\lib\silcutil\silcstringprep.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcvcard.c\r
+SOURCE=..\..\lib\silcutil\silcstrutil.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\win32\silcwin32mutex.c\r
+SOURCE=..\..\lib\silcutil\silctime.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcutf8.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcutil.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -237,7 +257,7 @@ SOURCE=..\..\lib\silcutil\win32\silcwin32schedule.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\win32\silcwin32sockconn.c\r
+SOURCE=..\..\lib\silcutil\win32\silcwin32socketstream.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -309,6 +329,10 @@ SOURCE=..\..\lib\silccrypt\sha1.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silccrypt\sha256.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silccrypt\silccipher.c\r
 # End Source File\r
 # Begin Source File\r
@@ -321,6 +345,10 @@ SOURCE=..\..\lib\silccrypt\silchmac.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silccrypt\silcpk.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silccrypt\silcpkcs.c\r
 # End Source File\r
 # Begin Source File\r
@@ -365,6 +393,10 @@ SOURCE=..\..\lib\contrib\nfkc.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\contrib\regexpr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\contrib\rfc3454.c\r
 # End Source File\r
 # Begin Source File\r
@@ -372,6 +404,66 @@ SOURCE=..\..\lib\contrib\rfc3454.c
 SOURCE=..\..\lib\contrib\stringprep.c\r
 # End Source File\r
 # End Group\r
+# Begin Group "silcapputil"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcapputil\silcapputil.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcapputil\silcidcache.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "silcvcard"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcvcard\silcvcard.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "silcskr"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcskr\silcskr.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "silchttp"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silchttp\silchttpphp.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silchttp\silchttpserver.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "silcasn1"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcasn1\silcasn1.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcasn1\silcasn1_decode.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcasn1\silcasn1_encode.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcasn1\silcber.c\r
+# End Source File\r
+# End Group\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r
@@ -405,10 +497,6 @@ SOURCE=..\..\lib\silccore\silcid.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silccore\silcidcache.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\lib\silccore\silcmessage.h\r
 # End Source File\r
 # Begin Source File\r
@@ -421,7 +509,11 @@ SOURCE=..\..\lib\silccore\silcnotify.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silccore\silcprivate.h\r
+SOURCE=..\..\lib\silccore\silcpacket.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silccore\silcpubkey.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -433,19 +525,27 @@ SOURCE=..\..\lib\silccore\silcstatus.h
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcske\groups.h\r
+SOURCE=..\..\lib\silcske\groups_internal.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcske\groups_internal.h\r
+SOURCE=..\..\lib\silcske\silcconnauth.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcske\payload.h\r
+SOURCE=..\..\lib\silcske\silcske.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcske\silcske.h\r
+SOURCE=..\..\lib\silcske\silcske_groups.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcske\silcske_i.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcske\silcske_payload.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -457,7 +557,15 @@ SOURCE=..\..\lib\silcske\silcske_status.h
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcapputil.h\r
+SOURCE=..\..\lib\silcutil\silcasync.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcasync_i.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcatomic.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -469,7 +577,7 @@ SOURCE=..\..\lib\silcutil\silcbuffmt.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcbufutil.h\r
+SOURCE=..\..\lib\silcutil\silccond.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -481,6 +589,22 @@ SOURCE=..\..\lib\silcutil\silcdlist.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silcutil\silcfdstream.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcfileutil.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcfsm.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcfsm_i.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silcutil\silchashtable.h\r
 # End Source File\r
 # Begin Source File\r
@@ -493,10 +617,22 @@ SOURCE=..\..\lib\silcutil\silclog.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silcutil\silclog_i.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silcutil\silcmemory.h\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silcutil\silcmime.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcmime_i.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silcutil\silcmutex.h\r
 # End Source File\r
 # Begin Source File\r
@@ -505,7 +641,7 @@ SOURCE=..\..\lib\silcutil\silcnet.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcprotocol.h\r
+SOURCE=..\..\lib\silcutil\silcnet_i.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -517,7 +653,27 @@ SOURCE=..\..\lib\silcutil\silcschedule_i.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcsockconn.h\r
+SOURCE=..\..\lib\silcutil\silcsnprintf.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcsocketstream.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcsocketstream_i.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcstack.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcstack_i.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcstream.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -525,23 +681,27 @@ SOURCE=..\..\lib\silcutil\silcstringprep.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silcutil\silcstrutil.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silcutil\silcthread.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silctypes.h\r
+SOURCE=..\..\lib\silcutil\silctime.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcutf8.h\r
+SOURCE=..\..\lib\silcutil\silctypes.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcutil.h\r
+SOURCE=..\..\lib\silcutil\silcutf8.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcvcard.h\r
+SOURCE=..\..\lib\silcutil\silcutil.h\r
 # End Source File\r
 # End Group\r
 # Begin Group "silcmath No. 1"\r
@@ -581,6 +741,10 @@ SOURCE=..\..\lib\silccrypt\aes.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silccrypt\aesopt.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silccrypt\blowfish.h\r
 # End Source File\r
 # Begin Source File\r
@@ -633,15 +797,19 @@ SOURCE=..\..\lib\silccrypt\rsa.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silccrypt\rsa_internal.h\r
+SOURCE=..\..\lib\silccrypt\sha1.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silccrypt\sha1.h\r
+SOURCE=..\..\lib\silccrypt\sha1_internal.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silccrypt\sha1_internal.h\r
+SOURCE=..\..\lib\silccrypt\sha256.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silccrypt\sha256_internal.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -661,6 +829,14 @@ SOURCE=..\..\lib\silccrypt\silchmac.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silccrypt\silcpk.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silccrypt\silcpk_i.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silccrypt\silcpkcs.h\r
 # End Source File\r
 # Begin Source File\r
@@ -669,6 +845,10 @@ SOURCE=..\..\lib\silccrypt\silcpkcs1.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silccrypt\silcpkcs1_i.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silccrypt\silcrng.h\r
 # End Source File\r
 # Begin Source File\r
@@ -709,9 +889,73 @@ SOURCE=..\..\lib\contrib\gunidecomp.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\contrib\regexpr.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\contrib\stringprep.h\r
 # End Source File\r
 # End Group\r
+# Begin Group "silcasn1 No. 1"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcasn1\silcasn1.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcasn1\silcasn1_i.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcasn1\silcber.h\r
+# End Source File\r
+# End Group\r
+# Begin Group "silchttp No. 1"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silchttp\silchttpphp.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silchttp\silchttpserver.h\r
+# End Source File\r
+# End Group\r
+# Begin Group "silcskr No. 1"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcskr\silcskr.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcskr\silcskr_i.h\r
+# End Source File\r
+# End Group\r
+# Begin Group "silcvcard No. 1"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcvcard\silcvcard.h\r
+# End Source File\r
+# End Group\r
+# Begin Group "silcapputil No. 1"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcapputil\silcapputil.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcapputil\silcidcache.h\r
+# End Source File\r
+# End Group\r
 # End Group\r
 # Begin Group "Resource Files"\r
 \r

diff --git a/win32/libsilc_static/libsilc_static.dsp b/win32/libsilc_static/libsilc_static.dsp
index b87f99d93386d78f0e6a213b32402c1080fedeac..00d6881e3dd65e1d9297bc6d9f9f6325a8a3ec7e 100644 (file)
--- a/win32/libsilc_static/libsilc_static.dsp
+++ b/win32/libsilc_static/libsilc_static.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
-# ADD CPP /nologo /W2 /GX /O2 /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcsftp" /I "..\..\lib\contrib" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MP_API_COMPATIBLE" /D "HAVE_SILCDEFS_H" /YX /FD /Zm300 /c\r
+# ADD CPP /nologo /W2 /GX /O2 /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcsftp" /I "..\..\lib\contrib" /I "..\..\lib\silcapputil" /I "..\..\lib\silcvcard" /I "..\..\lib\silchttp" /I "..\..\lib\silcskr" /I "..\..\lib\silcasn1" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MP_API_COMPATIBLE" /D "HAVE_SILCDEFS_H" /YX /FD /Zm400 /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -64,8 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
-# ADD CPP /nologo /W2 /Gm /GX /ZI /Od /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcsftp" /I "..\..\lib\contrib" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MP_API_COMPATIBLE" /D "HAVE_SILCDEFS_H" /YX /FD /GZ /c\r
-# SUBTRACT CPP /WX\r
+# ADD CPP /nologo /W2 /Gm /GX /ZI /Od /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcsftp" /I "..\..\lib\contrib" /I "..\..\lib\silcapputil" /I "..\..\lib\silcvcard" /I "..\..\lib\silchttp" /I "..\..\lib\silcskr" /I "..\..\lib\silcasn1" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MP_API_COMPATIBLE" /D "HAVE_SILCDEFS_H" /YX /FD /Zm400 /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -113,10 +112,6 @@ SOURCE=..\..\lib\silccore\silcid.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silccore\silcidcache.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\lib\silccore\silcmessage.c\r
 # End Source File\r
 # Begin Source File\r
@@ -129,6 +124,10 @@ SOURCE=..\..\lib\silccore\silcpacket.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silccore\silcpubkey.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silccore\silcstatus.c\r
 # End Source File\r
 # End Group\r
@@ -145,6 +144,10 @@ SOURCE=..\..\lib\silcske\payload.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silcske\silcconnauth.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silcske\silcske.c\r
 # End Source File\r
 # End Group\r
@@ -153,7 +156,7 @@ SOURCE=..\..\lib\silcske\silcske.c
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcapputil.c\r
+SOURCE=..\..\lib\silcutil\silcasync.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -165,6 +168,14 @@ SOURCE=..\..\lib\silcutil\silcconfig.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silcutil\silcfdstream.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcfsm.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silcutil\silchashtable.c\r
 # End Source File\r
 # Begin Source File\r
@@ -177,11 +188,11 @@ SOURCE=..\..\lib\silcutil\silcmemory.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcnet.c\r
+SOURCE=..\..\lib\silcutil\silcmime.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcprotocol.c\r
+SOURCE=..\..\lib\silcutil\silcnet.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -189,7 +200,23 @@ SOURCE=..\..\lib\silcutil\silcschedule.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcsockconn.c\r
+SOURCE=..\..\lib\silcutil\silcsnprintf.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcsocketstream.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcstack.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcstream.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcstringprep.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -197,15 +224,15 @@ SOURCE=..\..\lib\silcutil\silcstrutil.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcutil.c\r
+SOURCE=..\..\lib\silcutil\silctime.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcvcard.c\r
+SOURCE=..\..\lib\silcutil\silcutf8.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\win32\silcwin32mutex.c\r
+SOURCE=..\..\lib\silcutil\silcutil.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -217,7 +244,7 @@ SOURCE=..\..\lib\silcutil\win32\silcwin32schedule.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\win32\silcwin32sockconn.c\r
+SOURCE=..\..\lib\silcutil\win32\silcwin32socketstream.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -289,6 +316,10 @@ SOURCE=..\..\lib\silccrypt\sha1.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silccrypt\sha256.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silccrypt\silccipher.c\r
 # End Source File\r
 # Begin Source File\r
@@ -301,6 +332,10 @@ SOURCE=..\..\lib\silccrypt\silchmac.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silccrypt\silcpk.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silccrypt\silcpkcs.c\r
 # End Source File\r
 # Begin Source File\r
@@ -336,6 +371,86 @@ SOURCE=..\..\lib\silcsftp\sftp_server.c
 SOURCE=..\..\lib\silcsftp\sftp_util.c\r
 # End Source File\r
 # End Group\r
+# Begin Group "silcapputil"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcapputil\silcapputil.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcapputil\silcidcache.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "silcvcard"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcvcard\silcvcard.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "silcskr"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcskr\silcskr.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "silchttp"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silchttp\silchttpphp.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silchttp\silchttpserver.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "silcasn1"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcasn1\silcasn1.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcasn1\silcasn1_decode.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcasn1\silcasn1_encode.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcasn1\silcber.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "contrib"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\contrib\nfkc.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\contrib\regexpr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\contrib\rfc3454.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\contrib\stringprep.c\r
+# End Source File\r
+# End Group\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r
@@ -369,10 +484,6 @@ SOURCE=..\..\lib\silccore\silcid.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silccore\silcidcache.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\lib\silccore\silcmessage.h\r
 # End Source File\r
 # Begin Source File\r
@@ -385,7 +496,15 @@ SOURCE=..\..\lib\silccore\silcnotify.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silccore\silcprivate.h\r
+SOURCE=..\..\lib\silccore\silcpacket.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silccore\silcpubkey.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silccore\silcstatus.h\r
 # End Source File\r
 # End Group\r
 # Begin Group "silcske No. 1"\r
@@ -393,19 +512,27 @@ SOURCE=..\..\lib\silccore\silcprivate.h
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcske\groups.h\r
+SOURCE=..\..\lib\silcske\groups_internal.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcske\groups_internal.h\r
+SOURCE=..\..\lib\silcske\silcconnauth.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcske\payload.h\r
+SOURCE=..\..\lib\silcske\silcske.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcske\silcske.h\r
+SOURCE=..\..\lib\silcske\silcske_groups.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcske\silcske_i.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcske\silcske_payload.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -417,7 +544,15 @@ SOURCE=..\..\lib\silcske\silcske_status.h
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcapputil.h\r
+SOURCE=..\..\lib\silcutil\silcasync.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcasync_i.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcatomic.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -429,7 +564,7 @@ SOURCE=..\..\lib\silcutil\silcbuffmt.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcbufutil.h\r
+SOURCE=..\..\lib\silcutil\silccond.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -441,7 +576,19 @@ SOURCE=..\..\lib\silcutil\silcdlist.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcfileutil.c\r
+SOURCE=..\..\lib\silcutil\silcfdstream.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcfileutil.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcfsm.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcfsm_i.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -457,10 +604,22 @@ SOURCE=..\..\lib\silcutil\silclog.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silcutil\silclog_i.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silcutil\silcmemory.h\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silcutil\silcmime.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcmime_i.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silcutil\silcmutex.h\r
 # End Source File\r
 # Begin Source File\r
@@ -469,7 +628,7 @@ SOURCE=..\..\lib\silcutil\silcnet.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcprotocol.h\r
+SOURCE=..\..\lib\silcutil\silcnet_i.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -481,7 +640,35 @@ SOURCE=..\..\lib\silcutil\silcschedule_i.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcsockconn.h\r
+SOURCE=..\..\lib\silcutil\silcsnprintf.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcsocketstream.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcsocketstream_i.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcstack.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcstack_i.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcstream.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcstringprep.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcutil\silcstrutil.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -489,15 +676,19 @@ SOURCE=..\..\lib\silcutil\silcthread.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silcutil\silctime.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silcutil\silctypes.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcutil.h\r
+SOURCE=..\..\lib\silcutil\silcutf8.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcutil\silcvcard.h\r
+SOURCE=..\..\lib\silcutil\silcutil.h\r
 # End Source File\r
 # End Group\r
 # Begin Group "silcmath No. 1"\r
@@ -537,6 +728,10 @@ SOURCE=..\..\lib\silccrypt\aes.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silccrypt\aesopt.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silccrypt\blowfish.h\r
 # End Source File\r
 # Begin Source File\r
@@ -589,15 +784,19 @@ SOURCE=..\..\lib\silccrypt\rsa.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silccrypt\rsa_internal.h\r
+SOURCE=..\..\lib\silccrypt\sha1.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silccrypt\sha1.h\r
+SOURCE=..\..\lib\silccrypt\sha1_internal.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silccrypt\sha1_internal.h\r
+SOURCE=..\..\lib\silccrypt\sha256.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silccrypt\sha256_internal.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -617,10 +816,26 @@ SOURCE=..\..\lib\silccrypt\silchmac.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silccrypt\silcpk.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silccrypt\silcpk_i.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silccrypt\silcpkcs.h\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silccrypt\silcpkcs1.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silccrypt\silcpkcs1_i.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silccrypt\silcrng.h\r
 # End Source File\r
 # Begin Source File\r
@@ -648,6 +863,86 @@ SOURCE=..\..\lib\silcsftp\silcsftp.h
 SOURCE=..\..\lib\silcsftp\silcsftp_fs.h\r
 # End Source File\r
 # End Group\r
+# Begin Group "silcapputil No. 1"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcapputil\silcapputil.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcapputil\silcidcache.h\r
+# End Source File\r
+# End Group\r
+# Begin Group "silcvcard No. 1"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcvcard\silcvcard.h\r
+# End Source File\r
+# End Group\r
+# Begin Group "silcskr No. 1"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcskr\silcskr.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcskr\silcskr_i.h\r
+# End Source File\r
+# End Group\r
+# Begin Group "silchttp No. 1"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silchttp\silchttpphp.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silchttp\silchttpserver.h\r
+# End Source File\r
+# End Group\r
+# Begin Group "silcasn1 No. 1"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcasn1\silcasn1.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcasn1\silcasn1_i.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcasn1\silcber.h\r
+# End Source File\r
+# End Group\r
+# Begin Group "contrib No. 1"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\contrib\gunicomp.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\contrib\gunidecomp.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\contrib\regexpr.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\contrib\stringprep.h\r
+# End Source File\r
+# End Group\r
 # End Group\r
 # End Target\r
 # End Project\r

diff --git a/win32/libsilcclient/libsilcclient.dsp b/win32/libsilcclient/libsilcclient.dsp
index e75257f27de5fedbb48ba39439de10ead19e0093..3075a4a3a3b783536a36ad845f7b283c5d8c5877 100644 (file)
--- a/win32/libsilcclient/libsilcclient.dsp
+++ b/win32/libsilcclient/libsilcclient.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILCCLIENT_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W2 /GX /O2 /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcclient" /I "..\..\lib\silcsftp" /I "..\..\lib\contrib" /D "NDEBUG" /D "MP_API_COMPATIBLE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILCCLIENT_EXPORTS" /D "DLL" /D "HAVE_SILCDEFS_H" /YX /FD /Zm300 /c\r
+# ADD CPP /nologo /MT /W2 /GX /O2 /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcsftp" /I "..\..\lib\contrib" /I "..\..\lib\silcapputil" /I "..\..\lib\silcvcard" /I "..\..\lib\silchttp" /I "..\..\lib\silcskr" /I "..\..\lib\silcasn1" /D "NDEBUG" /D "MP_API_COMPATIBLE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILCCLIENT_EXPORTS" /D "DLL" /D "HAVE_SILCDEFS_H" /YX /FD /Zm400 /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILCCLIENT_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W2 /Gm /GX /ZI /Od /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcclient" /I "..\..\lib\silcsftp" /I "..\..\lib\contrib" /D "_DEBUG" /D "SILC_DEBUG" /D "MP_API_COMPATIBLE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILCCLIENT_EXPORTS" /D "DLL" /D "HAVE_SILCDEFS_H" /YX /FD /GZ /Zm300 /c\r
+# ADD CPP /nologo /MTd /W2 /Gm /GX /ZI /Od /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcsftp" /I "..\..\lib\contrib" /I "..\..\lib\silcapputil" /I "..\..\lib\silcvcard" /I "..\..\lib\silchttp" /I "..\..\lib\silcskr" /I "..\..\lib\silcasn1" /D "_DEBUG" /D "SILC_DEBUG" /D "MP_API_COMPATIBLE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILCCLIENT_EXPORTS" /D "DLL" /D "HAVE_SILCDEFS_H" /YX /FD /Zm400 /GZ /Zm400 /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
@@ -108,39 +108,43 @@ SOURCE=..\..\lib\silcclient\client_channel.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\client_ftp.c\r
+SOURCE=..\..\lib\silcclient\client_connect.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\client_keyagr.c\r
+SOURCE=..\..\lib\silcclient\client_entry.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\client_notify.c\r
+SOURCE=..\..\lib\silcclient\client_ftp.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\client_prvmsg.c\r
+SOURCE=..\..\lib\silcclient\client_keyagr.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\client_resume.c\r
+SOURCE=..\..\lib\silcclient\client_listener.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\command.c\r
+SOURCE=..\..\lib\silcclient\client_notify.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\command_reply.c\r
+SOURCE=..\..\lib\silcclient\client_prvmsg.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcclient\client_register.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\idlist.c\r
+SOURCE=..\..\lib\silcclient\command.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\protocol.c\r
+SOURCE=..\..\lib\silcclient\command_reply.c\r
 # End Source File\r
 # End Group\r
 # End Group\r
@@ -156,27 +160,59 @@ SOURCE=..\..\lib\silcclient\client.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silcclient\client_channel.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcclient\client_connect.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcclient\client_entry.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcclient\client_ftp.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silcclient\client_internal.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\command.h\r
+SOURCE=..\..\lib\silcclient\client_keyagr.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\command_reply.h\r
+SOURCE=..\..\lib\silcclient\client_listener.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\idlist.h\r
+SOURCE=..\..\lib\silcclient\client_notify.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcclient\client_prvmsg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcclient\client_register.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcclient\command.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcclient\command_reply.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\protocol.h\r
+SOURCE=..\..\lib\silcclient\silcclient.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\silcapi.h\r
+SOURCE=..\..\lib\silcclient\silcclient_entry.h\r
 # End Source File\r
 # End Group\r
 # End Group\r

diff --git a/win32/libsilcclient_static/libsilcclient_static.dsp b/win32/libsilcclient_static/libsilcclient_static.dsp
index 9d3197144e16e4fdb9075f3ef924436319eeb304..2c34ce43da02d655b263aa715a5be4557297ff9e 100644 (file)
--- a/win32/libsilcclient_static/libsilcclient_static.dsp
+++ b/win32/libsilcclient_static/libsilcclient_static.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
-# ADD CPP /nologo /W2 /GX /O2 /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcclient" /I "..\..\lib\silcsftp" /I "..\..\lib\contrib" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MP_API_COMPATIBLE" /D "HAVE_SILCDEFS_H" /YX /FD /Zm300 /c\r
+# ADD CPP /nologo /W2 /GX /O2 /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcsftp" /I "..\..\lib\contrib" /I "..\..\lib\silcapputil" /I "..\..\lib\silcvcard" /I "..\..\lib\silchttp" /I "..\..\lib\silcskr" /I "..\..\lib\silcasn1" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MP_API_COMPATIBLE" /D "HAVE_SILCDEFS_H" /YX /FD /Zm400 /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
-# ADD CPP /nologo /W2 /Gm /GX /ZI /Od /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcclient" /I "..\..\lib\silcsftp" /I "..\..\lib\contrib" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MP_API_COMPATIBLE" /D "HAVE_SILCDEFS_H" /YX /FD /GZ /c\r
+# ADD CPP /nologo /W2 /Gm /GX /ZI /Od /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcsftp" /I "..\..\lib\contrib" /I "..\..\lib\silcapputil" /I "..\..\lib\silcvcard" /I "..\..\lib\silchttp" /I "..\..\lib\silcskr" /I "..\..\lib\silcasn1" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MP_API_COMPATIBLE" /D "HAVE_SILCDEFS_H" /YX /FD /Zm400 /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -100,39 +100,43 @@ SOURCE=..\..\lib\silcclient\client_channel.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\client_ftp.c\r
+SOURCE=..\..\lib\silcclient\client_connect.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\client_keyagr.c\r
+SOURCE=..\..\lib\silcclient\client_entry.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\client_notify.c\r
+SOURCE=..\..\lib\silcclient\client_ftp.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\client_prvmsg.c\r
+SOURCE=..\..\lib\silcclient\client_keyagr.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\client_resume.c\r
+SOURCE=..\..\lib\silcclient\client_listener.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\command.c\r
+SOURCE=..\..\lib\silcclient\client_notify.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\command_reply.c\r
+SOURCE=..\..\lib\silcclient\client_prvmsg.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcclient\client_register.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\idlist.c\r
+SOURCE=..\..\lib\silcclient\command.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\protocol.c\r
+SOURCE=..\..\lib\silcclient\command_reply.c\r
 # End Source File\r
 # End Group\r
 # End Group\r
@@ -148,27 +152,59 @@ SOURCE=..\..\lib\silcclient\client.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silcclient\client_channel.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcclient\client_connect.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcclient\client_entry.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcclient\client_ftp.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silcclient\client_internal.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\command.h\r
+SOURCE=..\..\lib\silcclient\client_keyagr.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\command_reply.h\r
+SOURCE=..\..\lib\silcclient\client_listener.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\idlist.h\r
+SOURCE=..\..\lib\silcclient\client_notify.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcclient\client_prvmsg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcclient\client_register.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcclient\command.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcclient\command_reply.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\protocol.h\r
+SOURCE=..\..\lib\silcclient\silcclient.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcclient\silcapi.h\r
+SOURCE=..\..\lib\silcclient\silcclient_entry.h\r
 # End Source File\r
 # End Group\r
 # End Group\r

diff --git a/win32/silcdefs.h b/win32/silcdefs.h
index 8df6a66b58ace4407c7552e4eb1f37bc07566a63..f98cfef2331c0797e883c9f2dc57b7bf651898e1 100644 (file)
--- a/win32/silcdefs.h
+++ b/win32/silcdefs.h
@@ -30,7 +30,7 @@
 
 /* Define if you can safely include both <sys/time.h> and <time.h>.  */
 #define TIME_WITH_SYS_TIME 1
-
+\r
 /* Define to `int' if <sys/types.h> doesn't define.  */
 /* #undef uid_t */