projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integer type name change.
[silc.git]
/
lib
/
silcske
/
payload.c
diff --git
a/lib/silcske/payload.c
b/lib/silcske/payload.c
index 6472e1e82ffd2c2beb2de81fa35dd6577e4cf08d..9bf2aa862e9346096871103aa27c50fa43c6941d 100644
(file)
--- a/
lib/silcske/payload.c
+++ b/
lib/silcske/payload.c
@@
-179,7
+179,7
@@
SilcSKEStatus silc_ske_payload_ke_encode(SilcSKE ske,
{
SilcBuffer buf;
unsigned char *x_str;
{
SilcBuffer buf;
unsigned char *x_str;
-
ui
nt32 x_len;
+
SilcUI
nt32 x_len;
int ret;
SILC_LOG_DEBUG(("Encoding KE Payload"));
int ret;
SILC_LOG_DEBUG(("Encoding KE Payload"));
@@
-243,8
+243,8
@@
SilcSKEStatus silc_ske_payload_ke_decode(SilcSKE ske,
SilcSKEStatus status = SILC_SKE_STATUS_ERROR;
SilcSKEKEPayload *payload;
unsigned char *x = NULL;
SilcSKEStatus status = SILC_SKE_STATUS_ERROR;
SilcSKEKEPayload *payload;
unsigned char *x = NULL;
-
ui
nt16 x_len;
-
ui
nt32 tot_len = 0, len2;
+
SilcUI
nt16 x_len;
+
SilcUI
nt32 tot_len = 0, len2;
int ret;
SILC_LOG_DEBUG(("Decoding Key Exchange Payload"));
int ret;
SILC_LOG_DEBUG(("Decoding Key Exchange Payload"));
@@
-320,12
+320,9
@@
SilcSKEStatus silc_ske_payload_ke_decode(SilcSKE ske,
return SILC_SKE_STATUS_OK;
err:
return SILC_SKE_STATUS_OK;
err:
- if (payload->pk_data)
- silc_free(payload->pk_data);
- if (payload->sign_data)
- silc_free(payload->sign_data);
- if (x)
- silc_free(x);
+ silc_free(payload->pk_data);
+ silc_free(payload->sign_data);
+ silc_free(x);
silc_free(payload);
ske->status = status;
return status;
silc_free(payload);
ske->status = status;
return status;
@@
-336,11
+333,9
@@
SilcSKEStatus silc_ske_payload_ke_decode(SilcSKE ske,
void silc_ske_payload_ke_free(SilcSKEKEPayload *payload)
{
if (payload) {
void silc_ske_payload_ke_free(SilcSKEKEPayload *payload)
{
if (payload) {
- if (payload->pk_data)
- silc_free(payload->pk_data);
+ silc_free(payload->pk_data);
silc_mp_uninit(&payload->x);
silc_mp_uninit(&payload->x);
- if (payload->sign_data)
- silc_free(payload->sign_data);
+ silc_free(payload->sign_data);
silc_free(payload);
}
}
silc_free(payload);
}
}