From b49a816774abde023441a3f0dce357549d2112ac Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Wed, 5 Jul 2000 06:14:01 +0000 Subject: [PATCH] Global costemic changes. --- apps/silcd/command_reply.c | 5 ++++- apps/silcd/idlist.c | 5 ++++- apps/silcd/route.c | 5 ++++- apps/silcd/server.c | 17 ++++++++++++++--- apps/silcd/server_version.c | 2 +- apps/silcd/serverconfig.c | 9 ++++++--- apps/silcd/silcd.c | 7 +++++-- 7 files changed, 38 insertions(+), 12 deletions(-) diff --git a/apps/silcd/command_reply.c b/apps/silcd/command_reply.c index 1c49b82f..9bf7e1c7 100644 --- a/apps/silcd/command_reply.c +++ b/apps/silcd/command_reply.c @@ -20,11 +20,14 @@ /* * $Id$ * $Log$ + * Revision 1.3 2000/07/05 06:14:01 priikone + * Global costemic changes. + * * Revision 1.2 2000/07/03 05:52:22 priikone * Implemented LEAVE command. * * Revision 1.1.1.1 2000/06/27 11:36:56 priikone - * Importet from internal CVS/Added Log headers. + * Imported from internal CVS/Added Log headers. * * */ diff --git a/apps/silcd/idlist.c b/apps/silcd/idlist.c index bc79e9df..b45952a6 100644 --- a/apps/silcd/idlist.c +++ b/apps/silcd/idlist.c @@ -20,11 +20,14 @@ /* * $Id$ * $Log$ + * Revision 1.3 2000/07/05 06:14:01 priikone + * Global costemic changes. + * * Revision 1.2 2000/07/03 05:52:11 priikone * Fixed typo and a bug. * * Revision 1.1.1.1 2000/06/27 11:36:56 priikone - * Importet from internal CVS/Added Log headers. + * Imported from internal CVS/Added Log headers. * * */ diff --git a/apps/silcd/route.c b/apps/silcd/route.c index 98520474..a46ed51f 100644 --- a/apps/silcd/route.c +++ b/apps/silcd/route.c @@ -25,12 +25,15 @@ /* * $Id$ * $Log$ + * Revision 1.3 2000/07/05 06:14:01 priikone + * Global costemic changes. + * * Revision 1.2 2000/07/04 08:30:24 priikone * Added silc_server_get_route to return communication object * for fastest route. * * Revision 1.1.1.1 2000/06/27 11:36:56 priikone - * Importet from internal CVS/Added Log headers. + * Imported from internal CVS/Added Log headers. * * */ diff --git a/apps/silcd/server.c b/apps/silcd/server.c index 372087ac..d0a1ccfb 100644 --- a/apps/silcd/server.c +++ b/apps/silcd/server.c @@ -25,12 +25,15 @@ /* * $Id$ * $Log$ + * Revision 1.4 2000/07/05 06:14:01 priikone + * Global costemic changes. + * * Revision 1.3 2000/07/04 08:13:53 priikone * Changed message route discovery to use silc_server_get_route. * Added silc_server_client_on_channel function. * * Revision 1.1.1.1 2000/06/27 11:36:56 priikone - * Importet from internal CVS/Added Log headers. + * Imported from internal CVS/Added Log headers. * * */ @@ -160,6 +163,8 @@ int silc_server_init(SilcServer server) unsigned char *public_key; unsigned char *private_key; unsigned int pk_len, prv_len; + SilcPublicKey pub_key; + SilcPrivateKey prv_key; if (silc_pkcs_alloc("rsa", &server->public_key) == FALSE) { SILC_LOG_ERROR(("Could not create RSA key pair")); @@ -182,14 +187,20 @@ int silc_server_init(SilcServer server) SILC_LOG_HEXDUMP(("public key"), public_key, pk_len); SILC_LOG_HEXDUMP(("private key"), private_key, prv_len); + pub_key = silc_pkcs_public_key_alloc("rsa", "UN=root, HN=dummy", + public_key, pk_len); + prv_key = silc_pkcs_private_key_alloc("rsa", private_key, prv_len); + /* XXX Save keys */ - silc_pkcs_save_public_key(server->public_key, "pubkey.pub", - public_key, pk_len); + silc_pkcs_save_public_key("pubkey.pub", pub_key); + silc_pkcs_save_private_key("privkey.prv", prv_key, NULL); memset(public_key, 0, pk_len); memset(private_key, 0, prv_len); silc_free(public_key); silc_free(private_key); + silc_pkcs_public_key_free(pub_key); + silc_pkcs_private_key_free(prv_key); } /* Create a listening server. Note that our server can listen on diff --git a/apps/silcd/server_version.c b/apps/silcd/server_version.c index 905750b2..7f392c4d 100644 --- a/apps/silcd/server_version.c +++ b/apps/silcd/server_version.c @@ -20,4 +20,4 @@ #include "serverincludes.h" -const char server_version[] = "28062000"; +const char server_version[] = "07072000"; diff --git a/apps/silcd/serverconfig.c b/apps/silcd/serverconfig.c index 326c1336..0e95bd80 100644 --- a/apps/silcd/serverconfig.c +++ b/apps/silcd/serverconfig.c @@ -20,8 +20,11 @@ /* * $Id$ * $Log$ - * Revision 1.1 2000/06/27 11:36:56 priikone - * Initial revision + * Revision 1.2 2000/07/05 06:14:01 priikone + * Global costemic changes. + * + * Revision 1.1.1.1 2000/06/27 11:36:56 priikone + * Imported from internal CVS/Added Log headers. * * */ @@ -305,7 +308,7 @@ int silc_config_server_parse(SilcConfigServer config, SilcBuffer buffer, /* Check for matching sections */ for (cptr = silc_config_server_sections; cptr->section; cptr++) - if (!strcmp(cp, cptr->section)) + if (!strncasecmp(cp, cptr->section, strlen(cptr->section))) break; if (!cptr->section) { diff --git a/apps/silcd/silcd.c b/apps/silcd/silcd.c index 584141db..ca2e5b88 100644 --- a/apps/silcd/silcd.c +++ b/apps/silcd/silcd.c @@ -26,8 +26,11 @@ /* * $Id$ * $Log$ - * Revision 1.1 2000/06/27 11:36:56 priikone - * Initial revision + * Revision 1.2 2000/07/05 06:14:01 priikone + * Global costemic changes. + * + * Revision 1.1.1.1 2000/06/27 11:36:56 priikone + * Imported from internal CVS/Added Log headers. * * */ -- 2.24.0