Added SilcPublicKey's

diff --git a/apps/silcd/idlist.c b/apps/silcd/idlist.c
index b45952a6e908d7c0ae8485ebb74ad7f471f2fc09..863d06be676245defdd32bf381d2b77f59a12284 100644 (file)
--- a/apps/silcd/idlist.c
+++ b/apps/silcd/idlist.c
@@ -20,6 +20,9 @@
 /*
  * $Id$
  * $Log$
 /*
  * $Id$
  * $Log$

+ * Revision 1.4  2000/07/06 07:16:13  priikone
+ *     Added SilcPublicKey's
+ *

  * Revision 1.3  2000/07/05 06:14:01  priikone
  *     Global costemic changes.
  *
  * Revision 1.3  2000/07/05 06:14:01  priikone
  *     Global costemic changes.
  *


@@ -63,7 +66,7 @@ void silc_idlist_add_server(SilcServerList **list,
   idlist->router = router;
   idlist->send_key = send_key;
   idlist->receive_key = receive_key;
   idlist->router = router;
   idlist->send_key = send_key;
   idlist->receive_key = receive_key;

-  idlist->public_key = public_key;
+  idlist->pkcs = public_key;

   idlist->hmac = hmac;
   idlist->next = idlist;
   idlist->prev = idlist;
   idlist->hmac = hmac;
   idlist->next = idlist;
   idlist->prev = idlist;


@@ -116,7 +119,7 @@ void silc_idlist_add_client(SilcClientList **list, char *nickname,
   idlist->router = router;
   idlist->send_key = send_key;
   idlist->receive_key = receive_key;
   idlist->router = router;
   idlist->send_key = send_key;
   idlist->receive_key = receive_key;

-  idlist->public_key = public_key;
+  idlist->pkcs = public_key;

   idlist->hmac = hmac;
   idlist->next = idlist;
   idlist->prev = idlist;
   idlist->hmac = hmac;
   idlist->next = idlist;
   idlist->prev = idlist;


@@ -157,8 +160,8 @@ void silc_idlist_del_client(SilcClientList **list, SilcClientList *entry)
       silc_cipher_free(entry->send_key);
     if (entry->receive_key)
       silc_cipher_free(entry->receive_key);
       silc_cipher_free(entry->send_key);
     if (entry->receive_key)
       silc_cipher_free(entry->receive_key);

-    if (entry->public_key)
-      silc_pkcs_free(entry->public_key);
+    if (entry->pkcs)
+      silc_pkcs_free(entry->pkcs);

     if (entry->hmac)
       silc_hmac_free(entry->hmac);
     if (entry->hmac_key) {
     if (entry->hmac)
       silc_hmac_free(entry->hmac);
     if (entry->hmac_key) {

diff --git a/apps/silcd/idlist.h b/apps/silcd/idlist.h
index b18b90ddb6dc533d0f59c98a7e39828dfce2ca06..36ccb033febac0c29a932da7d623c001d867e7cf 100644 (file)
--- a/apps/silcd/idlist.h
+++ b/apps/silcd/idlist.h
@@ -90,7 +90,8 @@ struct SilcServerListStruct {
   /* Keys */
   SilcCipher send_key;
   SilcCipher receive_key;
   /* Keys */
   SilcCipher send_key;
   SilcCipher receive_key;

-  SilcPKCS public_key;
+  SilcPKCS pkcs;
+  SilcPublicKey public_key;

   SilcHmac hmac;
   unsigned char *hmac_key;
   unsigned int hmac_key_len;
   SilcHmac hmac;
   unsigned char *hmac_key;
   unsigned int hmac_key_len;


@@ -175,9 +176,9 @@ struct SilcServerListStruct {
        The actual session key established by key exchange protcol between
        connecting parties. This is used for both encryption and decryption.
 
        The actual session key established by key exchange protcol between
        connecting parties. This is used for both encryption and decryption.
 

-   SilcPKCS public_key
+   SilcPKCS pkcs

 
 

-       Public key of the client. This maybe NULL.
+       PKCS of the client. This maybe NULL.

 
    SilcHmac hmac
    unsigned char *hmac_key
 
    SilcHmac hmac
    unsigned char *hmac_key


@@ -210,7 +211,7 @@ struct SilcClientListStruct {
   /* Keys */
   SilcCipher send_key;
   SilcCipher receive_key;
   /* Keys */
   SilcCipher send_key;
   SilcCipher receive_key;

-  SilcPKCS public_key;
+  SilcPKCS pkcs;

   SilcHmac hmac;
   unsigned char *hmac_key;
   unsigned int hmac_key_len;
   SilcHmac hmac;
   unsigned char *hmac_key;
   unsigned int hmac_key_len;


@@ -385,6 +386,7 @@ typedef struct {
   SilcCipher send_key;
   SilcCipher receive_key;
   SilcPKCS pkcs;
   SilcCipher send_key;
   SilcCipher receive_key;
   SilcPKCS pkcs;

+  SilcPublicKey public_key;

 
   SilcHmac hmac;
   unsigned char *hmac_key;
 
   SilcHmac hmac;
   unsigned char *hmac_key;