Handle memory allocation failures when unformatting data

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

diff --git a/lib/silccore/silcauth.c b/lib/silccore/silcauth.c
index b98f36e84ae7d7e5aa5d42383ad2483b5dc71308..da2a502fe210c9c43e31a16c49aa464aa14abbcb 100644 (file)
--- a/lib/silccore/silcauth.c
+++ b/lib/silccore/silcauth.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2001 - 2005 Pekka Riikonen
+  Copyright (C) 2001 - 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
@@ -279,7 +279,6 @@ silc_auth_public_key_auth_generate_wpub(SilcPublicKey public_key,
   unsigned char *tmp;
   SilcUInt32 tmp_len;
   SilcBuffer buf;
-  SilcPKCS pkcs;
 
   SILC_LOG_DEBUG(("Generating Authentication Payload with data"));
 
@@ -289,22 +288,11 @@ silc_auth_public_key_auth_generate_wpub(SilcPublicKey public_key,
   if (!tmp)
     return NULL;
 
-  /* Allocate PKCS object */
-  if (!silc_pkcs_alloc(private_key->name, SILC_PKCS_SILC, &pkcs)) {
-    memset(tmp, 0, tmp_len);
-    silc_free(tmp);
-    return NULL;
-  }
-  silc_pkcs_public_key_set(pkcs, public_key);
-  silc_pkcs_private_key_set(pkcs, private_key);
-
   /* Compute the hash and the signature. */
-  if (silc_pkcs_get_key_len(pkcs) / 8 > sizeof(auth_data) - 1 ||
-      !silc_pkcs_sign_with_hash(pkcs, hash, tmp, tmp_len, auth_data,
-                               &auth_len)) {
+  if (!silc_pkcs_sign(private_key, tmp, tmp_len, auth_data,
+                     sizeof(auth_data) - 1, &auth_len, TRUE, hash)) {
     memset(tmp, 0, tmp_len);
     silc_free(tmp);
-    silc_pkcs_free(pkcs);
     return NULL;
   }
 
@@ -315,7 +303,6 @@ silc_auth_public_key_auth_generate_wpub(SilcPublicKey public_key,
   memset(tmp, 0, tmp_len);
   memset(auth_data, 0, sizeof(auth_data));
   silc_free(tmp);
-  silc_pkcs_free(pkcs);
 
   return buf;
 }
@@ -330,7 +317,6 @@ SilcBool silc_auth_public_key_auth_verify(SilcAuthPayload payload,
 {
   unsigned char *tmp;
   SilcUInt32 tmp_len;
-  SilcPKCS pkcs;
 
   SILC_LOG_DEBUG(("Verifying authentication data"));
 
@@ -343,28 +329,18 @@ SilcBool silc_auth_public_key_auth_verify(SilcAuthPayload payload,
     return FALSE;
   }
 
-  /* Allocate PKCS object */
-  if (!silc_pkcs_alloc(public_key->name, SILC_PKCS_SILC, &pkcs)) {
-    memset(tmp, 0, tmp_len);
-    silc_free(tmp);
-    return FALSE;
-  }
-  silc_pkcs_public_key_set(pkcs, public_key);
-
   /* Verify the authentication data */
-  if (!silc_pkcs_verify_with_hash(pkcs, hash, payload->auth_data,
-                                 payload->auth_len, tmp, tmp_len)) {
+  if (!silc_pkcs_verify(public_key, payload->auth_data,
+                       payload->auth_len, tmp, tmp_len, hash)) {
 
     memset(tmp, 0, tmp_len);
     silc_free(tmp);
-    silc_pkcs_free(pkcs);
     SILC_LOG_DEBUG(("Authentication failed"));
     return FALSE;
   }
 
   memset(tmp, 0, tmp_len);
   silc_free(tmp);
-  silc_pkcs_free(pkcs);
 
   SILC_LOG_DEBUG(("Authentication successful"));
 
@@ -482,7 +458,8 @@ SilcBool silc_auth_verify_data(const unsigned char *payload,
 struct SilcKeyAgreementPayloadStruct {
   SilcUInt16 hostname_len;
   unsigned char *hostname;
-  SilcUInt32 port;
+  SilcUInt16 protocol;
+  SilcUInt16 port;
 };
 
 /* Parses and returns an allocated Key Agreement payload. */
@@ -497,16 +474,17 @@ silc_key_agreement_payload_parse(const unsigned char *payload,
 
   SILC_LOG_DEBUG(("Parsing Key Agreement Payload"));
 
-  silc_buffer_set(&buffer, (unsigned char *)payload, payload_len);
   newp = silc_calloc(1, sizeof(*newp));
   if (!newp)
     return NULL;
 
   /* Parse the payload */
+  silc_buffer_set(&buffer, (unsigned char *)payload, payload_len);
   ret = silc_buffer_unformat(&buffer,
                             SILC_STR_UI16_NSTRING_ALLOC(&newp->hostname,
                                                         &newp->hostname_len),
-                            SILC_STR_UI_INT(&newp->port),
+                            SILC_STR_UI_SHORT(&newp->protocol),
+                            SILC_STR_UI_SHORT(&newp->port),
                             SILC_STR_END);
   if (ret == -1 || newp->hostname_len > silc_buffer_len(&buffer) - 6) {
     silc_free(newp);
@@ -519,7 +497,8 @@ silc_key_agreement_payload_parse(const unsigned char *payload,
 /* Encodes the Key Agreement protocol and returns the encoded buffer */
 
 SilcBuffer silc_key_agreement_payload_encode(const char *hostname,
-                                            SilcUInt32 port)
+                                            SilcUInt16 protocol,
+                                            SilcUInt16 port)
 {
   SilcBuffer buffer;
   SilcUInt32 len = hostname ? strlen(hostname) : 0;
@@ -532,7 +511,8 @@ SilcBuffer silc_key_agreement_payload_encode(const char *hostname,
   silc_buffer_format(buffer,
                     SILC_STR_UI_SHORT(len),
                     SILC_STR_UI_XNSTRING(hostname, len),
-                    SILC_STR_UI_INT(port),
+                    SILC_STR_UI_SHORT(protocol),
+                    SILC_STR_UI_SHORT(port),
                     SILC_STR_END);
 
   return buffer;
@@ -555,9 +535,16 @@ char *silc_key_agreement_get_hostname(SilcKeyAgreementPayload payload)
   return payload->hostname;
 }
 
+/* Returns the protocol in the payload */
+
+SilcUInt16 silc_key_agreement_get_protocol(SilcKeyAgreementPayload payload)
+{
+  return payload->protocol;
+}
+
 /* Returns the port in the payload */
 
-SilcUInt32 silc_key_agreement_get_port(SilcKeyAgreementPayload payload)
+SilcUInt16 silc_key_agreement_get_port(SilcKeyAgreementPayload payload)
 {
   return payload->port;
 }