Move boot_is_version_sufficient to module scope
The checking of image version compatibility is only used by dependencies
code; this moves the version checking function static, and removes it
from the exported API.
Signed-off-by: Fabio Utzig <utzig@apache.org>
diff --git a/boot/bootutil/src/bootutil_misc.c b/boot/bootutil/src/bootutil_misc.c
index 1b26636..630cfa7 100644
--- a/boot/bootutil/src/bootutil_misc.c
+++ b/boot/bootutil/src/bootutil_misc.c
@@ -721,37 +721,3 @@
return rc;
}
-#if (BOOT_IMAGE_NUMBER > 1)
-/**
- * Check if the version of the image is not older than required.
- *
- * @param req Required minimal image version.
- * @param ver Version of the image to be checked.
- *
- * @return 0 if the version is sufficient, nonzero otherwise.
- */
-int
-boot_is_version_sufficient(struct image_version *req,
- struct image_version *ver)
-{
- if (ver->iv_major > req->iv_major) {
- return 0;
- }
- if (ver->iv_major < req->iv_major) {
- return BOOT_EBADVERSION;
- }
- /* The major version numbers are equal. */
- if (ver->iv_minor > req->iv_minor) {
- return 0;
- }
- if (ver->iv_minor < req->iv_minor) {
- return BOOT_EBADVERSION;
- }
- /* The minor version numbers are equal. */
- if (ver->iv_revision < req->iv_revision) {
- return BOOT_EBADVERSION;
- }
-
- return 0;
-}
-#endif /* BOOT_IMAGE_NUMBER > 1 */
diff --git a/boot/bootutil/src/bootutil_priv.h b/boot/bootutil/src/bootutil_priv.h
index bbecc99..4e5d2aa 100644
--- a/boot/bootutil/src/bootutil_priv.h
+++ b/boot/bootutil/src/bootutil_priv.h
@@ -251,10 +251,6 @@
const uint8_t *enckey);
int boot_read_enc_key(int image_index, uint8_t slot, uint8_t *enckey);
#endif
-#if (BOOT_IMAGE_NUMBER > 1)
-int boot_is_version_sufficient(struct image_version *req,
- struct image_version *ver);
-#endif
int boot_find_tlv_offs(const struct image_header *hdr,
const struct flash_area *fap,
uint32_t *off, uint32_t *end);
diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
index 1166907..d95fdae 100644
--- a/boot/bootutil/src/loader.c
+++ b/boot/bootutil/src/loader.c
@@ -1784,6 +1784,39 @@
#if (BOOT_IMAGE_NUMBER > 1)
/**
+ * Check if the version of the image is not older than required.
+ *
+ * @param req Required minimal image version.
+ * @param ver Version of the image to be checked.
+ *
+ * @return 0 if the version is sufficient, nonzero otherwise.
+ */
+static int
+boot_is_version_sufficient(struct image_version *req,
+ struct image_version *ver)
+{
+ if (ver->iv_major > req->iv_major) {
+ return 0;
+ }
+ if (ver->iv_major < req->iv_major) {
+ return BOOT_EBADVERSION;
+ }
+ /* The major version numbers are equal. */
+ if (ver->iv_minor > req->iv_minor) {
+ return 0;
+ }
+ if (ver->iv_minor < req->iv_minor) {
+ return BOOT_EBADVERSION;
+ }
+ /* The minor version numbers are equal. */
+ if (ver->iv_revision < req->iv_revision) {
+ return BOOT_EBADVERSION;
+ }
+
+ return 0;
+}
+
+/**
* Check the image dependency whether it is satisfied and modify
* the swap type if necessary.
*