From 2343de140fa93f9e88dc444c93f675b5b28fe906 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Sun, 27 Jun 2021 11:46:03 +0200 Subject: [PATCH] src/file_kdbx.c: improve Frama-C annotations --- src/file_kdbx.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/file_kdbx.c b/src/file_kdbx.c index c3dd6d32..930c7f83 100644 --- a/src/file_kdbx.c +++ b/src/file_kdbx.c @@ -31,7 +31,7 @@ #include "types.h" #include "filegen.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_kdbx(file_stat_t *file_stat); const file_hint_t file_hint_kdbx= { @@ -44,14 +44,9 @@ const file_hint_t file_hint_kdbx= { }; /*@ - @ requires buffer_size > 0; - @ requires \valid_read(buffer+(0..buffer_size-1)); - @ requires valid_file_recovery(file_recovery); - @ requires \valid(file_recovery_new); - @ requires file_recovery_new->blocksize > 0; @ requires separation: \separated(&file_hint_kdbx, buffer+(..), file_recovery, file_recovery_new); - @ ensures \result == 0 || \result == 1; - @ ensures \result!=0 ==> valid_file_recovery(file_recovery_new); + @ requires valid_header_check_param(buffer, buffer_size, safe_header_only, file_recovery, file_recovery_new); + @ ensures valid_header_check_result(\result, file_recovery_new); @ assigns *file_recovery_new; @*/ static int header_check_kdbx(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new)