projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updates.
[silc.git]
/
lib
/
silccore
/
silcauth.c
diff --git
a/lib/silccore/silcauth.c
b/lib/silccore/silcauth.c
index 0b8f8c8797cc4d7be4a4faab32884a0bc4498a60..7ac372d360238a57017c15427504d25b398f8126 100644
(file)
--- a/
lib/silccore/silcauth.c
+++ b/
lib/silccore/silcauth.c
@@
-30,33
+30,31
@@
/* Authentication Payload structure */
struct SilcAuthPayloadStruct {
/* Authentication Payload structure */
struct SilcAuthPayloadStruct {
- u
nsigned short
len;
- u
nsigned short
auth_method;
- u
nsigned short
random_len;
+ u
int16
len;
+ u
int16
auth_method;
+ u
int16
random_len;
unsigned char *random_data;
unsigned char *random_data;
- u
nsigned short
auth_len;
+ u
int16
auth_len;
unsigned char *auth_data;
};
/* Parses and returns Authentication Payload */
SilcAuthPayload silc_auth_payload_parse(unsigned char *data,
unsigned char *auth_data;
};
/* Parses and returns Authentication Payload */
SilcAuthPayload silc_auth_payload_parse(unsigned char *data,
- u
nsigned int
data_len)
+ u
int32
data_len)
{
{
- SilcBuffer buffer;
+ SilcBuffer
Struct
buffer;
SilcAuthPayload new;
int ret;
SILC_LOG_DEBUG(("Parsing Authentication Payload"));
SilcAuthPayload new;
int ret;
SILC_LOG_DEBUG(("Parsing Authentication Payload"));
- buffer = silc_buffer_alloc(data_len);
- silc_buffer_pull_tail(buffer, SILC_BUFFER_END(buffer));
- silc_buffer_put(buffer, data, data_len);
+ silc_buffer_set(&buffer, data, data_len);
new = silc_calloc(1, sizeof(*new));
/* Parse the payload */
new = silc_calloc(1, sizeof(*new));
/* Parse the payload */
- ret = silc_buffer_unformat(buffer,
+ ret = silc_buffer_unformat(
&
buffer,
SILC_STR_UI_SHORT(&new->len),
SILC_STR_UI_SHORT(&new->auth_method),
SILC_STR_UI16_NSTRING_ALLOC(&new->random_data,
SILC_STR_UI_SHORT(&new->len),
SILC_STR_UI_SHORT(&new->auth_method),
SILC_STR_UI16_NSTRING_ALLOC(&new->random_data,
@@
-66,18
+64,14
@@
SilcAuthPayload silc_auth_payload_parse(unsigned char *data,
SILC_STR_END);
if (ret == -1) {
silc_free(new);
SILC_STR_END);
if (ret == -1) {
silc_free(new);
- silc_buffer_free(buffer);
return NULL;
}
return NULL;
}
- if (new->len != buffer
->
len) {
+ if (new->len != buffer
.
len) {
silc_auth_payload_free(new);
silc_auth_payload_free(new);
- silc_buffer_free(buffer);
return NULL;
}
return NULL;
}
- silc_buffer_free(buffer);
-
/* If password authentication, random data must not be set */
if (new->auth_method == SILC_AUTH_PASSWORD && new->random_len) {
silc_auth_payload_free(new);
/* If password authentication, random data must not be set */
if (new->auth_method == SILC_AUTH_PASSWORD && new->random_len) {
silc_auth_payload_free(new);
@@
-91,12
+85,12
@@
SilcAuthPayload silc_auth_payload_parse(unsigned char *data,
SilcBuffer silc_auth_payload_encode(SilcAuthMethod method,
unsigned char *random_data,
SilcBuffer silc_auth_payload_encode(SilcAuthMethod method,
unsigned char *random_data,
- u
nsigned short
random_len,
+ u
int16
random_len,
unsigned char *auth_data,
unsigned char *auth_data,
- u
nsigned short
auth_len)
+ u
int16
auth_len)
{
SilcBuffer buffer;
{
SilcBuffer buffer;
- u
nsigned int
len;
+ u
int32
len;
SILC_LOG_DEBUG(("Encoding Authentication Payload"));
SILC_LOG_DEBUG(("Encoding Authentication Payload"));
@@
-142,7
+136,7
@@
SilcAuthMethod silc_auth_get_method(SilcAuthPayload payload)
/* Get the authentication data */
unsigned char *silc_auth_get_data(SilcAuthPayload payload,
/* Get the authentication data */
unsigned char *silc_auth_get_data(SilcAuthPayload payload,
- u
nsigned int
*auth_len)
+ u
int32
*auth_len)
{
if (auth_len)
*auth_len = payload->auth_len;
{
if (auth_len)
*auth_len = payload->auth_len;
@@
-162,12
+156,12
@@
unsigned char *silc_auth_get_data(SilcAuthPayload payload,
static unsigned char *
silc_auth_public_key_encode_data(SilcPublicKey public_key,
unsigned char *random,
static unsigned char *
silc_auth_public_key_encode_data(SilcPublicKey public_key,
unsigned char *random,
- u
nsigned int
random_len, void *id,
- SilcIdType type, u
nsigned int
*ret_len)
+ u
int32
random_len, void *id,
+ SilcIdType type, u
int32
*ret_len)
{
SilcBuffer buf;
unsigned char *pk, *id_data, *ret;
{
SilcBuffer buf;
unsigned char *pk, *id_data, *ret;
- u
nsigned int
pk_len, id_len;
+ u
int32
pk_len, id_len;
pk = silc_pkcs_public_key_encode(public_key, &pk_len);
if (!pk)
pk = silc_pkcs_public_key_encode(public_key, &pk_len);
if (!pk)
@@
-178,7
+172,7
@@
silc_auth_public_key_encode_data(SilcPublicKey public_key,
silc_free(pk);
return NULL;
}
silc_free(pk);
return NULL;
}
- id_len = silc_id_get_len(type);
+ id_len = silc_id_get_len(
id,
type);
buf = silc_buffer_alloc(random_len + id_len + pk_len);
silc_buffer_pull_tail(buf, SILC_BUFFER_END(buf));
buf = silc_buffer_alloc(random_len + id_len + pk_len);
silc_buffer_pull_tail(buf, SILC_BUFFER_END(buf));
@@
-212,9
+206,9
@@
SilcBuffer silc_auth_public_key_auth_generate(SilcPublicKey public_key,
{
unsigned char *random;
unsigned char auth_data[1024];
{
unsigned char *random;
unsigned char auth_data[1024];
- u
nsigned int
auth_len;
+ u
int32
auth_len;
unsigned char *tmp;
unsigned char *tmp;
- u
nsigned int
tmp_len;
+ u
int32
tmp_len;
SilcBuffer buf;
SilcPKCS pkcs;
SilcBuffer buf;
SilcPKCS pkcs;
@@
-273,7
+267,7
@@
int silc_auth_public_key_auth_verify(SilcAuthPayload payload,
void *id, SilcIdType type)
{
unsigned char *tmp;
void *id, SilcIdType type)
{
unsigned char *tmp;
- u
nsigned int
tmp_len;
+ u
int32
tmp_len;
SilcPKCS pkcs;
SILC_LOG_DEBUG(("Verifying authentication data"));
SilcPKCS pkcs;
SILC_LOG_DEBUG(("Verifying authentication data"));
@@
-347,7
+341,7
@@
int silc_auth_public_key_auth_verify_data(SilcBuffer payload,
`auth_data_len' is ignored. */
int silc_auth_verify(SilcAuthPayload payload, SilcAuthMethod auth_method,
`auth_data_len' is ignored. */
int silc_auth_verify(SilcAuthPayload payload, SilcAuthMethod auth_method,
- void *auth_data, u
nsigned int
auth_data_len,
+ void *auth_data, u
int32
auth_data_len,
SilcHash hash, void *id, SilcIdType type)
{
SILC_LOG_DEBUG(("Verifying authentication"));
SilcHash hash, void *id, SilcIdType type)
{
SILC_LOG_DEBUG(("Verifying authentication"));
@@
-387,9
+381,9
@@
int silc_auth_verify(SilcAuthPayload payload, SilcAuthMethod auth_method,
/* Same as above but parses the authentication payload before verify. */
/* Same as above but parses the authentication payload before verify. */
-int silc_auth_verify_data(unsigned char *payload, u
nsigned int
payload_len,
+int silc_auth_verify_data(unsigned char *payload, u
int32
payload_len,
SilcAuthMethod auth_method, void *auth_data,
SilcAuthMethod auth_method, void *auth_data,
- u
nsigned int
auth_data_len, SilcHash hash,
+ u
int32
auth_data_len, SilcHash hash,
void *id, SilcIdType type)
{
SilcAuthPayload auth_payload;
void *id, SilcIdType type)
{
SilcAuthPayload auth_payload;
@@
-415,9
+409,9
@@
int silc_auth_verify_data(unsigned char *payload, unsigned int payload_len,
/* The Key Agreement protocol structure */
struct SilcKeyAgreementPayloadStruct {
/* The Key Agreement protocol structure */
struct SilcKeyAgreementPayloadStruct {
- u
nsigned short
hostname_len;
+ u
int16
hostname_len;
unsigned char *hostname;
unsigned char *hostname;
- u
nsigned int
port;
+ u
int32
port;
};
/* Parses and returns an allocated Key Agreement payload. */
};
/* Parses and returns an allocated Key Agreement payload. */
@@
-448,10
+442,10
@@
SilcKeyAgreementPayload silc_key_agreement_payload_parse(SilcBuffer buffer)
/* Encodes the Key Agreement protocol and returns the encoded buffer */
SilcBuffer silc_key_agreement_payload_encode(char *hostname,
/* Encodes the Key Agreement protocol and returns the encoded buffer */
SilcBuffer silc_key_agreement_payload_encode(char *hostname,
- u
nsigned int
port)
+ u
int32
port)
{
SilcBuffer buffer;
{
SilcBuffer buffer;
- u
nsigned int
len = hostname ? strlen(hostname) : 0;
+ u
int32
len = hostname ? strlen(hostname) : 0;
SILC_LOG_DEBUG(("Encoding Key Agreement Payload"));
SILC_LOG_DEBUG(("Encoding Key Agreement Payload"));
@@
-485,7
+479,7
@@
char *silc_key_agreement_get_hostname(SilcKeyAgreementPayload payload)
/* Returns the port in the payload */
/* Returns the port in the payload */
-u
nsigned int
silc_key_agreement_get_port(SilcKeyAgreementPayload payload)
+u
int32
silc_key_agreement_get_port(SilcKeyAgreementPayload payload)
{
return payload->port;
}
{
return payload->port;
}