diff options
Diffstat (limited to 'src/sh_xfer_client.c')
| -rw-r--r-- | src/sh_xfer_client.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/sh_xfer_client.c b/src/sh_xfer_client.c index abc6504..aa4941c 100644 --- a/src/sh_xfer_client.c +++ b/src/sh_xfer_client.c @@ -96,7 +96,7 @@ #define FD_SETSIZE 32 #endif #ifndef FD_ZERO -#define FD_ZERO(p) memset((char *)(p), '\0', sizeof(*(p))) +#define FD_ZERO(p) memset((char *)(p), 0, sizeof(*(p))) #endif #if defined(HAVE_MLOCK) && !defined(HAVE_BROKEN_MLOCK) @@ -768,7 +768,7 @@ static int xfer_auth(int is_reinit, int * initialized, /* verify random nonce v from server H(v, P)v */ sh_passwd (nounce, NULL, NULL, temp); - if ( 0 != sl_strncmp(temp, answer, KEY_LEN)) + if ( 0 != sl_ts_strncmp(temp, answer, KEY_LEN)) flag_err = (-1); TPT(( 0, FIL__, __LINE__, _("msg=<c/r: vrfy nonce, flag_err = %d>\n"), @@ -1002,7 +1002,7 @@ static int xfer_auth(int is_reinit, int * initialized, M_buf, sizeof(M_buf) ); if (M != NULL && - 0 == sl_strncmp (answer, M, KEY_LEN+1)) + 0 == sl_ts_strncmp (answer, M, KEY_LEN+1)) { sl_strlcpy (skey->session, sh_tiger_hash(foo_Sc, @@ -1050,7 +1050,7 @@ static int xfer_auth(int is_reinit, int * initialized, { xfer_timeout_val *= 2; sh_error_handle((-1), FIL__, __LINE__, 0, MSG_TCP_NOAUTH); - memset(answer, '\0', 512); + memset(answer, 0, 512); MUNLOCK(answer, 512); SH_FREE(answer); return -1; @@ -1082,7 +1082,7 @@ int xfer_check_server_cmd(char * answer, char * buffer) (void) sl_strlcpy(buffer, &answer[KEY_LEN], pos+1); flag_err = - sl_strncmp(&answer[KEY_LEN+pos], + sl_ts_strncmp(&answer[KEY_LEN+pos], sh_util_siggen(skey->session, buffer, pos, @@ -1201,12 +1201,12 @@ int xfer_send_message(char * errmsg, int sockfd, char * answer) */ (void) sl_strlcpy(buffer, errmsg, len); (void) sl_strlcat(buffer, nsrv, len); - flag_err = sl_strncmp(answer, - sh_util_siggen(skey->session, - buffer, - sl_strlen(buffer), - sigbuf, sizeof(sigbuf)), - KEY_LEN); + flag_err = sl_ts_strncmp(answer, + sh_util_siggen(skey->session, + buffer, + sl_strlen(buffer), + sigbuf, sizeof(sigbuf)), + KEY_LEN); TPT((0, FIL__, __LINE__, _("msg=<sign %s.>\n"), sh_util_siggen(skey->session, buffer, sl_strlen(buffer), sigbuf, sizeof(sigbuf)))); |