updates.

[silc.git] / lib / silccore / silcauth.c

diff --git a/lib/silccore/silcauth.c b/lib/silccore/silcauth.c
index 0b8f8c8797cc4d7be4a4faab32884a0bc4498a60..7ac372d360238a57017c15427504d25b398f8126 100644 (file)
--- a/lib/silccore/silcauth.c
+++ b/lib/silccore/silcauth.c
@@ -30,33 +30,31 @@
 
 /* Authentication Payload structure */
 struct SilcAuthPayloadStruct {
-  unsigned short len;
-  unsigned short auth_method;
-  unsigned short random_len;
+  uint16 len;
+  uint16 auth_method;
+  uint16 random_len;
   unsigned char *random_data;
-  unsigned short auth_len;
+  uint16 auth_len;
   unsigned char *auth_data;
 };
 
 /* Parses and returns Authentication Payload */
 
 SilcAuthPayload silc_auth_payload_parse(unsigned char *data,
-                                       unsigned int data_len)
+                                       uint32 data_len)
 {
-  SilcBuffer buffer;
+  SilcBufferStruct buffer;
   SilcAuthPayload new;
   int ret;
 
   SILC_LOG_DEBUG(("Parsing Authentication Payload"));
 
-  buffer = silc_buffer_alloc(data_len);
-  silc_buffer_pull_tail(buffer, SILC_BUFFER_END(buffer));
-  silc_buffer_put(buffer, data, data_len);
+  silc_buffer_set(&buffer, data, data_len);
 
   new = silc_calloc(1, sizeof(*new));
 
   /* Parse the payload */
-  ret = silc_buffer_unformat(buffer, 
+  ret = silc_buffer_unformat(&buffer, 
                             SILC_STR_UI_SHORT(&new->len),
                             SILC_STR_UI_SHORT(&new->auth_method),
                             SILC_STR_UI16_NSTRING_ALLOC(&new->random_data,
@@ -66,18 +64,14 @@ SilcAuthPayload silc_auth_payload_parse(unsigned char *data,
                             SILC_STR_END);
   if (ret == -1) {
     silc_free(new);
-    silc_buffer_free(buffer);
     return NULL;
   }
 
-  if (new->len != buffer->len) {
+  if (new->len != buffer.len) {
     silc_auth_payload_free(new);
-    silc_buffer_free(buffer);
     return NULL;
   }
 
-  silc_buffer_free(buffer);
-
   /* If password authentication, random data must not be set */
   if (new->auth_method == SILC_AUTH_PASSWORD && new->random_len) {
     silc_auth_payload_free(new);
@@ -91,12 +85,12 @@ SilcAuthPayload silc_auth_payload_parse(unsigned char *data,
 
 SilcBuffer silc_auth_payload_encode(SilcAuthMethod method,
                                    unsigned char *random_data,
-                                   unsigned short random_len,
+                                   uint16 random_len,
                                    unsigned char *auth_data,
-                                   unsigned short auth_len)
+                                   uint16 auth_len)
 {
   SilcBuffer buffer;
-  unsigned int len;
+  uint32 len;
 
   SILC_LOG_DEBUG(("Encoding Authentication Payload"));
 
@@ -142,7 +136,7 @@ SilcAuthMethod silc_auth_get_method(SilcAuthPayload payload)
 /* Get the authentication data */
 
 unsigned char *silc_auth_get_data(SilcAuthPayload payload,
-                                 unsigned int *auth_len)
+                                 uint32 *auth_len)
 {
   if (auth_len)
     *auth_len = payload->auth_len;
@@ -162,12 +156,12 @@ unsigned char *silc_auth_get_data(SilcAuthPayload payload,
 static unsigned char *
 silc_auth_public_key_encode_data(SilcPublicKey public_key, 
                                 unsigned char *random,
-                                unsigned int random_len, void *id,
-                                SilcIdType type, unsigned int *ret_len)
+                                uint32 random_len, void *id,
+                                SilcIdType type, uint32 *ret_len)
 {
   SilcBuffer buf;
   unsigned char *pk, *id_data, *ret;
-  unsigned int pk_len, id_len;
+  uint32 pk_len, id_len;
 
   pk = silc_pkcs_public_key_encode(public_key, &pk_len);
   if (!pk)
@@ -178,7 +172,7 @@ silc_auth_public_key_encode_data(SilcPublicKey public_key,
     silc_free(pk);
     return NULL;
   }
-  id_len = silc_id_get_len(type);
+  id_len = silc_id_get_len(id, type);
 
   buf = silc_buffer_alloc(random_len + id_len + pk_len);
   silc_buffer_pull_tail(buf, SILC_BUFFER_END(buf));
@@ -212,9 +206,9 @@ SilcBuffer silc_auth_public_key_auth_generate(SilcPublicKey public_key,
 {
   unsigned char *random;
   unsigned char auth_data[1024];
-  unsigned int auth_len;
+  uint32 auth_len;
   unsigned char *tmp;
-  unsigned int tmp_len;
+  uint32 tmp_len;
   SilcBuffer buf;
   SilcPKCS pkcs;
 
@@ -273,7 +267,7 @@ int silc_auth_public_key_auth_verify(SilcAuthPayload payload,
                                     void *id, SilcIdType type)
 {
   unsigned char *tmp;
-  unsigned int tmp_len;
+  uint32 tmp_len;
   SilcPKCS pkcs;
 
   SILC_LOG_DEBUG(("Verifying authentication data"));
@@ -347,7 +341,7 @@ int silc_auth_public_key_auth_verify_data(SilcBuffer payload,
    `auth_data_len' is ignored. */
 
 int silc_auth_verify(SilcAuthPayload payload, SilcAuthMethod auth_method,
-                    void *auth_data, unsigned int auth_data_len, 
+                    void *auth_data, uint32 auth_data_len, 
                     SilcHash hash, void *id, SilcIdType type)
 {
   SILC_LOG_DEBUG(("Verifying authentication"));
@@ -387,9 +381,9 @@ int silc_auth_verify(SilcAuthPayload payload, SilcAuthMethod auth_method,
 
 /* Same as above but parses the authentication payload before verify. */
 
-int silc_auth_verify_data(unsigned char *payload, unsigned int payload_len,
+int silc_auth_verify_data(unsigned char *payload, uint32 payload_len,
                          SilcAuthMethod auth_method, void *auth_data,
-                         unsigned int auth_data_len, SilcHash hash, 
+                         uint32 auth_data_len, SilcHash hash, 
                          void *id, SilcIdType type)
 {
   SilcAuthPayload auth_payload;
@@ -415,9 +409,9 @@ int silc_auth_verify_data(unsigned char *payload, unsigned int payload_len,
 
 /* The Key Agreement protocol structure */
 struct SilcKeyAgreementPayloadStruct {
-  unsigned short hostname_len;
+  uint16 hostname_len;
   unsigned char *hostname;
-  unsigned int port;
+  uint32 port;
 };
 
 /* Parses and returns an allocated Key Agreement payload. */
@@ -448,10 +442,10 @@ SilcKeyAgreementPayload silc_key_agreement_payload_parse(SilcBuffer buffer)
 /* Encodes the Key Agreement protocol and returns the encoded buffer */
 
 SilcBuffer silc_key_agreement_payload_encode(char *hostname,
-                                            unsigned int port)
+                                            uint32 port)
 {
   SilcBuffer buffer;
-  unsigned int len = hostname ? strlen(hostname) : 0;
+  uint32 len = hostname ? strlen(hostname) : 0;
 
   SILC_LOG_DEBUG(("Encoding Key Agreement Payload"));
 
@@ -485,7 +479,7 @@ char *silc_key_agreement_get_hostname(SilcKeyAgreementPayload payload)
 
 /* Returns the port in the payload */
 
-unsigned int silc_key_agreement_get_port(SilcKeyAgreementPayload payload)
+uint32 silc_key_agreement_get_port(SilcKeyAgreementPayload payload)
 {
   return payload->port;
 }