Skip to content

pkg_osvf: Add osv_type for VuXML compatibility #2699

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
bapt merged 2 commits into from
Jun 26, 2026
+47 −23
Merged

pkg_osvf: Add osv_type for VuXML compatibility #2699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c362739
pkg_osvf: Add osv_type for VuXML compatibility
illuusio Jun 11, 2026
10659af
tests: Update OSVf test
illuusio Jun 11, 2026
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
1 change: 1 addition & 0 deletions libpkg/pkg/audit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ extern "C" {
struct pkg_audit_version {
char *version;
int type;
int osv_type;
};

struct pkg_audit_versions_range {
Expand Down
57 changes: 38 additions & 19 deletions libpkg/pkg_osvf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,14 +886,14 @@ pkg_osvf_parse_events(struct pkg_audit_versions_range *range, const ucl_object_t
if(ucl_object_find_key(cur, "fixed"))
{
range->v2.version = xstrdup(pkg_osvf_ucl_string(cur, "fixed"));
printf("Fixed: %s\n", range->v2.version);
range->v2.type = OSVF_EVENT_FIXED;
range->v2.type = LTE;
range->v2.osv_type = OSVF_EVENT_FIXED;
}
else if(ucl_object_find_key(cur, "introduced"))
{
range->v1.version = xstrdup(pkg_osvf_ucl_string(cur, "introduced"));
printf("Intro: %s\n", range->v1.version);
range->v1.type = OSVF_EVENT_INTRODUCED;
range->v1.type = GTE;
range->v1.osv_type = OSVF_EVENT_INTRODUCED;
}
}
}
Expand Down Expand Up @@ -1130,23 +1130,42 @@ pkg_osvf_print_version(struct pkg_audit_version *version)
return;
}

switch(version->osv_type)
{
case OSVF_EVENT_UNKNOWN:
printf("\t\tUnknown type ");
break;
case OSVF_EVENT_INTRODUCED:
printf("\t\tIntroduced ");
break;
case OSVF_EVENT_FIXED:
printf("\t\tFixed ");
break;
case OSVF_EVENT_LAST_AFFECTED:
printf("\t\tAffected ");
break;
case OSVF_EVENT_LIMIT:
printf("\t\tLimit ");
break;
}

switch(version->type)
{
case OSVF_EVENT_UNKNOWN:
printf("\t\tUnknown type: ");
break;
case OSVF_EVENT_INTRODUCED:
printf("\t\tIntroduced: ");
break;
case OSVF_EVENT_FIXED:
printf("\t\tFixed: ");
break;
case OSVF_EVENT_LAST_AFFECTED:
printf("\t\tAffected: ");
break;
case OSVF_EVENT_LIMIT:
printf("\t\tLimit: ");
break;
case EQ:
printf("(=): ");
break;
case LT:
printf("(<) ");
break;
case LTE:
printf("(<=): ");
break;
case GT:
printf("(>): ");
break;
case GTE:
printf("(>=): ");
break;
}

printf("%s\n", version->version);
Expand Down
12 changes: 8 additions & 4 deletions tests/lib/pkg_osvf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,11 @@ ATF_TC_BODY(osvfparse, tc)
struct pkg_audit_versions_range *vers = &p->versions.d[vi];
ATF_CHECK_INTEQ(vers->type, version_types[otherpos++]);
ATF_CHECK_STREQ(vers->v2.version, version_strs[pos++]);
ATF_CHECK_INTEQ(vers->v2.type, OSVF_EVENT_FIXED);
ATF_CHECK_INTEQ(vers->v2.type, LTE);
ATF_CHECK_INTEQ(vers->v2.osv_type, OSVF_EVENT_FIXED);
ATF_CHECK_STREQ(vers->v1.version, version_strs[pos++]);
ATF_CHECK_INTEQ(vers->v1.type, OSVF_EVENT_INTRODUCED);
ATF_CHECK_INTEQ(vers->v1.type, GTE);
ATF_CHECK_INTEQ(vers->v1.osv_type, OSVF_EVENT_INTRODUCED);
}
}

Expand Down Expand Up @@ -268,9 +270,11 @@ ATF_TC_BODY(osvfparse, tc)
struct pkg_audit_versions_range *vers = &p->versions.d[vi];
ATF_CHECK_INTEQ(vers->type, version_types[otherpos++]);
ATF_CHECK_STREQ(vers->v2.version, version_strs[subpos++]);
ATF_CHECK_INTEQ(vers->v2.type, OSVF_EVENT_FIXED);
ATF_CHECK_INTEQ(vers->v2.type, LTE);
ATF_CHECK_INTEQ(vers->v2.osv_type, OSVF_EVENT_FIXED);
ATF_CHECK_STREQ(vers->v1.version, version_strs[subpos++]);
ATF_CHECK_INTEQ(vers->v1.type, OSVF_EVENT_INTRODUCED);
ATF_CHECK_INTEQ(vers->v1.type, GTE);
ATF_CHECK_INTEQ(vers->v1.osv_type, OSVF_EVENT_INTRODUCED);
}
}

Expand Down
Loading