Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions lib/src/sv_authenticity.c
Original file line number Diff line number Diff line change
Expand Up @@ -464,9 +464,8 @@ transfer_onvif_latest(signed_video_latest_validation_t *latest,
break;
}
latest->has_timestamp = true;
latest->start_timestamp = convert_1601_to_unix_us(onvif_latest->timestamp);
// ONVIF Media Signing currently only has one timestamp.
latest->end_timestamp = latest->start_timestamp;
latest->start_timestamp = convert_1601_to_unix_us(onvif_latest->start_timestamp);
latest->end_timestamp = convert_1601_to_unix_us(onvif_latest->end_timestamp);
}

static void
Expand Down
2 changes: 1 addition & 1 deletion lib/src/sv_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
#define DEFAULT_HASH_SIZE (256 / 8)

#define SV_VERSION_BYTES 3
#define SIGNED_VIDEO_VERSION "v2.3.1"
#define SIGNED_VIDEO_VERSION "v2.3.2"
#define SV_VERSION_MAX_STRLEN 19 // Longest possible string including 'ONVIF' prefix

#define DEFAULT_AUTHENTICITY_LEVEL SV_AUTHENTICITY_LEVEL_FRAME
Expand Down
3 changes: 2 additions & 1 deletion lib/src/sv_onvif.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ typedef struct {
int number_of_pending_hashable_nalus;
char *validation_str;
char *nalu_str;
int64_t timestamp;
int64_t start_timestamp;
int64_t end_timestamp;
} onvif_media_signing_latest_validation_t;
// Defines onvif_media_signing_accumulated_validation_t
typedef struct {
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('signed-video-framework', 'c',
version : '2.3.1',
version : '2.3.2',
meson_version : '>= 0.53.0',
default_options : [ 'warning_level=2',
'werror=true',
Expand Down
4 changes: 2 additions & 2 deletions tests/check/test_helpers.c
Original file line number Diff line number Diff line change
Expand Up @@ -680,8 +680,8 @@ validate_stream(signed_video_t *sv,
public_key_has_changed |= latest->public_key_has_changed;

if (latest->has_timestamp) {
if (sv->onvif || sv->legacy_sv) {
// Media Signing and Legacy code only have one timestamp
if (sv->legacy_sv) {
// Legacy code only have one timestamp
ck_assert_int_eq(latest->start_timestamp, latest->end_timestamp);
} else {
if (has_timestamp) {
Expand Down
Loading