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

Protecting from NULL parameters #350

Merged
merged 4 commits into from
Feb 12, 2024
Merged

Protecting from NULL parameters #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39f299d
guard against possible NULL parameters passed
baentsch Feb 9, 2024
aea03b2
fix clang-formatting
baentsch Feb 9, 2024
26b3aae
fix SECURITY status [skip ci]
baentsch Feb 9, 2024
ea15c7b
correct param check
baentsch Feb 9, 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
4 changes: 3 additions & 1 deletion SECURITY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ We only support the most recent release.

| Version | Supported |
| ------- | ------------------ |
| 0.5.1 | :white_check_mark: |
| 0.5.3 | :white_check_mark: |
| 0.5.2 | :x: |
| 0.5.1 | :x: |
| < 0.5 | :x: |

## Reporting a Vulnerability
Expand Down
22 changes: 18 additions & 4 deletions oqsprov/oqs_kmgmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,11 @@ static int oqsx_match(const void *keydata1, const void *keydata2, int selection)
keydata2);
OQS_KM_PRINTF2("OQSKEYMGMT: match called for selection %d\n", selection);

if (key1 == NULL || key2 == NULL) {
ERR_raise(ERR_LIB_USER, OQSPROV_R_WRONG_PARAMETERS);
return 0;
}

#ifdef NOPUBKEY_IN_PRIVKEY
/* Now this is a "leap of faith" logic: If a public-only PKEY and a
* private-only PKEY are tested for equality we cannot do anything other
Expand Down Expand Up @@ -278,8 +283,8 @@ static int oqsx_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
* In this implementation, only public and private keys can be exported,
* nothing else
*/
if (key == NULL) {
ERR_raise(ERR_LIB_USER, OQSPROV_UNEXPECTED_NULL);
if (key == NULL || param_cb == NULL) {
ERR_raise(ERR_LIB_USER, OQSPROV_R_WRONG_PARAMETERS);
return 0;
}

Expand Down Expand Up @@ -328,6 +333,11 @@ static int oqsx_get_params(void *key, OSSL_PARAM params[])
OQSX_KEY *oqsxk = key;
OSSL_PARAM *p;

if (oqsxk == NULL || params == NULL) {
ERR_raise(ERR_LIB_USER, OQSPROV_R_WRONG_PARAMETERS);
return 0;
}

OQS_KM_PRINTF2("OQSKEYMGMT: get_params called for %s\n", params[0].key);
if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_BITS)) != NULL
&& !OSSL_PARAM_set_int(p, oqsx_key_secbits(oqsxk)))
Expand Down Expand Up @@ -413,6 +423,10 @@ static int oqsx_set_params(void *key, const OSSL_PARAM params[])
const OSSL_PARAM *p;

OQS_KM_PRINTF("OQSKEYMGMT: set_params called\n");
if (oqsxkey == NULL) {
ERR_raise(ERR_LIB_USER, OQSPROV_R_WRONG_PARAMETERS);
return 0;
}
p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY);
if (p != NULL) {
size_t used_len;
Expand Down Expand Up @@ -485,10 +499,10 @@ static void *oqsx_genkey(struct oqsx_gen_ctx *gctx)
{
OQSX_KEY *key;

OQS_KM_PRINTF3("OQSKEYMGMT: gen called for %s (%s)\n", gctx->oqs_name,
gctx->tls_name);
if (gctx == NULL)
return NULL;
OQS_KM_PRINTF3("OQSKEYMGMT: gen called for %s (%s)\n", gctx->oqs_name,
gctx->tls_name);
if ((key = oqsx_key_new(gctx->libctx, gctx->oqs_name, gctx->tls_name,
gctx->primitive, gctx->propq, gctx->bit_security,
gctx->alg_idx))
Expand Down
3 changes: 2 additions & 1 deletion oqsprov/oqs_prov.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ typedef struct prov_oqs_ctx_st {
PROV_OQS_CTX *oqsx_newprovctx(OSSL_LIB_CTX *libctx,
const OSSL_CORE_HANDLE *handle, BIO_METHOD *bm);
void oqsx_freeprovctx(PROV_OQS_CTX *ctx);
#define PROV_OQS_LIBCTX_OF(provctx) (((PROV_OQS_CTX *)provctx)->libctx)
#define PROV_OQS_LIBCTX_OF(provctx) \
provctx ? (((PROV_OQS_CTX *)provctx)->libctx) : NULL

#include "oqs/oqs.h"
#ifdef USE_ENCODING_LIB
Expand Down
Loading