night0721/zsm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only use one packet variable on authenticating on client.c

Browse source
This commit is contained in:
Night Kaly 2024-09-20 17:18:21 +01:00
parent da31b57980
commit 90f971133b
Signed by: night0721
GPG key ID: 957D67B8DB7A119B
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/client/client.c
View file

@ -14,12 +14,13 @@ int sockfd;
*/ */
int authenticate_server(keypair_t *kp) int authenticate_server(keypair_t *kp)
{ {
packet_t server_auth_pkt; /* create empty packet */
packet_t *pkt = create_packet(0, 0, 0, NULL, NULL);
int status; int status;
if ((status = recv_packet(&server_auth_pkt, sockfd, ZSM_TYP_AUTH) != ZSM_STA_SUCCESS)) { if ((status = recv_packet(pkt, sockfd, ZSM_TYP_AUTH) != ZSM_STA_SUCCESS)) {
return status; return status;
} }
uint8_t *challenge = server_auth_pkt.data; uint8_t *challenge = pkt->data;
uint8_t *sig = memalloc(SIGN_SIZE); uint8_t *sig = memalloc(SIGN_SIZE);
crypto_sign_detached(sig, NULL, challenge, CHALLENGE_SIZE, kp->sk.raw); crypto_sign_detached(sig, NULL, challenge, CHALLENGE_SIZE, kp->sk.raw);
@ -27,17 +28,24 @@ int authenticate_server(keypair_t *kp)
uint8_t *pk_full = memalloc(PK_SIZE); uint8_t *pk_full = memalloc(PK_SIZE);
memcpy(pk_full, kp->pk.full, PK_SIZE); memcpy(pk_full, kp->pk.full, PK_SIZE);
packet_t *auth_pkt = create_packet(1, ZSM_TYP_AUTH, SIGN_SIZE, pk_full, sig); pkt->status = 1;
if ((status = send_packet(auth_pkt, sockfd)) != ZSM_STA_SUCCESS) { pkt->type = ZSM_TYP_AUTH;
pkt->length = SIGN_SIZE;
pkt->data = pk_full;
pkt->signature = sig;
if ((status = send_packet(pkt, sockfd)) != ZSM_STA_SUCCESS) {
/* fd already closed */ /* fd already closed */
error(0, "Could not authenticate with server, status: %d", status); error(0, "Could not authenticate with server, status: %d", status);
free_packet(auth_pkt); free_packet(pkt);
return ZSM_STA_ERROR_AUTHENTICATE; return ZSM_STA_ERROR_AUTHENTICATE;
} }
free_packet(auth_pkt); if ((status = recv_packet(pkt, sockfd, ZSM_TYP_INFO)) != ZSM_STA_SUCCESS) {
status = recv_packet(auth_pkt, sockfd, ZSM_TYP_INFO); return status;
return (response.status == ZSM_STA_AUTHORISED ? ZSM_STA_SUCCESS : ZSM_STA_ERROR_AUTHENTICATE); };
status = pkt->status;
free_packet(pkt);
return (status == ZSM_STA_AUTHORISED ? ZSM_STA_SUCCESS : ZSM_STA_ERROR_AUTHENTICATE);
} }
/* /*