Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev

lib/nfc/SConscript

@@ -50,6 +50,7 @@ env.Append(
         File("helpers/iso14443_crc.h"),
         File("helpers/iso13239_crc.h"),
         File("helpers/nfc_data_generator.h"),
+        File("helpers/crypto1.h"),
     ],
 )
 

lib/nfc/protocols/mf_classic/mf_classic_listener_i.h

@@ -3,7 +3,7 @@
 #include "mf_classic_listener.h"
 #include <lib/nfc/protocols/iso14443_3a/iso14443_3a_listener_i.h>
 #include <nfc/protocols/nfc_generic_event.h>
-#include "crypto1.h"
+#include <nfc/helpers/crypto1.h>
 
 #ifdef __cplusplus
 extern "C" {

lib/nfc/protocols/mf_classic/mf_classic_poller_i.h

@@ -3,7 +3,7 @@
 #include "mf_classic_poller.h"
 #include <lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_i.h>
 #include <bit_lib/bit_lib.h>
-#include "crypto1.h"
+#include <nfc/helpers/crypto1.h>
 
 #ifdef __cplusplus
 extern "C" {