In more recent firmware images built by op-build the VERSION partition
is signed, and includes a 'secure header'. Check for this and skip it if
found so we parse the version strings properly.
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
#include <libflash/file.h>
#include <libflash/ecc.h>
#include <libflash/file.h>
#include <libflash/ecc.h>
+#define SECURE_BOOT_HEADERS_SIZE 4096
+#define ROM_MAGIC_NUMBER 0x17082011
struct flash_info {
/* Device information */
struct flash_info {
/* Device information */
+/* See stb_is_container() in Skiboot */
+static bool is_signed(char *buffer, uint32_t len)
+{
+ if (!buffer || len <= SECURE_BOOT_HEADERS_SIZE)
+ return false;
+ if (be32_to_cpu(*(uint32_t *)buffer) != ROM_MAGIC_NUMBER)
+ return false;
+ return true;
+}
+
int flash_parse_version(void *ctx, char ***versions, bool current)
{
char *saveptr, *tok, **tmp, *buffer;
int flash_parse_version(void *ctx, char ***versions, bool current)
{
char *saveptr, *tok, **tmp, *buffer;
+ /* Check if this partition is signed */
+ if (is_signed(buffer, len))
+ buffer += SECURE_BOOT_HEADERS_SIZE;
+
/* open-power-platform */
tok = strtok_r(buffer, delim, &saveptr);
if (tok) {
/* open-power-platform */
tok = strtok_r(buffer, delim, &saveptr);
if (tok) {