cxng compatibility

Makefile

@@ -114,6 +114,14 @@ DEFINES   += APPVERSION=\"$(APPVERSION)\"
 
 DEFINES   += HAVE_USB_CLASS_CCID
 
+# RSA addition.
+DEFINES       += HAVE_RSA
+INCLUDES_PATH += $(BOLOS_SDK)/lib_cxng/src
+SOURCE_PATH   += $(BOLOS_SDK)/lib_cxng/src/cx_rsa.c
+SOURCE_PATH   += $(BOLOS_SDK)/lib_cxng/src/cx_pkcs1.c
+SOURCE_PATH   += $(BOLOS_SDK)/lib_cxng/src/cx_utils.c
+# RSA - End
+
 
 ifeq ($(TARGET_NAME),TARGET_NANOX)
 # DEFINES       += HAVE_BLE BLE_COMMAND_TIMEOUT_MS=2000
@@ -214,8 +222,8 @@ delete:
 
 
 # import generic rules from the user and SDK
--include Makefile.rules
-#include $(BOLOS_SDK)/Makefile.rules
+#-include Makefile.rules
+include $(BOLOS_SDK)/Makefile.rules
 
 #add dependency on custom makefile filename
 dep/%.d: %.c Makefile

src/gpg_ram.c

@@ -36,3 +36,7 @@ int                  apdu_n;
 #endif
 
 gpg_v_state_t G_gpg_vstate;
+
+#ifdef HAVE_RSA
+union cx_u G_cx;
+#endif // HAVE_RSA

src/gpg_types.h

@@ -17,9 +17,7 @@
 #define GPG_TYPES_H
 
 #include "os_io_seproxyhal.h"
-#ifdef TARGET_NANOX
 #include "ux.h"
-#endif
 
 /* cannot send more that F0 bytes in CCID, why? do not know for now
  *  So set up length to F0 minus 2 bytes for SW

src/gpg_vars.h

@@ -18,6 +18,7 @@
 
 #include "os.h"
 #include "cx.h"
+#include "ux.h"
 #include "os_io_seproxyhal.h"
 #include "gpg_types.h"
 #include "gpg_api.h"
@@ -46,4 +47,9 @@ extern int apdu_n;
 #endif
 
 extern ux_state_t ux;
+
+#ifdef HAVE_RSA
+#include "cx_ram.h"
+extern union cx_u G_cx;
+#endif // HAVE_RSA
 #endif