X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcclient%2Fclient_attrs.c;h=1947c1fb3e5d7592f892ef40f6953a88f0d64400;hb=1ea936cbf1bb3b19bd55839b904ef59ada84b8b5;hp=f29d91f495a3b8f7cfb082085c88ec24450098e0;hpb=40f8443d8d3a6577336ee66d18e04d9ac4d956bb;p=silc.git diff --git a/lib/silcclient/client_attrs.c b/lib/silcclient/client_attrs.c index f29d91f4..1947c1fb 100644 --- a/lib/silcclient/client_attrs.c +++ b/lib/silcclient/client_attrs.c @@ -4,7 +4,7 @@ Author: Pekka Riikonen - Copyright (C) 2002 - 2004 Pekka Riikonen + Copyright (C) 2002 - 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 @@ -22,6 +22,12 @@ #include "silcclient.h" #include "client_internal.h" +typedef struct { + SilcBuffer buffer; + SilcPKCSSignCb sign_cb; + void *context; +} *SilcAttrSign; + typedef struct { SilcBuffer buffer; } SilcAttrForeach; @@ -35,6 +41,7 @@ static void silc_client_attributes_process_foreach(void *key, void *context, SilcAttributePayload attr = context; SilcAttrForeach *f = user_context; const unsigned char *data; + unsigned char tmp[32]; SilcUInt32 data_len; if (!context) { @@ -54,48 +61,80 @@ static void silc_client_attributes_process_foreach(void *key, void *context, SILC_LOG_DEBUG(("Attribute %d found", attribute)); data = silc_attribute_get_data(attr, &data_len); -#if 0 /* We replace the TIMEZONE with valid value here */ if (attribute == SILC_ATTRIBUTE_TIMEZONE) { - data = (const unsigned char *)silc_get_time(0); - data_len = strlen(data); - f->buffer = silc_attribute_payload_encode(f->buffer, attribute, - SILC_ATTRIBUTE_FLAG_VALID, - (void *)data, data_len); + if (silc_timezone(tmp, sizeof(tmp))) { + data = tmp; + data_len = strlen(tmp); + f->buffer = silc_attribute_payload_encode(f->buffer, attribute, + SILC_ATTRIBUTE_FLAG_VALID, + (void *)data, data_len); + } return; } -#endif f->buffer = silc_attribute_payload_encode_data(f->buffer, attribute, SILC_ATTRIBUTE_FLAG_VALID, data, data_len); } +/* Attribute signature callback */ + +static void +silc_client_attributes_process_signed(SilcBool success, + const unsigned char *signature, + SilcUInt32 signature_len, + void *context) +{ + SilcAttrSign s = context; + SilcAttributeObjPk pk; + + if (success) { + pk.type = NULL; + pk.data = (unsigned char *)signature; + pk.data_len = signature_len; + s->buffer = + silc_attribute_payload_encode(s->buffer, + SILC_ATTRIBUTE_USER_DIGITAL_SIGNATURE, + SILC_ATTRIBUTE_FLAG_VALID, + &pk, sizeof(pk)); + } + + s->sign_cb(TRUE, silc_buffer_data(s->buffer), silc_buffer_len(s->buffer), + s->context); + + silc_buffer_free(s->buffer); + silc_free(s); +} + /* Process list of attributes. Returns reply to the requested attributes. */ -SilcBuffer silc_client_attributes_process(SilcClient client, - SilcSocketConnection sock, - SilcDList attrs) +void silc_client_attributes_process(SilcClient client, + SilcClientConnection conn, + SilcDList attrs, + SilcPKCSSignCb sign_cb, + void *context) { - SilcClientConnection conn = sock->user_data; + SilcAttrSign s; SilcBuffer buffer = NULL; SilcAttrForeach f; SilcAttribute attribute; SilcAttributePayload attr; SilcAttributeObjPk pk; - unsigned char sign[2048 + 1]; - SilcUInt32 sign_len; SILC_LOG_DEBUG(("Process Requested Attributes")); /* If nothing is set by application assume that we don't want to use attributes, ignore the request. */ - if (!conn->internal->attrs) - return NULL; + if (!conn->internal->attrs) { + SILC_LOG_DEBUG(("User has not set any attributes")); + sign_cb(FALSE, NULL, 0, context); + return; + } /* Always put our public key. */ pk.type = "silc-rsa"; - pk.data = silc_pkcs_public_key_encode(client->public_key, &pk.data_len); + pk.data = silc_pkcs_public_key_encode(NULL, conn->public_key, &pk.data_len); buffer = silc_attribute_payload_encode(buffer, SILC_ATTRIBUTE_USER_PUBLIC_KEY, pk.data ? SILC_ATTRIBUTE_FLAG_VALID : @@ -121,21 +160,19 @@ SilcBuffer silc_client_attributes_process(SilcClient client, } buffer = f.buffer; - /* Finally compute the digital signature of all the data we provided. */ - if (silc_pkcs_sign_with_hash(client->pkcs, client->sha1hash, - buffer->data, buffer->len, - sign, &sign_len)) { - pk.type = NULL; - pk.data = sign; - pk.data_len = sign_len; - buffer = - silc_attribute_payload_encode(buffer, - SILC_ATTRIBUTE_USER_DIGITAL_SIGNATURE, - SILC_ATTRIBUTE_FLAG_VALID, - &pk, sizeof(pk)); + s = silc_calloc(1, sizeof(*s)); + if (!s) { + sign_cb(FALSE, NULL, 0, context); + return; } + s->sign_cb = sign_cb; + s->context = context; + s->buffer = buffer; - return buffer; + /* Finally compute the digital signature of all the data we provided. */ + silc_pkcs_sign_async(conn->private_key, silc_buffer_data(buffer), + silc_buffer_len(buffer), TRUE, NULL, + client->rng, silc_client_attributes_process_signed, s); } static void silc_client_attribute_destruct(void *key, void *context, @@ -161,7 +198,7 @@ SilcAttributePayload silc_client_attribute_add(SilcClient client, if (!conn->internal->attrs) conn->internal->attrs = - silc_hash_table_alloc(0, silc_hash_ptr, NULL, NULL, + silc_hash_table_alloc(NULL, 0, silc_hash_ptr, NULL, NULL, NULL, silc_client_attribute_destruct, NULL, TRUE); silc_hash_table_add(conn->internal->attrs, @@ -185,9 +222,9 @@ static void silc_client_attribute_del_foreach(void *key, void *context, /* Delete one attribute */ SilcBool silc_client_attribute_del(SilcClient client, - SilcClientConnection conn, - SilcAttribute attribute, - SilcAttributePayload attr) + SilcClientConnection conn, + SilcAttribute attribute, + SilcAttributePayload attr) { SilcBool ret; @@ -237,6 +274,7 @@ SilcBuffer silc_client_attributes_request(SilcAttribute attribute, ...) if (!attribute) return silc_client_attributes_request(SILC_ATTRIBUTE_USER_INFO, + SILC_ATTRIBUTE_USER_ICON, SILC_ATTRIBUTE_SERVICE, SILC_ATTRIBUTE_STATUS_MOOD, SILC_ATTRIBUTE_STATUS_FREETEXT,