Skip to content

Change MSEL_SVC_SESSION_SEND/RECV to MSEL_SVC_FFS_SESSION_SEND/RECV #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shrukul wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change MSEL_SVC_SESSION_SEND/RECV to MSEL_SVC_FFS_SESSION_SEND/RECV #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions software/applications/orp-bulkencryption/src/bulkencryption.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ void bulkencryption_task(void *arg, const size_t arg_sz) {

while (keepRunning) {
msel_memset(pkt, 0, sizeof(*pkt));
msel_svc(MSEL_SVC_SESSION_RECV, pkt);
msel_svc(MSEL_SVC_FFS_SESSION_RECV, pkt);

if (0 != pkt->session)
processPacket(state, pkt);
Expand Down Expand Up @@ -258,12 +258,12 @@ void processPacket(state_t *state, ffs_packet_t *pkt) {
msel_memset(pkt->data, 0, FFS_DATA_SIZE);
int err_err = BulkEncryptionResponse_serialize(pkt->data, FFS_DATA_SIZE, &err_pos, BER_ERROR);
if (!err_err) {
while (msel_svc(MSEL_SVC_SESSION_SEND, pkt) != MSEL_OK)
while (msel_svc(MSEL_SVC_FFS_SESSION_SEND, pkt) != MSEL_OK)
msel_svc(MSEL_SVC_YIELD, NULL);
}
}
else {
while (msel_svc(MSEL_SVC_SESSION_SEND, pkt) != MSEL_OK)
while (msel_svc(MSEL_SVC_FFS_SESSION_SEND, pkt) != MSEL_OK)
msel_svc(MSEL_SVC_YIELD, NULL);
}
}
Expand Down
6 changes: 3 additions & 3 deletions software/applications/orp-encryptor/src/encryptor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ void encryptor_init(encryptor_ctx_t *ctx, ffs_packet_t *pkt)
EncryptorResponse_serialize(pkt->data, FFS_DATA_SIZE, &pos, ER_UNSUPPORTED);
else EncryptorResponse_serialize(pkt->data, FFS_DATA_SIZE, &pos, ER_OK);

while (msel_svc(MSEL_SVC_SESSION_SEND, pkt) != MSEL_OK)
while (msel_svc(MSEL_SVC_FFS_SESSION_SEND, pkt) != MSEL_OK)
msel_svc(MSEL_SVC_YIELD, NULL);
}

Expand Down Expand Up @@ -152,7 +152,7 @@ void encryptor_exec(encryptor_ctx_t *ctx, ffs_packet_t *pkt)
if (err) EncryptorResponse_serialize(pkt->data, FFS_DATA_SIZE, &pos, ER_ERROR);
else EncryptorResponse_serialize(pkt->data, FFS_DATA_SIZE, &pos, ER_OK);

while (msel_svc(MSEL_SVC_SESSION_SEND, pkt) != MSEL_OK)
while (msel_svc(MSEL_SVC_FFS_SESSION_SEND, pkt) != MSEL_OK)
msel_svc(MSEL_SVC_YIELD, NULL);
}

Expand Down Expand Up @@ -182,7 +182,7 @@ void encryptor_task(void *arg, const size_t arg_sz) {
while (1)
{
msel_memset(pkt, 0, sizeof(*pkt));
msel_svc(MSEL_SVC_SESSION_RECV, pkt);
msel_svc(MSEL_SVC_FFS_SESSION_RECV, pkt);
if (pkt->session != 0)
{
switch (ctx->state)
Expand Down
22 changes: 11 additions & 11 deletions software/applications/orp-urchat/src/urchat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ int chat_process_login(chat_context_t *ctx, ffs_packet_t *pkt) {
ctx->state = CS_AWAITING_COMMANDS;

/* Send the response */
while (msel_svc(MSEL_SVC_SESSION_SEND, pkt) != MSEL_OK)
while (msel_svc(MSEL_SVC_FFS_SESSION_SEND, pkt) != MSEL_OK)
msel_svc(MSEL_SVC_YIELD, NULL);

cleanup:
Expand Down Expand Up @@ -255,7 +255,7 @@ int chat_process_logout(chat_context_t *ctx, ffs_packet_t *pkt, uint32_t *pos) {
ctx->state = CS_AWAITING_LOGIN;

/* Send the response */
while (msel_svc(MSEL_SVC_SESSION_SEND, pkt) != MSEL_OK)
while (msel_svc(MSEL_SVC_FFS_SESSION_SEND, pkt) != MSEL_OK)
msel_svc(MSEL_SVC_YIELD, NULL);

cleanup:
Expand Down Expand Up @@ -309,7 +309,7 @@ int chat_process_setseek(chat_context_t *ctx, ffs_packet_t *pkt, uint32_t *pos)
msel_memset(new_seeking, 0, sizeof(new_seeking));

/* Send the response */
while (msel_svc(MSEL_SVC_SESSION_SEND, pkt) != MSEL_OK)
while (msel_svc(MSEL_SVC_FFS_SESSION_SEND, pkt) != MSEL_OK)
msel_svc(MSEL_SVC_YIELD, NULL);

cleanup:
Expand Down Expand Up @@ -391,7 +391,7 @@ int chat_process_getseek(chat_context_t *ctx, ffs_packet_t *pkt, uint32_t *pos)
}

/* Send the response */
while (msel_svc(MSEL_SVC_SESSION_SEND, pkt) != MSEL_OK)
while (msel_svc(MSEL_SVC_FFS_SESSION_SEND, pkt) != MSEL_OK)
msel_svc(MSEL_SVC_YIELD, NULL);

cleanup:
Expand Down Expand Up @@ -486,7 +486,7 @@ int chat_process_getchannel(chat_context_t *ctx, ffs_packet_t *pkt, uint32_t *po
msel_memset(remote_signing_key, 0, ECC_POINT_LEN);

/* Send the response */
while (msel_svc(MSEL_SVC_SESSION_SEND, pkt) != MSEL_OK)
while (msel_svc(MSEL_SVC_FFS_SESSION_SEND, pkt) != MSEL_OK)
msel_svc(MSEL_SVC_YIELD, NULL);

cleanup:
Expand Down Expand Up @@ -530,7 +530,7 @@ int chat_process_closechannel(chat_context_t *ctx, ffs_packet_t *pkt, uint32_t *
}

/* Send the response */
while (msel_svc(MSEL_SVC_SESSION_SEND, pkt) != MSEL_OK)
while (msel_svc(MSEL_SVC_FFS_SESSION_SEND, pkt) != MSEL_OK)
msel_svc(MSEL_SVC_YIELD, NULL);

cleanup:
Expand Down Expand Up @@ -618,7 +618,7 @@ int chat_process_getexchange(chat_context_t *ctx, ffs_packet_t *pkt, uint32_t *p
}

/* Send the response */
while (msel_svc(MSEL_SVC_SESSION_SEND, pkt) != MSEL_OK)
while (msel_svc(MSEL_SVC_FFS_SESSION_SEND, pkt) != MSEL_OK)
msel_svc(MSEL_SVC_YIELD, NULL);


Expand Down Expand Up @@ -700,7 +700,7 @@ int chat_process_encrypt(chat_context_t *ctx, ffs_packet_t *pkt, uint32_t *pos)
sha256_hash(ctx->sessions[channel].send_iv, SHA256_OUTPUT_LEN, ctx->sessions[channel].send_iv);

/* Send the response */
while (msel_svc(MSEL_SVC_SESSION_SEND, pkt) != MSEL_OK)
while (msel_svc(MSEL_SVC_FFS_SESSION_SEND, pkt) != MSEL_OK)
msel_svc(MSEL_SVC_YIELD, NULL);

cleanup:
Expand Down Expand Up @@ -917,7 +917,7 @@ int chat_process_incoming(chat_context_t *ctx, ffs_packet_t *pkt, uint32_t *pos)
sha256_hash(ctx->sessions[channel].recv_iv, SHA256_OUTPUT_LEN, ctx->sessions[channel].recv_iv);
}
/* Send the response */
while (msel_svc(MSEL_SVC_SESSION_SEND, pkt) != MSEL_OK)
while (msel_svc(MSEL_SVC_FFS_SESSION_SEND, pkt) != MSEL_OK)
msel_svc(MSEL_SVC_YIELD, NULL);

cleanup:
Expand Down Expand Up @@ -965,7 +965,7 @@ void chat_process_command(chat_context_t *ctx, ffs_packet_t *pkt) {
uint32_t length = 0;
msel_memset(pkt->data, 0, FFS_DATA_SIZE);
if (!ChatResponse_serialize(pkt->data, FFS_DATA_SIZE, &length, CR_ERROR)) {
while (msel_svc(MSEL_SVC_SESSION_SEND, pkt) != MSEL_OK)
while (msel_svc(MSEL_SVC_FFS_SESSION_SEND, pkt) != MSEL_OK)
msel_svc(MSEL_SVC_YIELD, NULL);
}
}
Expand Down Expand Up @@ -999,7 +999,7 @@ void urchat_task(void *arg, const size_t arg_sz) {

while (CS_SHOULD_EXIT != ctx->state) {
msel_memset(pkt, 0, sizeof(*pkt));
msel_svc(MSEL_SVC_SESSION_RECV, pkt);
msel_svc(MSEL_SVC_FFS_SESSION_RECV, pkt);
if (0 != pkt->session) {
switch (ctx->state) {
case CS_AWAITING_LOGIN:
Expand Down
6 changes: 3 additions & 3 deletions software/applications/orp-xts-encryptor/src/xts-encryptor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ void xts_encryptor_init(xts_encryptor_ctx_t *ctx, ffs_packet_t *pkt)
XtsResponse_serialize(pkt->data, FFS_DATA_SIZE, &pos, XTS_UNSUPPORTED);
else XtsResponse_serialize(pkt->data, FFS_DATA_SIZE, &pos, XTS_OK);

while (msel_svc(MSEL_SVC_SESSION_SEND, pkt) != MSEL_OK)
while (msel_svc(MSEL_SVC_FFS_SESSION_SEND, pkt) != MSEL_OK)
msel_svc(MSEL_SVC_YIELD, NULL);
}

Expand Down Expand Up @@ -165,7 +165,7 @@ void xts_encryptor_exec(xts_encryptor_ctx_t *ctx, ffs_packet_t *pkt)
// Now we've formed the header for the outgoing packet, so copy in the data
msel_memcpy(pkt->data + pos, ctx->output, ctx->block_size);

while (msel_svc(MSEL_SVC_SESSION_SEND, pkt) != MSEL_OK)
while (msel_svc(MSEL_SVC_FFS_SESSION_SEND, pkt) != MSEL_OK)
msel_svc(MSEL_SVC_YIELD, NULL);
}

Expand Down Expand Up @@ -195,7 +195,7 @@ void xts_encryptor_task(void *arg, const size_t arg_sz) {
while (1)
{
msel_memset(pkt, 0, sizeof(*pkt));
msel_svc(MSEL_SVC_SESSION_RECV, pkt);
msel_svc(MSEL_SVC_FFS_SESSION_RECV, pkt);
if (pkt->session != 0)
{
switch (ctx->state)
Expand Down