refactoring. rename Applet to Application. Done. Tests passed.

solokeys · Jun 10, 2020 · 0f67bfb · 0f67bfb
1 parent 3d20164
commit 0f67bfb
Show file tree

Hide file tree

Showing 19 changed files with 37 additions and 37 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ OBJ_DIR := ./obj
 SRC_DIRS := ./pc \
 			./src \
 			./src/applets \
-            ./src/applets/openpgp \
+            ./src/applications/openpgp \
             ./libs/stm32fs
 SRC_FILES := $(sort $(foreach var, $(SRC_DIRS), $(wildcard $(var)/*.cpp)))
 OBJ_FILES := $(patsubst %.cpp, $(OBJ_DIR)/%.o, $(notdir $(SRC_FILES)))

diff --git a/pc/main.cpp b/pc/main.cpp
@@ -15,7 +15,7 @@
 
 #include "solofactory.h"
 #include "opgputil.h"
-#include "applets/apduconst.h"
+#include "applications/apduconst.h"
 #include "ccid.h"
 
 #define USBIP_MODE

diff --git a/src/apduexecutor.cpp b/src/apduexecutor.cpp
@@ -9,8 +9,8 @@
 
 #include "apduexecutor.h"
 #include "opgpdevice.h"
-#include "applets/apduconst.h"
-#include "applets/application.h"
+#include "applications/apduconst.h"
+#include "applications/application.h"
 #include "solofactory.h"
 
 namespace Application {

diff --git a/src/apduexecutor.h b/src/apduexecutor.h
@@ -14,8 +14,8 @@
 #include <cstdlib>
 #include "opgputil.h"
 #include "errors.h"
-#include "applets/applicationstorage.h"
-#include "applets/apduconst.h"
+#include "applications/applicationstorage.h"
+#include "applications/apduconst.h"
 
 namespace Application {
 

diff --git a/src/applications/openpgp/cryptoapdu.cpp b/src/applications/openpgp/cryptoapdu.cpp
@@ -7,16 +7,16 @@
   copied, modified, or distributed except according to those terms.
  */
 
-#include <applets/openpgp/security.h>
+#include <applications/openpgp/security.h>
 #include "cryptoapdu.h"
 #include "tlv.h"
 #include "opgpdevice.h"
-#include "applets/apduconst.h"
+#include "applications/apduconst.h"
 #include "solofactory.h"
-#include "applets/openpgp/openpgpfactory.h"
-#include "applets/openpgpapplication.h"
-#include "applets/openpgp/openpgpconst.h"
-#include "applets/openpgp/openpgpstruct.h"
+#include "applications/openpgp/openpgpfactory.h"
+#include "applications/openpgpapplication.h"
+#include "applications/openpgp/openpgpconst.h"
+#include "applications/openpgp/openpgpstruct.h"
 
 namespace OpenPGP {
 

diff --git a/src/applications/openpgp/cryptoapdu.h b/src/applications/openpgp/cryptoapdu.h
@@ -13,7 +13,7 @@
 
 #include <string_view>
 #include "errors.h"
-#include "applets/apducommand.h"
+#include "applications/apducommand.h"
 
 namespace OpenPGP {
 

diff --git a/src/applications/openpgp/openpgpfactory.cpp b/src/applications/openpgp/openpgpfactory.cpp
@@ -7,7 +7,7 @@
  copied, modified, or distributed except according to those terms.
  */
 
-#include <applets/openpgp/openpgpfactory.h>
+#include <applications/openpgp/openpgpfactory.h>
 #include "solofactory.h"
 
 namespace OpenPGP {

diff --git a/src/applications/openpgp/openpgpfactory.h b/src/applications/openpgp/openpgpfactory.h
@@ -10,10 +10,10 @@
 #ifndef SRC_OPENPGP_OPENPGPFACTORY_H_
 #define SRC_OPENPGP_OPENPGPFACTORY_H_
 
-#include <applets/openpgp/security.h>
+#include <applications/openpgp/security.h>
 #include <array>
 
-#include "applets/apducommand.h"
+#include "applications/apducommand.h"
 #include "resetprovider.h"
 #include "userapdu.h"
 #include "cryptoapdu.h"

diff --git a/src/applications/openpgp/secureapdu.cpp b/src/applications/openpgp/secureapdu.cpp
@@ -9,13 +9,13 @@
 
 #include "secureapdu.h"
 
-#include <applets/openpgp/security.h>
-#include "applets/apduconst.h"
+#include <applications/openpgp/security.h>
+#include "applications/apduconst.h"
 #include "solofactory.h"
-#include "applets/openpgp/openpgpfactory.h"
-#include "applets/openpgpapplication.h"
-#include "applets/openpgp/openpgpconst.h"
-#include "applets/openpgp/openpgpstruct.h"
+#include "applications/openpgp/openpgpfactory.h"
+#include "applications/openpgpapplication.h"
+#include "applications/openpgp/openpgpconst.h"
+#include "applications/openpgp/openpgpstruct.h"
 #include "opgpdevice.h"
 
 namespace OpenPGP {

diff --git a/src/applications/openpgp/secureapdu.h b/src/applications/openpgp/secureapdu.h
@@ -13,7 +13,7 @@
 
 #include <string_view>
 #include "errors.h"
-#include "applets/apducommand.h"
+#include "applications/apducommand.h"
 
 namespace OpenPGP {
 

diff --git a/src/applications/openpgp/security.cpp b/src/applications/openpgp/security.cpp
@@ -7,11 +7,11 @@
  copied, modified, or distributed except according to those terms.
  */
 
-#include <applets/openpgp/security.h>
+#include <applications/openpgp/security.h>
 #include <array>
 
 #include "errors.h"
-#include "applets/apduconst.h"
+#include "applications/apduconst.h"
 #include "solofactory.h"
 
 namespace OpenPGP {

diff --git a/src/applications/openpgp/userapdu.cpp b/src/applications/openpgp/userapdu.cpp
@@ -7,13 +7,13 @@
   copied, modified, or distributed except according to those terms.
  */
 
-#include <applets/openpgp/security.h>
+#include <applications/openpgp/security.h>
 #include "opgpdevice.h"
 #include "userapdu.h"
-#include "applets/apduconst.h"
+#include "applications/apduconst.h"
 #include "solofactory.h"
-#include "applets/openpgp/openpgpfactory.h"
-#include "applets/openpgpapplication.h"
+#include "applications/openpgp/openpgpfactory.h"
+#include "applications/openpgpapplication.h"
 #include "openpgpconst.h"
 #include "openpgpstruct.h"
 #include "filesystem.h"

diff --git a/src/applications/openpgp/userapdu.h b/src/applications/openpgp/userapdu.h
@@ -13,7 +13,7 @@
 
 #include <string_view>
 #include "errors.h"
-#include "applets/apducommand.h"
+#include "applications/apducommand.h"
 
 namespace OpenPGP {
 

diff --git a/src/applications/openpgpapplication.cpp b/src/applications/openpgpapplication.cpp
@@ -7,7 +7,7 @@
   copied, modified, or distributed except according to those terms.
  */
 
-#include <applets/openpgp/security.h>
+#include <applications/openpgp/security.h>
 #include "opgpdevice.h"
 #include "openpgpapplication.h"
 #include "apduconst.h"

diff --git a/src/cryptolib.cpp b/src/cryptolib.cpp
@@ -17,7 +17,7 @@
 #include "tlv.h"
 #include "solofactory.h"
 #include "filesystem.h"
-#include "applets/openpgp/openpgpconst.h"
+#include "applications/openpgp/openpgpconst.h"
 
 #include "i15_addon.h"
 

diff --git a/src/filesystem.cpp b/src/filesystem.cpp
@@ -11,7 +11,7 @@
 #include <array>
 #include "opgpdevice.h"
 #include "tlv.h"
-#include "applets/openpgp/openpgpconst.h"
+#include "applications/openpgp/openpgpconst.h"
 
 namespace File {
 

diff --git a/src/solofactory.h b/src/solofactory.h
@@ -13,8 +13,8 @@
 
 #include "cryptolib.h"
 #include "apduexecutor.h"
-#include "applets/applicationstorage.h"
-#include "applets/openpgp/openpgpfactory.h"
+#include "applications/applicationstorage.h"
+#include "applications/openpgp/openpgpfactory.h"
 #include "filesystem.h"
 
 namespace Factory {

diff --git a/stm32l432/Makefile.lib b/stm32l432/Makefile.lib
@@ -8,7 +8,7 @@ OBJ_DIR := ./obj
 SRC_DIRS := ./pc \
 			./src \
 			./src/applets \
-            ./src/applets/openpgp \
+            ./src/applications/openpgp \
             ./libs/stm32fs
 SRC_FILES := $(sort $(foreach var, $(SRC_DIRS), $(wildcard $(var)/*.cpp)))
 OBJ_FILES := $(patsubst %.cpp, $(OBJ_DIR)/%.o, $(notdir $(SRC_FILES)))

diff --git a/stm32l432/openpgplib.cpp b/stm32l432/openpgplib.cpp
@@ -10,7 +10,7 @@
 #include "openpgplib.h"
 #include "opgpdevice.h"
 #include "solofactory.h"
-#include "applets/apduconst.h"
+#include "applications/apduconst.h"
 
 #include "device.h"