From 21604647ce8c8fb10307ee7059d901e73d4c0947 Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Wed, 26 Oct 2016 10:07:44 +0800 Subject: [PATCH] refactored checking for correct key image file --- src/monero_headers.h | 1 + src/page.h | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/monero_headers.h b/src/monero_headers.h index 59be3b0..9d6f526 100644 --- a/src/monero_headers.h +++ b/src/monero_headers.h @@ -9,6 +9,7 @@ #define BLOCKCHAIN_DB DB_LMDB +#define KEY_IMAGE_EXPORT_FILE_MAGIC "Monero key image export\001" #define UNSIGNED_TX_PREFIX "Monero unsigned tx set\002" #define SIGNED_TX_PREFIX "Monero signed tx set\002" diff --git a/src/page.h b/src/page.h index bc6d5e3..7c60255 100644 --- a/src/page.h +++ b/src/page.h @@ -44,8 +44,6 @@ #define TMPL_MY_RAWKEYIMGS TMPL_DIR "/rawkeyimgs.html" #define TMPL_MY_CHECKRAWKEYIMGS TMPL_DIR "/checkrawkeyimgs.html" -#define KEY_IMAGE_EXPORT_FILE_MAGIC "Monero key image export\001" - namespace xmreg { @@ -2008,9 +2006,10 @@ namespace xmreg { const size_t magiclen = strlen(KEY_IMAGE_EXPORT_FILE_MAGIC); - if (strncmp(decoded_raw_data.c_str(), KEY_IMAGE_EXPORT_FILE_MAGIC, magiclen) == 0) + if (!strncmp(decoded_raw_data.c_str(), KEY_IMAGE_EXPORT_FILE_MAGIC, magiclen) == 0) { - cout << "KEY_IMAGE_EXPORT_FILE_MAGIC data given" << endl; + cout << "This does not seem to be key image export data" << endl; + return string {"This does not seem to be key image export data"}; } // header is magic + public spend and keys