Skip to content

Commit 6cb2697

Browse files
authored
Enables remaining signed multiple gops tests (#471)
The function verify_hashes_without_sei has been updated to handle unsigned SEIs.
1 parent c195ef5 commit 6cb2697

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

lib/src/sv_auth.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -641,15 +641,15 @@ verify_hashes_without_sei(signed_video_t *self, int num_skips)
641641
bu_list_item_t *item = bu_list->first_item;
642642
while (item) {
643643
// Skip non-pending items
644-
if (item->tmp_validation_status != 'P') {
644+
if (item->tmp_validation_status != 'P' || item->associated_sei) {
645645
item = item->next;
646646
continue;
647647
}
648648

649649
bu_info_t *bu_info = item->bu;
650650
// Only (added) items marked as 'missing' ('M') have no |bu_info|.
651651
assert(bu_info);
652-
if (bu_info->is_sv_sei) {
652+
if (bu_info->is_sv_sei && bu_info->is_signed) {
653653
// Skip counting signed SEIs since they are verified by its signature.
654654
item = item->next;
655655
continue;
@@ -685,13 +685,13 @@ verify_hashes_without_sei(signed_video_t *self, int num_skips)
685685
item = bu_list->first_item;
686686
while (item && (num_marked_items < max_marked_items)) {
687687
// Skip non-pending items and items already associated with a SEI.
688-
if (item->tmp_validation_status != 'P') {
688+
if (item->tmp_validation_status != 'P' || item->associated_sei) {
689689
item = item->next;
690690
continue;
691691
}
692692

693693
bu_info_t *bu_info = item->bu;
694-
if (bu_info->is_sv_sei) {
694+
if (bu_info->is_sv_sei && bu_info->is_signed) {
695695
// Skip marking signed SEIs since they are verified by its signature.
696696
item = item->next;
697697
continue;

tests/check/check_signed_video_auth.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3038,8 +3038,6 @@ END_TEST
30383038

30393039
START_TEST(modify_one_i_frame_multiple_gops)
30403040
{
3041-
// Enable when validation can be made without dead lock.
3042-
return;
30433041
// Device side
30443042
struct sv_setting setting = settings[_i];
30453043
const unsigned signing_frequency = 3;
@@ -3075,8 +3073,6 @@ END_TEST
30753073

30763074
START_TEST(remove_one_i_frame_multiple_gops)
30773075
{
3078-
// Enable when validation can be made without dead lock.
3079-
return;
30803076
// Device side
30813077
struct sv_setting setting = settings[_i];
30823078
const unsigned signing_frequency = 3;
@@ -3116,8 +3112,6 @@ END_TEST
31163112

31173113
START_TEST(modify_sei_frames_multiple_gops)
31183114
{
3119-
// Enable when validation can be made without dead lock.
3120-
return;
31213115
// Device side
31223116
struct sv_setting setting = settings[_i];
31233117
const unsigned signing_frequency = 3;
@@ -3166,8 +3160,6 @@ END_TEST
31663160

31673161
START_TEST(remove_sei_frames_multiple_gops)
31683162
{
3169-
// Enable when validation can be made without dead lock.
3170-
return;
31713163
// Device side
31723164
struct sv_setting setting = settings[_i];
31733165
const unsigned signing_frequency = 3;

0 commit comments

Comments
 (0)