Skip to content

Commit

Permalink
update project files. bump openpgp, restore j8 option in makefilke
Browse files Browse the repository at this point in the history
  • Loading branch information
@merlokk
merlokk committed Jun 14, 2020
1 parent c22cd30 commit d4600e5
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 31 deletions.
2 changes: 1 addition & 1 deletion openpgp
Submodule openpgp updated 48 files
+2 −2 Makefile
+20 −15 README.md
+12 −1 libs/bearssl/i15_addon.c
+3 −3 pc/main.cpp
+181 −75 pytest/ecdsa_keys.py
+7 −0 pytest/openpgp_card.py
+61 −57 pytest/test_035_ecdsa.py
+144 −0 pytest/test_038_ed25519.py
+11 −0 pytest/util.py
+11 −11 src/apduexecutor.cpp
+3 −3 src/apduexecutor.h
+0 −43 src/applets/appletstorage.h
+2 −2 src/applications/apducommand.cpp
+4 −4 src/applications/apducommand.h
+4 −4 src/applications/apduconst.h
+10 −10 src/applications/application.cpp
+8 −8 src/applications/application.h
+12 −12 src/applications/applicationstorage.cpp
+43 −0 src/applications/applicationstorage.h
+27 −26 src/applications/openpgp/cryptoapdu.cpp
+8 −8 src/applications/openpgp/cryptoapdu.h
+0 −0 src/applications/openpgp/openpgpconst.cpp
+3 −3 src/applications/openpgp/openpgpconst.h
+2 −2 src/applications/openpgp/openpgpfactory.cpp
+4 −4 src/applications/openpgp/openpgpfactory.h
+15 −14 src/applications/openpgp/openpgpstruct.cpp
+2 −2 src/applications/openpgp/openpgpstruct.h
+1 −1 src/applications/openpgp/resetprovider.cpp
+3 −3 src/applications/openpgp/resetprovider.h
+10 −10 src/applications/openpgp/secureapdu.cpp
+8 −8 src/applications/openpgp/secureapdu.h
+42 −42 src/applications/openpgp/security.cpp
+5 −5 src/applications/openpgp/security.h
+14 −14 src/applications/openpgp/userapdu.cpp
+9 −9 src/applications/openpgp/userapdu.h
+9 −9 src/applications/openpgpapplication.cpp
+11 −11 src/applications/openpgpapplication.h
+3 −3 src/applications/testapplication.cpp
+6 −6 src/applications/testapplication.h
+123 −114 src/cryptolib.cpp
+48 −43 src/cryptolib.h
+4 −4 src/errors.h
+1 −1 src/filesystem.cpp
+1 −1 src/filesystem.h
+5 −5 src/solofactory.cpp
+5 −5 src/solofactory.h
+2 −2 stm32l432/Makefile.lib
+3 −3 stm32l432/openpgplib.cpp
82 changes: 55 additions & 27 deletions solo.files
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ crypto/cifra/src/testsha1.c
crypto/cifra/src/testsha2.c
crypto/cifra/src/testsha3.c
crypto/cifra/src/testutil.h
crypto/libsalty/salty.h
crypto/micro-ecc/test/test_compress.c
crypto/micro-ecc/test/test_compute.c
crypto/micro-ecc/test/test_ecdh.c
Expand Down Expand Up @@ -789,33 +790,60 @@ openpgp/pc/usbip.cpp
openpgp/pc/usbip.h
openpgp/src/apduexecutor.cpp
openpgp/src/apduexecutor.h
openpgp/src/applets/apducommand.cpp
openpgp/src/applets/apducommand.h
openpgp/src/applets/apduconst.h
openpgp/src/applets/applet.cpp
openpgp/src/applets/applet.h
openpgp/src/applets/appletstorage.cpp
openpgp/src/applets/appletstorage.h
openpgp/src/applets/openpgp/cryptoapdu.cpp
openpgp/src/applets/openpgp/cryptoapdu.h
openpgp/src/applets/openpgp/openpgpconst.cpp
openpgp/src/applets/openpgp/openpgpconst.h
openpgp/src/applets/openpgp/openpgpfactory.cpp
openpgp/src/applets/openpgp/openpgpfactory.h
openpgp/src/applets/openpgp/openpgpstruct.cpp
openpgp/src/applets/openpgp/openpgpstruct.h
openpgp/src/applets/openpgp/resetprovider.cpp
openpgp/src/applets/openpgp/resetprovider.h
openpgp/src/applets/openpgp/secureapdu.cpp
openpgp/src/applets/openpgp/secureapdu.h
openpgp/src/applets/openpgp/security.cpp
openpgp/src/applets/openpgp/security.h
openpgp/src/applets/openpgp/userapdu.cpp
openpgp/src/applets/openpgp/userapdu.h
openpgp/src/applets/openpgpapplet.cpp
openpgp/src/applets/openpgpapplet.h
openpgp/src/applets/testapplet.cpp
openpgp/src/applets/testapplet.h
openpgp/src/applications/apducommand.cpp
openpgp/src/applications/apducommand.h
openpgp/src/applications/apduconst.h
openpgp/src/applications/application.cpp
openpgp/src/applications/application.h
openpgp/src/applications/applicationstorage.cpp
openpgp/src/applications/applicationstorage.h
openpgp/src/applications/openpgp/cryptoapdu.cpp
openpgp/src/applications/openpgp/cryptoapdu.h
openpgp/src/applications/openpgp/openpgpconst.cpp
openpgp/src/applications/openpgp/openpgpconst.h
openpgp/src/applications/openpgp/openpgpfactory.cpp
openpgp/src/applications/openpgp/openpgpfactory.h
openpgp/src/applications/openpgp/openpgpstruct.cpp
openpgp/src/applications/openpgp/openpgpstruct.h
openpgp/src/applications/openpgp/resetprovider.cpp
openpgp/src/applications/openpgp/resetprovider.h
openpgp/src/applications/openpgp/secureapdu.cpp
openpgp/src/applications/openpgp/secureapdu.h
openpgp/src/applications/openpgp/security.cpp
openpgp/src/applications/openpgp/security.h
openpgp/src/applications/openpgp/userapdu.cpp
openpgp/src/applications/openpgp/userapdu.h
openpgp/src/applications/openpgpapplication.cpp
openpgp/src/applications/openpgpapplication.h
openpgp/src/applications/testapplication.cpp
openpgp/src/applications/testapplication.h
openpgp/src/applications/apducommand.cpp
openpgp/src/applications/apducommand.h
openpgp/src/applications/apduconst.h
openpgp/src/applications/application.cpp
openpgp/src/applications/application.h
openpgp/src/applications/applicationstorage.cpp
openpgp/src/applications/applicationstorage.h
openpgp/src/applications/openpgp/cryptoapdu.cpp
openpgp/src/applications/openpgp/cryptoapdu.h
openpgp/src/applications/openpgp/openpgpconst.cpp
openpgp/src/applications/openpgp/openpgpconst.h
openpgp/src/applications/openpgp/openpgpfactory.cpp
openpgp/src/applications/openpgp/openpgpfactory.h
openpgp/src/applications/openpgp/openpgpstruct.cpp
openpgp/src/applications/openpgp/openpgpstruct.h
openpgp/src/applications/openpgp/resetprovider.cpp
openpgp/src/applications/openpgp/resetprovider.h
openpgp/src/applications/openpgp/secureapdu.cpp
openpgp/src/applications/openpgp/secureapdu.h
openpgp/src/applications/openpgp/security.cpp
openpgp/src/applications/openpgp/security.h
openpgp/src/applications/openpgp/userapdu.cpp
openpgp/src/applications/openpgp/userapdu.h
openpgp/src/applications/openpgpapplication.cpp
openpgp/src/applications/openpgpapplication.h
openpgp/src/applications/testapplication.cpp
openpgp/src/applications/testapplication.h
openpgp/src/cryptolib-mbedtls.cpp
openpgp/src/cryptolib-mbedtls.h
openpgp/src/cryptolib.cpp
Expand Down
7 changes: 5 additions & 2 deletions solo.includes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ openpgp/libs/bearssl
openpgp/libs/stm32fs
openpgp/pc
openpgp/src
openpgp/src/applets
openpgp/src/applets/openpgp
openpgp/src/applications
openpgp/src/applications/openpgp
openpgp/stm32l432
pc
targets/stm32l432/bootloader
Expand All @@ -42,3 +42,6 @@ tinycbor/src
targets/stm32l432
openpgp
targets/stm32l432/build
openpgp/src/applications/openpgp
openpgp/src/applications
crypto/libsalty
2 changes: 1 addition & 1 deletion targets/stm32l432/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ all:
$(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) DEBUG=$(DEBUG) EXTRA_DEFINES='-DFLASH_ROP=1'

all-hacker:
$(MAKE) -f $(APPMAKE) solo.hex PREFIX=$(PREFIX) DEBUG=$(DEBUG) EXTRA_DEFINES='-DSOLO_HACKER -DFLASH_ROP=0'
$(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) DEBUG=$(DEBUG) EXTRA_DEFINES='-DSOLO_HACKER -DFLASH_ROP=0'

all-locked:
$(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) EXTRA_DEFINES='-DFLASH_ROP=2'
Expand Down

0 comments on commit d4600e5

Please sign in to comment.