Skip to content

[pull] master from openssl:master #327

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

Merged
pull merged 1 commit into from
Jan 10, 2026
+73 −0
Merged

[pull] master from openssl:master #327

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
73 changes: 73 additions & 0 deletions fuzz/provider.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ static int read_uint(const uint8_t **buf, size_t *len, uint64_t **res)
}

*res = OPENSSL_malloc(sizeof(uint64_t));
if (*res == NULL) {
r = 0;
goto end;
}
**res = (uint64_t)**buf;

*buf += sizeof(uint64_t);
Expand All @@ -130,6 +134,10 @@ static int read_int(const uint8_t **buf, size_t *len, int64_t **res)
}

*res = OPENSSL_malloc(sizeof(int64_t));
if (*res == NULL) {
r = 0;
goto end;
}
**res = (int64_t)**buf;

*buf += sizeof(int64_t);
Expand All @@ -148,6 +156,10 @@ static int read_double(const uint8_t **buf, size_t *len, double **res)
}

*res = OPENSSL_malloc(sizeof(double));
if (*res == NULL) {
r = 0;
goto end;
}
**res = (double)**buf;

*buf += sizeof(double);
Expand Down Expand Up @@ -270,6 +282,8 @@ static OSSL_PARAM *fuzz_params(OSSL_PARAM *param, const uint8_t **buf, size_t *l
p_num++;

fuzzed_parameters = OPENSSL_calloc(p_num + 1, sizeof(OSSL_PARAM));
if (fuzzed_parameters == NULL)
return NULL;
p = fuzzed_parameters;

for (; param != NULL && param->key != NULL; param++) {
Expand All @@ -286,25 +300,54 @@ static OSSL_PARAM *fuzz_params(OSSL_PARAM *param, const uint8_t **buf, size_t *l

if (!read_int(buf, len, &use_param)) {
use_param = OPENSSL_malloc(sizeof(uint64_t));
if (use_param == NULL) {
OPENSSL_free(fuzzed_parameters);
return NULL;
}
*use_param = 0;
}

switch (param->data_type) {
case OSSL_PARAM_INTEGER:
if (strcmp(param->key, OSSL_KDF_PARAM_ITER) == 0) {
p_value_int = OPENSSL_malloc(sizeof(ITERS));
if (p_value_int == NULL) {
OPENSSL_free(fuzzed_parameters);
OPENSSL_free(use_param);
return NULL;
}
*p_value_int = ITERS;
} else if (strcmp(param->key, OSSL_KDF_PARAM_SCRYPT_N) == 0) {
p_value_int = OPENSSL_malloc(sizeof(ITERS));
if (p_value_int == NULL) {
OPENSSL_free(fuzzed_parameters);
OPENSSL_free(use_param);
return NULL;
}
*p_value_int = ITERS;
} else if (strcmp(param->key, OSSL_KDF_PARAM_SCRYPT_R) == 0) {
p_value_int = OPENSSL_malloc(sizeof(BLOCKSIZE));
if (p_value_int == NULL) {
OPENSSL_free(fuzzed_parameters);
OPENSSL_free(use_param);
return NULL;
}
*p_value_int = BLOCKSIZE;
} else if (strcmp(param->key, OSSL_KDF_PARAM_SCRYPT_P) == 0) {
p_value_int = OPENSSL_malloc(sizeof(BLOCKSIZE));
if (p_value_int == NULL) {
OPENSSL_free(fuzzed_parameters);
OPENSSL_free(use_param);
return NULL;
}
*p_value_int = BLOCKSIZE;
} else if (!*use_param || !read_int(buf, len, &p_value_int)) {
p_value_int = OPENSSL_malloc(sizeof(int64_t));
if (p_value_int == NULL) {
OPENSSL_free(fuzzed_parameters);
OPENSSL_free(use_param);
return NULL;
}
*p_value_int = 0;
}

Expand All @@ -315,18 +358,43 @@ static OSSL_PARAM *fuzz_params(OSSL_PARAM *param, const uint8_t **buf, size_t *l
case OSSL_PARAM_UNSIGNED_INTEGER:
if (strcmp(param->key, OSSL_KDF_PARAM_ITER) == 0) {
p_value_uint = OPENSSL_malloc(sizeof(UITERS));
if (p_value_uint == NULL) {
OPENSSL_free(fuzzed_parameters);
OPENSSL_free(use_param);
return NULL;
}
*p_value_uint = UITERS;
} else if (strcmp(param->key, OSSL_KDF_PARAM_SCRYPT_N) == 0) {
p_value_uint = OPENSSL_malloc(sizeof(UITERS));
if (p_value_uint == NULL) {
OPENSSL_free(fuzzed_parameters);
OPENSSL_free(use_param);
return NULL;
}
*p_value_uint = UITERS;
} else if (strcmp(param->key, OSSL_KDF_PARAM_SCRYPT_R) == 0) {
p_value_uint = OPENSSL_malloc(sizeof(UBLOCKSIZE));
if (p_value_uint == NULL) {
OPENSSL_free(fuzzed_parameters);
OPENSSL_free(use_param);
return NULL;
}
*p_value_uint = UBLOCKSIZE;
} else if (strcmp(param->key, OSSL_KDF_PARAM_SCRYPT_P) == 0) {
p_value_uint = OPENSSL_malloc(sizeof(UBLOCKSIZE));
if (p_value_uint == NULL) {
OPENSSL_free(fuzzed_parameters);
OPENSSL_free(use_param);
return NULL;
}
*p_value_uint = UBLOCKSIZE;
} else if (!*use_param || !read_uint(buf, len, &p_value_uint)) {
p_value_uint = OPENSSL_malloc(sizeof(uint64_t));
if (p_value_uint == NULL) {
OPENSSL_free(fuzzed_parameters);
OPENSSL_free(use_param);
return NULL;
}
*p_value_uint = 0;
}

Expand All @@ -337,6 +405,11 @@ static OSSL_PARAM *fuzz_params(OSSL_PARAM *param, const uint8_t **buf, size_t *l
case OSSL_PARAM_REAL:
if (!*use_param || !read_double(buf, len, &p_value_double)) {
p_value_double = OPENSSL_malloc(sizeof(double));
if (p_value_double == NULL) {
OPENSSL_free(fuzzed_parameters);
OPENSSL_free(use_param);
return NULL;
}
*p_value_double = 0;
}

Expand Down
Loading