projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added SILC Server library.
[silc.git]
/
lib
/
silccore
/
silcattrs.c
diff --git
a/lib/silccore/silcattrs.c
b/lib/silccore/silcattrs.c
index 304bb8700c5b2d249ce773a32262ea9f418ef767..27f25f7373ebea728ba10e1c984ce7d5e9bca532 100644
(file)
--- a/
lib/silccore/silcattrs.c
+++ b/
lib/silccore/silcattrs.c
@@
-19,7
+19,7
@@
/* Implementation of Attribute Payload routines */
/* $Id$ */
/* Implementation of Attribute Payload routines */
/* $Id$ */
-#include "silc
includes
.h"
+#include "silc.h"
#include "silcattrs.h"
/******************************************************************************
#include "silcattrs.h"
/******************************************************************************
@@
-121,11
+121,12
@@
silc_attribute_payload_encode_int(SilcAttribute attribute,
case SILC_ATTRIBUTE_EXTENSION:
case SILC_ATTRIBUTE_USER_ICON:
{
case SILC_ATTRIBUTE_EXTENSION:
case SILC_ATTRIBUTE_USER_ICON:
{
- Silc
AttributeObjMime *
mime = object;
+ Silc
Mime
mime = object;
if (object_size != sizeof(*mime))
return NULL;
if (object_size != sizeof(*mime))
return NULL;
- object = (void *)mime->mime;
- object_size = mime->mime_len;
+ str = silc_mime_encode(mime, &object_size);
+ if (!str)
+ return NULL;
}
break;
}
break;
@@
-416,7
+417,7
@@
const unsigned char *silc_attribute_get_data(SilcAttributePayload payload,
/* Construct digital signature verification data */
unsigned char *silc_attribute_get_verify_data(SilcDList attrs,
/* Construct digital signature verification data */
unsigned char *silc_attribute_get_verify_data(SilcDList attrs,
-
b
ool server_verification,
+
SilcB
ool server_verification,
SilcUInt32 *data_len)
{
SilcAttributePayload attr;
SilcUInt32 *data_len)
{
SilcAttributePayload attr;
@@
-464,11
+465,11
@@
unsigned char *silc_attribute_get_verify_data(SilcDList attrs,
/* Return parsed attribute object */
/* Return parsed attribute object */
-
b
ool silc_attribute_get_object(SilcAttributePayload payload,
+
SilcB
ool silc_attribute_get_object(SilcAttributePayload payload,
void *object, SilcUInt32 object_size)
{
SilcUInt16 len;
void *object, SilcUInt32 object_size)
{
SilcUInt16 len;
-
b
ool ret = FALSE;
+
SilcB
ool ret = FALSE;
if (!object || payload->flags & SILC_ATTRIBUTE_FLAG_INVALID)
return FALSE;
if (!object || payload->flags & SILC_ATTRIBUTE_FLAG_INVALID)
return FALSE;
@@
-552,11
+553,11
@@
bool silc_attribute_get_object(SilcAttributePayload payload,
case SILC_ATTRIBUTE_EXTENSION:
case SILC_ATTRIBUTE_USER_ICON:
{
case SILC_ATTRIBUTE_EXTENSION:
case SILC_ATTRIBUTE_USER_ICON:
{
- Silc
AttributeObjMime *
mime = object;
+ Silc
Mime
mime = object;
if (object_size != sizeof(*mime))
break;
if (object_size != sizeof(*mime))
break;
- mime->mime = (const unsigned char *)payload->data;
-
mime->mime_len = payload->data_len
;
+ if (!silc_mime_decode(mime, payload->data, payload->data_len))
+
break
;
ret = TRUE;
}
break;
ret = TRUE;
}
break;