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]
/
apps
/
silcd
/
protocol.c
diff --git
a/apps/silcd/protocol.c
b/apps/silcd/protocol.c
index 794a20880279462c6b473c8896443a1c971969e2..29eb07a707d6f8cc7f3cea6728a1a2e08115d745 100644
(file)
--- a/
apps/silcd/protocol.c
+++ b/
apps/silcd/protocol.c
@@
-38,7
+38,7
@@
extern char *silc_version_string;
static bool
silc_verify_public_key_internal(SilcServer server, SilcSocketConnection sock,
SilcSocketType conn_type,
static bool
silc_verify_public_key_internal(SilcServer server, SilcSocketConnection sock,
SilcSocketType conn_type,
- unsigned char *pk,
ui
nt32 pk_len,
+ unsigned char *pk,
SilcUI
nt32 pk_len,
SilcSKEPKType pk_type)
{
char file[256], filename[256], *fingerprint;
SilcSKEPKType pk_type)
{
char file[256], filename[256], *fingerprint;
@@
-103,7
+103,7
@@
silc_verify_public_key_internal(SilcServer server, SilcSocketConnection sock,
/* The key already exists, verify it. */
SilcPublicKey public_key;
unsigned char *encpk;
/* The key already exists, verify it. */
SilcPublicKey public_key;
unsigned char *encpk;
-
ui
nt32 encpk_len;
+
SilcUI
nt32 encpk_len;
SILC_LOG_DEBUG(("We have the public key saved locally"));
SILC_LOG_DEBUG(("We have the public key saved locally"));
@@
-159,7
+159,7
@@
silc_verify_public_key_internal(SilcServer server, SilcSocketConnection sock,
static void
silc_server_protocol_ke_verify_key(SilcSKE ske,
unsigned char *pk_data,
static void
silc_server_protocol_ke_verify_key(SilcSKE ske,
unsigned char *pk_data,
-
ui
nt32 pk_len,
+
SilcUI
nt32 pk_len,
SilcSKEPKType pk_type,
void *context,
SilcSKEVerifyCbCompletion completion,
SilcSKEPKType pk_type,
void *context,
SilcSKEVerifyCbCompletion completion,
@@
-315,7
+315,7
@@
int silc_server_protocol_ke_set_keys(SilcServer server,
/* Check remote host version string */
SilcSKEStatus silc_ske_check_version(SilcSKE ske, unsigned char *version,
/* Check remote host version string */
SilcSKEStatus silc_ske_check_version(SilcSKE ske, unsigned char *version,
-
ui
nt32 len, void *context)
+
SilcUI
nt32 len, void *context)
{
SilcSKEStatus status = SILC_SKE_STATUS_OK;
char *cp;
{
SilcSKEStatus status = SILC_SKE_STATUS_OK;
char *cp;
@@
-736,7
+736,7
@@
static int
silc_server_public_key_authentication(SilcServer server,
SilcPublicKey pub_key,
unsigned char *sign,
silc_server_public_key_authentication(SilcServer server,
SilcPublicKey pub_key,
unsigned char *sign,
-
ui
nt32 sign_len,
+
SilcUI
nt32 sign_len,
SilcSKE ske)
{
SilcPKCS pkcs;
SilcSKE ske)
{
SilcPKCS pkcs;
@@
-779,7
+779,7
@@
silc_server_public_key_authentication(SilcServer server,
static int
silc_server_get_public_key_auth(SilcServer server,
unsigned char **auth_data,
static int
silc_server_get_public_key_auth(SilcServer server,
unsigned char **auth_data,
-
ui
nt32 *auth_data_len,
+
SilcUI
nt32 *auth_data_len,
SilcSKE ske)
{
int len;
SilcSKE ske)
{
int len;
@@
-819,7
+819,7
@@
silc_server_get_authentication(SilcServerConnAuthInternalContext *ctx,
char *local_passphrase,
void *local_publickey,
unsigned char *remote_auth,
char *local_passphrase,
void *local_publickey,
unsigned char *remote_auth,
-
ui
nt32 remote_auth_len)
+
SilcUI
nt32 remote_auth_len)
{
SilcServer server = (SilcServer)ctx->server;
SilcSKE ske = ctx->ske;
{
SilcServer server = (SilcServer)ctx->server;
SilcSKE ske = ctx->ske;
@@
-886,8
+886,8
@@
SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
* We are receiving party
*/
int ret;
* We are receiving party
*/
int ret;
-
ui
nt16 payload_len;
-
ui
nt16 conn_type;
+
SilcUI
nt16 payload_len;
+
SilcUI
nt16 conn_type;
unsigned char *auth_data = NULL;
SILC_LOG_INFO(("Performing authentication protocol for %s (%s)",
unsigned char *auth_data = NULL;
SILC_LOG_INFO(("Performing authentication protocol for %s (%s)",
@@
-1052,7
+1052,7
@@
SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
SilcBuffer packet;
int payload_len = 0;
unsigned char *auth_data = NULL;
SilcBuffer packet;
int payload_len = 0;
unsigned char *auth_data = NULL;
-
ui
nt32 auth_data_len = 0;
+
SilcUI
nt32 auth_data_len = 0;
switch(ctx->auth_meth) {
case SILC_AUTH_NONE:
switch(ctx->auth_meth) {
case SILC_AUTH_NONE:
@@
-1259,8
+1259,8
@@
void silc_server_protocol_rekey_generate(SilcServer server,
{
SilcIDListData idata = (SilcIDListData)ctx->sock->user_data;
SilcSKEKeyMaterial *keymat;
{
SilcIDListData idata = (SilcIDListData)ctx->sock->user_data;
SilcSKEKeyMaterial *keymat;
-
ui
nt32 key_len = silc_cipher_get_key_len(idata->send_key);
-
ui
nt32 hash_len = idata->hash->hash->hash_len;
+
SilcUI
nt32 key_len = silc_cipher_get_key_len(idata->send_key);
+
SilcUI
nt32 hash_len = idata->hash->hash->hash_len;
SILC_LOG_DEBUG(("Generating new %s session keys (no PFS)",
send ? "sending" : "receiving"));
SILC_LOG_DEBUG(("Generating new %s session keys (no PFS)",
send ? "sending" : "receiving"));
@@
-1288,10
+1288,10
@@
silc_server_protocol_rekey_generate_pfs(SilcServer server,
{
SilcIDListData idata = (SilcIDListData)ctx->sock->user_data;
SilcSKEKeyMaterial *keymat;
{
SilcIDListData idata = (SilcIDListData)ctx->sock->user_data;
SilcSKEKeyMaterial *keymat;
-
ui
nt32 key_len = silc_cipher_get_key_len(idata->send_key);
-
ui
nt32 hash_len = idata->hash->hash->hash_len;
+
SilcUI
nt32 key_len = silc_cipher_get_key_len(idata->send_key);
+
SilcUI
nt32 hash_len = idata->hash->hash->hash_len;
unsigned char *tmpbuf;
unsigned char *tmpbuf;
-
ui
nt32 klen;
+
SilcUI
nt32 klen;
SILC_LOG_DEBUG(("Generating new %s session keys (with PFS)",
send ? "sending" : "receiving"));
SILC_LOG_DEBUG(("Generating new %s session keys (with PFS)",
send ? "sending" : "receiving"));