updates.

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

diff --git a/lib/silccore/silcauth.c b/lib/silccore/silcauth.c
index a06246fdc201716608f190afcd3daa055d9f4506..3ee76ca41eccfcf3f2d789a16f0546e1e23c2274 100644 (file)
--- a/lib/silccore/silcauth.c
+++ b/lib/silccore/silcauth.c
@@ -40,23 +40,20 @@ struct SilcAuthPayloadStruct {
 
 /* Parses and returns Authentication Payload */
 
-SilcAuthPayload silc_auth_payload_parse(unsigned char *data,
+SilcAuthPayload silc_auth_payload_parse(const unsigned char *data,
                                        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, (unsigned char *)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 +63,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);
@@ -90,9 +83,9 @@ SilcAuthPayload silc_auth_payload_parse(unsigned char *data,
 /* Encodes authentication payload into buffer and returns it */
 
 SilcBuffer silc_auth_payload_encode(SilcAuthMethod method,
-                                   unsigned char *random_data,
+                                   const unsigned char *random_data,
                                    uint16 random_len,
-                                   unsigned char *auth_data,
+                                   const unsigned char *auth_data,
                                    uint16 auth_len)
 {
   SilcBuffer buffer;
@@ -161,8 +154,8 @@ unsigned char *silc_auth_get_data(SilcAuthPayload payload,
 
 static unsigned char *
 silc_auth_public_key_encode_data(SilcPublicKey public_key, 
-                                unsigned char *random,
-                                uint32 random_len, void *id,
+                                const unsigned char *random,
+                                uint32 random_len, const void *id,
                                 SilcIdType type, uint32 *ret_len)
 {
   SilcBuffer buf;
@@ -188,8 +181,7 @@ silc_auth_public_key_encode_data(SilcPublicKey public_key,
                     SILC_STR_UI_XNSTRING(pk, pk_len),
                     SILC_STR_END);
   
-  ret = silc_calloc(buf->len + 1, sizeof(*ret));
-  memcpy(ret, buf->data, buf->len);
+  ret = silc_memdup(buf->data, buf->len);
 
   if (ret_len)
     *ret_len = buf->len;
@@ -208,7 +200,7 @@ silc_auth_public_key_encode_data(SilcPublicKey public_key,
 SilcBuffer silc_auth_public_key_auth_generate(SilcPublicKey public_key,
                                              SilcPrivateKey private_key,
                                              SilcHash hash,
-                                             void *id, SilcIdType type)
+                                             const void *id, SilcIdType type)
 {
   unsigned char *random;
   unsigned char auth_data[1024];
@@ -268,9 +260,9 @@ SilcBuffer silc_auth_public_key_auth_generate(SilcPublicKey public_key,
 /* Verifies the authentication data. Returns TRUE if authentication was
    successful. */
 
-int silc_auth_public_key_auth_verify(SilcAuthPayload payload,
-                                    SilcPublicKey public_key, SilcHash hash,
-                                    void *id, SilcIdType type)
+bool silc_auth_public_key_auth_verify(SilcAuthPayload payload,
+                                     SilcPublicKey public_key, SilcHash hash,
+                                     const void *id, SilcIdType type)
 {
   unsigned char *tmp;
   uint32 tmp_len;
@@ -317,15 +309,16 @@ int silc_auth_public_key_auth_verify(SilcAuthPayload payload,
 
 /* Same as above but the payload is not parsed yet. This will parse it. */
 
-int silc_auth_public_key_auth_verify_data(SilcBuffer payload,
-                                         SilcPublicKey public_key, 
-                                         SilcHash hash,
-                                         void *id, SilcIdType type)
+bool silc_auth_public_key_auth_verify_data(const unsigned char *payload,
+                                          uint32 payload_len,
+                                          SilcPublicKey public_key, 
+                                          SilcHash hash,
+                                          const void *id, SilcIdType type)
 {
   SilcAuthPayload auth_payload;
   int ret;
 
-  auth_payload = silc_auth_payload_parse(payload->data, payload->len);
+  auth_payload = silc_auth_payload_parse(payload, payload_len);
   if (!auth_payload) {
     SILC_LOG_DEBUG(("Authentication failed"));
     return FALSE;
@@ -346,9 +339,9 @@ int silc_auth_public_key_auth_verify_data(SilcBuffer payload,
    authentication then the `auth_data' is the SilcPublicKey and the
    `auth_data_len' is ignored. */
 
-int silc_auth_verify(SilcAuthPayload payload, SilcAuthMethod auth_method,
-                    void *auth_data, uint32 auth_data_len, 
-                    SilcHash hash, void *id, SilcIdType type)
+bool silc_auth_verify(SilcAuthPayload payload, SilcAuthMethod auth_method,
+                     const void *auth_data, uint32 auth_data_len, 
+                     SilcHash hash, const void *id, SilcIdType type)
 {
   SILC_LOG_DEBUG(("Verifying authentication"));
 
@@ -364,7 +357,7 @@ int silc_auth_verify(SilcAuthPayload payload, SilcAuthMethod auth_method,
   case SILC_AUTH_PASSWORD:
     /* Passphrase based authentication. The `pkcs', `hash', `id' and `type'
        arguments are not needed. */
-    if (!memcmp(payload->auth_data, auth_data, payload->auth_len)) {
+    if (!memcmp(payload->auth_data, auth_data, auth_data_len)) {
       SILC_LOG_DEBUG(("Authentication successful"));
       return TRUE;
     }
@@ -387,10 +380,10 @@ 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, uint32 payload_len,
-                         SilcAuthMethod auth_method, void *auth_data,
-                         uint32 auth_data_len, SilcHash hash, 
-                         void *id, SilcIdType type)
+bool silc_auth_verify_data(const unsigned char *payload, uint32 payload_len,
+                          SilcAuthMethod auth_method, const void *auth_data,
+                          uint32 auth_data_len, SilcHash hash, 
+                          const void *id, SilcIdType type)
 {
   SilcAuthPayload auth_payload;
   int ret;
@@ -422,17 +415,21 @@ struct SilcKeyAgreementPayloadStruct {
 
 /* Parses and returns an allocated Key Agreement payload. */
 
-SilcKeyAgreementPayload silc_key_agreement_payload_parse(SilcBuffer buffer)
+SilcKeyAgreementPayload 
+silc_key_agreement_payload_parse(const unsigned char *payload,
+                                uint32 payload_len)
 {
+  SilcBufferStruct buffer;
   SilcKeyAgreementPayload new;
   int ret;
 
   SILC_LOG_DEBUG(("Parsing Key Agreement Payload"));
 
+  silc_buffer_set(&buffer, (unsigned char *)payload, payload_len);
   new = silc_calloc(1, sizeof(*new));
 
   /* Parse the payload */
-  ret = silc_buffer_unformat(buffer, 
+  ret = silc_buffer_unformat(&buffer, 
                             SILC_STR_UI16_NSTRING_ALLOC(&new->hostname,
                                                         &new->hostname_len),
                             SILC_STR_UI_INT(&new->port),
@@ -447,7 +444,7 @@ 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,
+SilcBuffer silc_key_agreement_payload_encode(const char *hostname,
                                             uint32 port)
 {
   SilcBuffer buffer;