From 382129205f01c63408923cb7d4f71a194d0a1e02 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 30 Aug 2019 02:10:55 +0200
Subject: [PATCH] move capk.txt to resources/

---
 client/emv/emv_pk.c                | 15 ++++++++-------
 client/{emv => resources}/capk.txt |  0
 2 files changed, 8 insertions(+), 7 deletions(-)
 rename client/{emv => resources}/capk.txt (100%)

diff --git a/client/emv/emv_pk.c b/client/emv/emv_pk.c
index e273480c8..bb124c63c 100644
--- a/client/emv/emv_pk.c
+++ b/client/emv/emv_pk.c
@@ -29,6 +29,8 @@
 #include "ui.h"
 #include "crypto.h"
 #include "proxmark3.h"
+#include "fileutils.h"
+#include "pm3_cmd.h"
 
 #define BCD(c) (((c) >= '0' && (c) <= '9') ? ((c) - '0') : \
                 -1)
@@ -483,13 +485,12 @@ struct emv_pk *emv_pk_get_ca_pk(const unsigned char *rid, unsigned char idx) {
             }
         }
     */
-    const char *relfname = "emv/capk.txt";
-
-    char fname[strlen(get_my_executable_directory()) + strlen(relfname) + 1];
-    strcpy(fname, get_my_executable_directory());
-    strcat(fname, relfname);
-
-    pk = emv_pk_get_ca_pk_from_file(fname, rid, idx);
+    char *path;
+    if (searchFile(&path, RESOURCES_SUBDIR, "capk", ".txt") != PM3_SUCCESS) {
+        return NULL;
+    }
+    pk = emv_pk_get_ca_pk_from_file(path, rid, idx);
+    free(path);
 
     if (!pk)
         return NULL;
diff --git a/client/emv/capk.txt b/client/resources/capk.txt
similarity index 100%
rename from client/emv/capk.txt
rename to client/resources/capk.txt