Author: Pekka Riikonen <priikone@silcnet.org>
- 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
*/
/* $Id$ */
-#include "silcincludes.h"
+#include "silc.h"
#include "silcclient.h"
#include "client_internal.h"
SilcAttributePayload attr = context;
SilcAttrForeach *f = user_context;
const unsigned char *data;
+ unsigned char tmp[32];
SilcUInt32 data_len;
if (!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,
/* Process list of attributes. Returns reply to the requested attributes. */
SilcBuffer silc_client_attributes_process(SilcClient client,
- SilcSocketConnection sock,
+ SilcClientConnection conn,
SilcDList attrs)
{
- SilcClientConnection conn = sock->user_data;
SilcBuffer buffer = NULL;
SilcAttrForeach f;
SilcAttribute attribute;
/* If nothing is set by application assume that we don't want to use
attributes, ignore the request. */
- if (!conn->internal->attrs)
+ if (!conn->internal->attrs) {
+ SILC_LOG_DEBUG(("User has not set any attributes"));
return NULL;
+ }
/* 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(conn->public_key, &pk.data_len);
buffer = silc_attribute_payload_encode(buffer,
SILC_ATTRIBUTE_USER_PUBLIC_KEY,
pk.data ? SILC_ATTRIBUTE_FLAG_VALID :
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)) {
+ if (silc_pkcs_sign(conn->private_key, silc_buffer_data(buffer),
+ silc_buffer_len(buffer), sign, sizeof(sign), &sign_len,
+ TRUE, conn->internal->sha1hash)) {
pk.type = NULL;
pk.data = sign;
pk.data_len = sign_len;
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,
/* Delete one attribute */
-bool silc_client_attribute_del(SilcClient client,
- SilcClientConnection conn,
- SilcAttribute attribute,
- SilcAttributePayload attr)
+SilcBool silc_client_attribute_del(SilcClient client,
+ SilcClientConnection conn,
+ SilcAttribute attribute,
+ SilcAttributePayload attr)
{
- bool ret;
+ SilcBool ret;
if (!conn->internal->attrs)
return FALSE;
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,