Skip to content
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

length and null checks in en/decaps #364

Merged
merged 2 commits into from
Mar 4, 2024
Merged

length and null checks in en/decaps #364

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12843c2
length and null checks in en/decaps
bencemali Mar 2, 2024
aabc7df
more null checking
bencemali Mar 4, 2024
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
68 changes: 62 additions & 6 deletions oqsprov/oqs_kem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,42 @@ static int oqs_qs_kem_encaps_keyslot(void *vpkemctx, unsigned char *out,
OQS_KEM_PRINTF("OQS Warning: OQS_KEM not initialized\n");
return -1;
}
*outlen = kem_ctx->length_ciphertext;
*secretlen = kem_ctx->length_shared_secret;
if (pkemctx->kem->comp_pubkey == NULL
|| pkemctx->kem->comp_pubkey[keyslot] == NULL) {
OQS_KEM_PRINTF("OQS Warning: public key is NULL\n");
return -1;
}
if (out == NULL || secret == NULL) {
OQS_KEM_PRINTF3("KEM returning lengths %ld and %ld\n", *outlen,
*secretlen);
if (outlen != NULL) {
*outlen = kem_ctx->length_ciphertext;
}
if (secretlen != NULL) {
*secretlen = kem_ctx->length_shared_secret;
}
OQS_KEM_PRINTF3("KEM returning lengths %ld and %ld\n",
kem_ctx->length_ciphertext,
kem_ctx->length_shared_secret);
return 1;
}
if (outlen == NULL) {
OQS_KEM_PRINTF("OQS Warning: outlen is NULL\n");
return -1;
}
if (secretlen == NULL) {
OQS_KEM_PRINTF("OQS Warning: secretlen is NULL\n");
return -1;
}
if (*outlen < kem_ctx->length_ciphertext) {
OQS_KEM_PRINTF("OQS Warning: out buffer too small\n");
return -1;
}
if (*secretlen < kem_ctx->length_shared_secret) {
OQS_KEM_PRINTF("OQS Warning: secret buffer too small\n");
return -1;
}
*outlen = kem_ctx->length_ciphertext;
*secretlen = kem_ctx->length_shared_secret;

return OQS_SUCCESS
== OQS_KEM_encaps(kem_ctx, out, secret,
pkemctx->kem->comp_pubkey[keyslot]);
Expand All @@ -140,9 +169,36 @@ static int oqs_qs_kem_decaps_keyslot(void *vpkemctx, unsigned char *out,
OQS_KEM_PRINTF("OQS Warning: OQS_KEM not initialized\n");
return -1;
}
*outlen = kem_ctx->length_shared_secret;
if (out == NULL)
if (pkemctx->kem->comp_privkey == NULL
|| pkemctx->kem->comp_privkey[keyslot] == NULL) {
OQS_KEM_PRINTF("OQS Warning: private key is NULL\n");
return -1;
}
if (out == NULL) {
if (outlen != NULL) {
*outlen = kem_ctx->length_shared_secret;
}
OQS_KEM_PRINTF2("KEM returning length %ld\n",
kem_ctx->length_shared_secret);
return 1;
}
if (inlen != kem_ctx->length_ciphertext) {
OQS_KEM_PRINTF("OQS Warning: wrong input length\n");
return 0;
}
if (in == NULL) {
OQS_KEM_PRINTF("OQS Warning: in is NULL\n");
return -1;
}
if (outlen == NULL) {
OQS_KEM_PRINTF("OQS Warning: outlen is NULL\n");
return -1;
}
if (*outlen < kem_ctx->length_shared_secret) {
OQS_KEM_PRINTF("OQS Warning: out buffer too small\n");
return -1;
}
*outlen = kem_ctx->length_shared_secret;

return OQS_SUCCESS
== OQS_KEM_decaps(kem_ctx, out, in,
Expand Down
Loading