From 45dc110c6b923a8d9c4e79ab7667a13726c50699 Mon Sep 17 00:00:00 2001
From: Martin Szulecki
Date: Tue, 17 Jul 2012 16:52:33 +0200
Subject: mbn: Correctly calculate offset for signature

---
 src/mbn.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/mbn.c')

diff --git a/src/mbn.c b/src/mbn.c
index 0e76425..b6bce0b 100644
--- a/src/mbn.c
+++ b/src/mbn.c
@@ -37,7 +37,6 @@ mbn_file* mbn_parse(unsigned char* data, unsigned int size)
 	/* FIXME: header parsing is not big endian safe */
 	memcpy(&mbn->header, data, sizeof(mbn_header));
 	mbn->parsed_size = mbn->header.data_size + sizeof(mbn_header);
-	mbn->parsed_sig_offset = mbn->header.sig_offset - (mbn->header.data_size & 0xFF);
 	if (mbn->parsed_size != mbn->size) {
 		printf("size mismatch?!\n");
 	}
@@ -56,15 +55,11 @@ void mbn_free(mbn_file* mbn)
 
 int mbn_update_sig_blob(mbn_file* mbn, const unsigned char* sigdata, unsigned int siglen)
 {
+	mbn->parsed_sig_offset = mbn->parsed_size - siglen;
 	if (!mbn) {
 		error("ERROR: %s: no data\n", __func__);
 		return -1;
 	}
-	if (!mbn->parsed_sig_offset || (mbn->parsed_sig_offset >= mbn->parsed_size)) {
-		error("ERROR: %s: invalid signature offset in mbn header\n", __func__);
-		return -1;
-	}
-
 	if ((mbn->parsed_sig_offset + siglen) > mbn->parsed_size) {
 		error("ERROR: %s: signature is larger than mbn file size\n", __func__);
 		return -1;
-- 
cgit v1.1-32-gdbae