arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-30 01:58:11 +00:00
Code Issues Releases Wiki Activity
13,440 Commits 371 Branches 205 Tags 207 MiB
4afaf4c41e
Commit Graph

264 Commits

Author SHA1 Message Date
Andrew Kozlik
db6630a5a3 feat(core): Support Optiga in Trezor firmware. 2023-09-13 15:45:48 +02:00
Andrew Kozlik
8010cfb5b6 feat(core): Add utils.USE_OPTIGA. 2023-09-13 15:45:48 +02:00
Martin Milata
7e9f127aec feat(core): revise path warning on model T 2023-09-12 00:39:08 +02:00
Martin Milata
58ffe95369 fix(core): display XPUBs in a similar way to addresses 
[no changelog]
 2023-09-12 00:39:08 +02:00
grdddj
8956350aca feat(core): create new Ethereum send flow for TT 
[no changelog]
 2023-09-04 13:50:30 +02:00
grdddj
eed6e0b71c feat(core): create new Ethereum send flow for TR 
[no changelog]
 2023-09-04 13:50:30 +02:00
grdddj
492ff958a5 feat(core): improve sign message designs 
[no changelog]
 2023-09-01 13:30:29 +02:00
grdddj
09cd64123b feat(core): implement show_more dialogue for TR 
[no changelog]
 2023-09-01 13:30:29 +02:00
grdddj
ec9569a00e chore(core): regenerate trezorui2.pyi 
[no changelog]
 2023-07-17 15:30:00 +02:00
grdddj
bc502287fc feat(core): new design of recovery dialogs 
[no changelog]
 2023-07-17 15:30:00 +02:00
grdddj
03f77c50e9 feat(core/rust): new design of wallet creation dialogs 
[no changelog]
 2023-07-17 15:30:00 +02:00
grdddj
672d6b7d13 feat(core): new design of PIN dialogs 
[no changelog]
 2023-07-17 15:30:00 +02:00
grdddj
10449759bf chore(core): new designs of passphrase dialogs 
[no changelog]
 2023-07-17 15:30:00 +02:00
matejcik
78a8b48f1e refactor(core): generate trezorproto module straight from Rust 2023-07-12 10:09:36 +02:00
tychovrahe
539420cac8 refactor(core): make backlight/fading optional 
[no changelog]
 2023-06-27 16:18:30 +02:00
grdddj
64236e699f feat(core/rust): add account and address labels into send flow 
[no changelog]
 2023-06-27 07:57:45 +02:00
Martin Milata
3a5fdfedcc fix(core/ui): minor visual tweaks 
- centered title for coinjoin loader
- make device label bold on label confirmation screen

[no changelog]
 2023-06-19 19:34:16 +02:00
grdddj
55bff602fa fix(core): add dynamic title to the FIDO dialogue for model R 
[no changelog]
 2023-06-14 15:20:43 +02:00
tychovrahe
8d812ca36e feat(core): support device variants 
[no changelog]
 2023-06-07 19:48:53 +02:00
tychovrahe
a2f8cb9d1c feat(core): add internal model field to features 
[no changelog]
 2023-06-06 09:39:45 +02:00
Martin Milata
fee0d70211 fix(core/ui): workaround different TT and TR UI API 
[no changelog]
 2023-06-02 18:47:09 +02:00
Martin Milata
611d4edc32 fix(core/ui): clarify transaction replacement screens 
[no changelog]
 2023-06-02 18:47:09 +02:00
grdddj
da14c22712 feat(all): add UI for Model R 2023-05-31 10:14:54 +02:00
grdddj
03913ebf1b chore(core): regenerate trezorui2.pyi 2023-05-11 21:02:21 +02:00
tychovrahe
83500487b8 refactor(core): improve conditional compilations based on model 
[no changelog]
 2023-04-19 21:36:51 +02:00
tychovrahe
eb72fb4241 refactor(core): remove unused functions 
[no changelog]
 2023-04-19 21:36:51 +02:00
Martin Milata
a44e738d31 feat(core/ui): sending transaction style update 
[no changelog]
 2023-04-04 00:15:12 +02:00
Martin Milata
08cad2f909 fix(core/ui): coinjoin layouts style update 
[no changelog]
 2023-03-30 13:55:54 +02:00
Martin Milata
19a2ea21b6 fix(core/ui): Model T style update 
[no changelog]
 2023-03-23 20:16:22 +01:00
Martin Milata
4af5939a0b feat(core/ui): redesigned receive flow 
[no changelog]
 2023-03-09 23:36:36 +01:00
Martin Milata
4622aec0f1 refactor(core): switch to Rust implementation of QR-Code-generator 
[no changelog]
 2023-03-09 23:36:36 +01:00
Martin Milata
557e29769b feat(core/ui): redesigned passphrase dialogs 
[no changelog]
 2023-02-28 23:30:38 +01:00
grdddj
acec852aa4 feat(core): show welcome screen after device is connected 
[no changelog]
 2023-02-27 13:22:09 +01:00
Martin Milata
afb5c55416 feat(core/ui): reset_device copy change 
[no changelog]
 2023-02-17 12:35:19 +01:00
grdddj
f8c432e955 chore(core/rust): delete model_1 code - it should use model_r 
[no changelog]
 2023-01-31 10:55:12 +01:00
grdddj
571bb79e33 chore(core): delete unused bip39/slip39 micropython/C bindings 
[no changelog]
 2023-01-25 19:17:56 +01:00
tychovrahe
1359b21508 feat(core): confirm homescreen image with thumbnail 
[no changelog]
 2023-01-19 14:11:42 +01:00
tychovrahe
d00e87ea80 feat(core/rust): homescreen background image 
[no changelog]
 2023-01-19 14:11:42 +01:00
matejcik
497285f9a1 feat(core): make first steps to unify Rust API for both models 
wip: unify confirm_action

wip: unify confirm_fido

wip: unify request_pin, clean up prompts

wip: unify select_word

wip: unify request_number

refactor(core/reset): refactor confirm_share_words

[no changelog]
 2023-01-13 17:09:25 +01:00
Martin Milata
5b3db7eca1 refactor(core/rust/ui): homescreen layouts 
[no changelog]
 2022-12-13 17:15:15 +01:00
Martin Milata
1b4dff6275 fix(core/rust/ui): respect DISABLE_ANIMATION 
[no changelog]
 2022-12-12 16:00:42 +01:00
Martin Milata
95d8a21294 feat(core/rust/ui): progress indicators 
[no changelog]
 2022-12-12 16:00:42 +01:00
Martin Milata
452857757a feat(core/rust/ui): support ask_pagination flag in confirm_blob 
[no changelog]
 2022-12-06 00:26:25 +01:00
Martin Milata
3b92923caa feat(core/rust/ui): on-the-fly conversion of bytes to hexadecimal representation 
[no changelog]
 2022-11-29 21:03:06 +01:00
grdddj
61277bd80a feat(core/ui): implement webauthn layouts for UI2 
[no changelog]
 2022-11-24 13:03:34 +01:00
grdddj
f48890afb3 chore(tests): make all the device tests work with UI2 2022-11-21 14:08:47 +01:00
grdddj
ae525fed26 chore(core/ui): delete unused arguments to layouts 2022-11-21 14:08:47 +01:00
Andrew Kozlik
627ef9748f feat(core): Remove coin name from CoinJoin confirmation dialog. 
[no changelog]
 2022-10-26 14:02:03 +02:00
Dusan Klinec
26711857e8 refactor(xmr): remove old BP code 2022-10-25 21:36:03 +02:00
grdddj
8668eba936 feat(core/ui): implement altcoin screens for UI2 
[no changelog]
 2022-10-24 13:38:31 +02:00
Martin Milata
a7c3a07ef1 refactor(core/rust/ui): implement confirm_properties layout 
[no changelog]
 2022-10-21 21:02:39 +02:00
Andrew Kozlik
d815a7d6de chore(core): Use C implementation of Bech32 decode. 2022-10-17 15:20:46 +02:00
tychovrahe
f7b9bb4ef8 feat(core/rust): use dma2d to improve rendering performance, implement text over image and icon over icon functions 2022-09-29 21:50:10 +02:00
Martin Milata
5a9c2a1363 feat(core/rust/ui): recovery layouts 
[no changelog]
 2022-09-07 16:46:47 +02:00
Martin Milata
885ae2a943 refactor(core/rust/ui): add should_show_more 
[no changelog]
 2022-09-07 16:46:47 +02:00
Martin Milata
3b629a1ea4 refactor(core/rust/ui): layouts for SLIP-39 backups 
[no changelog]
 2022-09-07 16:46:47 +02:00
Martin Milata
4782afbae3 refactor(core/rust/ui): layouts for BIP-39 backups 
[no changelog]
 2022-09-07 16:46:47 +02:00
Martin Milata
4ff2c99f0a refactor(core/rust/ui): add show_info and show_error 
[no changelog]
 2022-09-07 16:46:47 +02:00
Ondrej Mikle
a0287698d5 feat(core): show blue dot when USB data not connected 2022-08-25 16:42:29 +02:00
Andrew Kozlik
fa5e7feda6 fix(crypto): Fix nonce bias in CoSi signing. 2022-08-02 20:38:04 +02:00
matejcik
a6410693b3 Revert "feat(core): implement firmware dumping" 
This reverts commit 37c61c1381.
 2022-08-02 17:12:07 +02:00
Martin Milata
c9ca7cd544 feat(core/rust/ui): bitcoin layouts 
[no changelog]
 2022-06-28 18:01:02 +02:00
Martin Milata
24a1f2e25e refactor(core): remove unused parameter from display_qrcode 
[no changelog]
 2022-06-28 18:01:02 +02:00
Ondrej Mikle
c563c987e1 feat(core): jump back and stay in bootloader for TT via reverse SVC call trampoline 2022-06-01 14:50:59 +02:00
Dusan Klinec
25d32a8144 feat(xmr): implement bp+, refactor, code cleanup 
- implement BulletProof plus verifier and prover
- use bulletproof exception to signalize proof generation failed and should be tried again. More robust, fixes bug that was not triggered yet (return tuple did not work properly in all situations)
- precomputed 2**i vector is removed as it can be easily computed
- BP code cleanup, minor optimizations, comments
 2022-05-16 12:37:24 +02:00
Dusan Klinec
33c174491f refactor(core/monero): Monero code cleanup 
* remove support for HF12 and below
* remove MLSAG support
* clean up monero cryptography naming
* get rid of "optional first argument" pattern, in favor of mandatory argument that is allowed to be None
  (and fix several bugs related to this feature)

Co-authored-by: grdddj <jiri.musil06@seznam.cz>
Co-authored-by: Martin Milata <martin@martinmilata.cz>
Co-authored-by: matejcik <ja@matejcik.cz>
 2022-05-16 12:37:24 +02:00
grdddj
7804893179 feat(core/rust): create model_tr feature 
Make event.rs shared among all features, under src/ui/event.rs.

[no changelog]
 2022-05-06 11:44:52 +02:00
matejcik
37c61c1381 feat(core): implement firmware dumping 2022-05-03 19:00:04 +02:00
Andrew Kozlik
485ee6e209 feat(core): Show progress in GetFirmwareHash. 2022-05-03 19:00:04 +02:00
Andrew Kozlik
822b1c344f feat(core): Return fw_vendor in firmware Features message. 2022-05-03 19:00:04 +02:00
Andrew Kozlik
106ab65e21 feat(core): Implement GetFirmwareHash message. 2022-05-03 19:00:04 +02:00
Martin Milata
1f612580f7 feat(core): enable UI tests for redesigned UI 
[no changelog]
 2022-04-07 17:58:41 +02:00
Martin Milata
38f4ab0983 feat(core/rust/ui): return Layout results as singleton objects 
[no changelog]
 2022-04-04 13:32:07 +02:00
Martin Milata
4eefaffac9 fix(core/rust/ui): recovery/passphrase keyboard fixes 
[no changelog]
 2022-03-23 13:40:45 +01:00
Martin Milata
efe25a6ab4 fix(core/rust/ui): pin keyboard tweaks 
[no changelog]
 2022-03-23 13:40:45 +01:00
Pavol Rusnak
c6667fa0c2 feat(core): verify bip340 pubkeys used in p2tr addresses 
Co-Authored-By: Ondřej Vejpustek <ondrej.vejpustek@satoshilabs.com>
 2022-02-16 10:25:15 +01:00
Martin Milata
f2b8822d76 refactor(core): improve build-time option for old/new UI 
[no changelog]
 2022-02-10 14:57:42 +01:00
Martin Milata
8fb28e4af5 feat(core/rust): impl Paginate for Paragraphs 
[no changelog]
 2022-02-08 15:40:37 +01:00
matejcik
45787307ca style(core): support AnyStr in all hash function arguments 2022-01-07 21:41:17 +01:00
grdddj
9fc5bb546b style(core): full pyright-based type-checking 
Changes many fields to required -- as far as we were able to figure out,
signing would fail if these fields aren't provided anyway, so this
should not pose a compatibility problem.

Co-authored-by: matejcik <ja@matejcik.cz>
 2022-01-07 21:41:17 +01:00
matejcik
1bfaec10e9 build(core): rewrite build_mocks with pathlib, add symlinks to ../mocks 2022-01-07 21:41:17 +01:00
Martin Milata
afd7cb3b01 feat(core/rust): add example layout for T1 
[no changelog]
 2021-11-24 15:36:34 +01:00
Andrew Kozlik
59c0f4383d feat(core): Add key tweaking functions to trezorcrypto.bip340. 2021-11-13 13:33:46 +01:00
matejcik
f6f52445bd feat(core/cardano): support Icarus, Icarus-Trezor, and Ledger derivations 2021-11-10 13:57:57 +01:00
matejcik
387466e073 refactor(core): separate Cardano cryptography into its own module 2021-11-10 13:57:57 +01:00
matejcik
1d72085b5c feat(core): implement conversion from timestamp to datetime 2021-10-29 11:00:30 +02:00
Ondřej Vejpustek
29ce860d46 refactor(core,crypto): rename schnorr to BIP340 2021-10-25 14:41:28 +02:00
Ondřej Vejpustek
7ac0bdd215 feat(core): make core use Schnorr signatures 2021-10-25 14:41:28 +02:00
Ondřej Vejpustek
26463eb3ce feat(core): make core use ecdsa from secp256k1_zkp wherever possible 2021-10-25 14:41:28 +02:00
Jan Pochyla
2703d714c2 feat(core): add Rust UI components, layouts, text rendering 
[no changelog]
 2021-10-07 15:01:55 +02:00
Martin Milata
bd005e33df refactor(core): decouple T1 button handling from touch 
[no changelog]
 2021-09-23 12:30:13 +02:00
matejcik
4b34e4c001 fix(core): allow AnyStr as parameter for unhexlify 2021-09-10 15:09:03 +02:00
matejcik
b41d4c71f0 feat(core/emulator): JSON memory map dump 
use `trezor.utils.mem_dump("somefile.json")` in a key place, then
`analyze.py src/somefile.json` to look at what is going on
 2021-07-14 13:50:24 +02:00
Jan Pochyla
8a21e3fc73 feat(core): Add Rust Protobuf codec 2021-06-08 09:55:19 +02:00
Pavol Rusnak
23aa69caea fix(core): unify Features.revision reporting with legacy 2021-06-04 12:50:49 +02:00
matejcik
391976bcda refactor(core/usb): do not require serial number on instantiaton of USB 
On a cleanly wiped device, storage must be unlocked in order to create
and retrieve the serial number. However, storage unlocking happens in
boot.py, which is imported _after_ usb.py

We must therefore sidestep asking for the serial number.
 2021-05-06 13:14:21 +02:00
Martin Milata
ac711fb8ee style(core): use more recent type annotation syntax 
https://www.python.org/dev/peps/pep-0585/ - Type Hinting Generics In Standard Collections
https://www.python.org/dev/peps/pep-0604/ - Allow writing union types as X | Y
 2021-04-01 11:12:30 +02:00
Martin Milata
8b3ac659a0 style(core): mypy: disable implicit Optional for function arguments 
https://www.python.org/dev/peps/pep-0484/#union-types
 2021-04-01 11:12:30 +02:00
Andrew Kozlik
2836bfc64c fix(core): Improve error handling and range checking in modtrezorconfig. 2021-03-26 10:54:56 +01:00
Andrew Kozlik
3084d1196d feat(core): Support 50 digit PIN and wipe code. 2021-03-25 14:24:41 +01:00
Andrew Kozlik
a8c500bffd feat(core): Ensure that WebAuthn runs on port 21326 by default for both production and debug emulator. 2021-03-09 16:13:21 +01:00
matejcik
ccd241fe55 feat(core/cardano): enable typing for Cardano app 2021-02-10 10:56:52 +01:00
Martin Milata
db5b65a420 perf(core): enable rendering of substrings to avoid slicing 2021-01-11 16:47:59 +01:00
Andrew Kozlik
aeb021b159 chore(core): Improve naming of SLIP39's T9 mask lookup. 2020-12-15 13:41:42 +01:00
Pavol Rusnak
0036686588 style(core/mocks): use new syntax for typing 2020-12-01 15:52:29 +01:00
Pavol Rusnak
d8534b5ee6
perf(core/extmod): replace HMAC Python implementation with C 
We keep Python implementation of HMAC for Monero in
core/src/apps/monero/xmr/crypto/__init__.py
 2020-10-12 16:33:13 +02:00
matejcik
7e5d9e295b fix(core): help mypy understand micropython's module management 2020-09-23 16:00:10 +02:00
Martin Milata
163ccedb39 core: allow const() values to have Literal type 2020-09-18 09:02:40 +02:00
Martin Milata
b8bb63fbef core: drop unused FONT_SIZE constant 2020-09-01 19:57:46 +02:00
Martin Milata
1b982659c4
core: fix boot loop after uploading invalid homescreen (#1205) 2020-08-21 12:00:42 +02:00
Pavol Rusnak
4e11735d22 core/modtrezorui: remove prefill from text functions 
use display.bar where needed to prefill the areas
 2020-08-07 15:08:14 +02:00
Pavol Rusnak
cec87bba50
core: remove mono bold font variant (not used anywhere) 2020-07-27 23:22:34 +02:00
matejcik
fa757f4b7f core: improve type annotation for bip32.derive_path 2020-07-24 16:37:58 +02:00
matejcik
0c3bc53aee core: clean up types for field caching, fix count_message 2020-07-24 14:09:31 +02:00
matejcik
85d74ece76 core: implement synchronous v1 codec 2020-07-24 14:09:31 +02:00
matejcik
872e0fb0e0 core: lower scheduler resolution to milliseconds 
This avoids problems with large timeouts causing the scheduler queue to
think the time counter has overflown, and ordering the autolock task before
immediate tasks.

The maximum reasonable time difference is 0x20000000, which in
microseconds is ~8 minutes, but in milliseconds a more reasonable ~6
days.
 2020-06-04 16:18:46 +02:00
matejcik
837c4df61f core: expose storage_is_unlocked() as config.is_unlocked() 2020-06-04 16:18:46 +02:00
matejcik
87433995b0 core: add BITCOIN_ONLY to mock file 2020-06-04 16:18:46 +02:00
matejcik
aa52fc3903 core/extmod: drop unused rfc6979 module 2020-05-18 14:31:00 +02:00
matejcik
7f2e7b0003 core: add Ethereum constants to mocks 2020-05-15 14:08:29 +02:00
Pavol Rusnak
197218338a
Merge pull request #936 from trezor/rework-serialize-deserialize 
crypto: rework serialize/deserialize API
 2020-04-09 09:53:23 +02:00
matejcik
eec0615444 core: drop sys.pyi from mocks (fixes #934) 
A change introduced in mypy 0.770 disallows overriding some system
modules, including `sys`.

We only need the override for `sys.print_exception`, and the simplest
solution is to make mypy ignore that particular call.
 2020-04-08 11:19:26 +02:00
Pavol Rusnak
a7806d08d7
core/crypto: remove unused bip32.deserialize function 2020-04-06 18:04:24 +02:00
Pavol Rusnak
1695228d80
core/crypto: remove unused serialize_private function 2020-04-06 15:49:36 +00:00
Pavol Rusnak
f07ff17fad
core/crypto: add missing field to Blake2b constructor 2020-04-06 12:28:36 +00:00
matejcik
3789a3372b core/sdcard: modify exception handling in fatfs 
expose ff.c constants, raise them as arguments to FatFSError

introduce NotMounted and NoFilesystem as subclasses of FatFSError with
the appropriate error code set
 2020-03-20 14:03:28 +01:00
Andrew Kozlik
bfd834d1de storage: Add storage_ensure_not_wipe_code(). 2020-03-19 15:04:33 +01:00
Dusan Klinec
2658e253fa xmr/bp: memory optimizations and improvements 
- different approach to vector manipulation - more on the fly operations. Prepared for fully offloaded operations, BP on Trezor with constant memory.
- memory requirements reduced from (4MN + const) to (2MN + const)
- more raw methods to avoid unnecessary encoding/decoding
- chunking improved, chunk size set as a constant, changed from 64 to 32, missing pieces implemented to cover also BP 16
- proof_v8 support discontinued, old hardfork, not needed anymore
- get_exponent register clash fixed (for large vectors)
- reduced heap fragmentation by removing some temporary allocations
- hashing with len and offset to reduce heap fragmentation by creating a sliced arrays
- use to() wherever possible to avoid allocations and return of mutable private object
- global functions start with _ prefix, reduce import footprint
- use __slots__ in classes to minimize footprint
 2020-03-02 12:17:03 +01:00
matejcik
9ab84d2455 core/tests: thoroughly test modified APIs 2020-02-27 10:56:23 +01:00
matejcik
fa746e2990 core/fatfs: rework low-level FatFS API 
Instead of having possibly multiple FatFS objects, each with its own
`fs` struct, there is one global static fs_instance. This is to match
the mode of operation of ff.c, which assumes a global list of mounts,
and all functions operate on the global based on path.

Methods of FatFS were converted to functions on the fatfs module.

fatfs.unmount() does not call ff.c's unmount, but simply invalidates
fs_instance. This is basically what ff.c would do, except without
messing with ff.c's global list of mounts.
 2020-02-26 14:18:41 +01:00
Pavol Rusnak
39ce100608
Merge pull request #864 from trezor/prusnak/bootloader-text-break 
core/bootloader: split long vendor string
 2020-02-21 18:39:20 +01:00
matejcik
b2084a19be core/trezorio: move sdcard functions to a submodule 2020-02-20 12:51:48 +01:00
Pavol Rusnak
74802a107e
core/modtrezorui: add display_text_split 2020-02-19 21:40:28 +00:00
Pavol Rusnak
32f8f1cb61
core/embed: update fatfs to 0.14; use upstream version 2020-02-07 15:21:16 +00:00
Pavol Rusnak
3de1b3aa54
core/embed: switch to unprivileged in main.c 2020-01-24 12:29:46 +00:00
Tomas Susanka
51ef963738 tests: introduce UI tests for core 2020-01-03 14:28:27 +00:00
Andrew Kozlik
a3b608d8dd storage, core: Reveal the wipe code status after the device is unlocked. 2019-11-25 12:32:20 +01:00
Andrew Kozlik
a168d661cf core: Add support for ChangeWipeCode message. 2019-11-25 12:32:20 +01:00
Tomas Susanka
0511cc8b8c core: add final mypy fixes! 2019-10-22 14:36:25 +00:00
Andrew Kozlik
c25a41aa57 core: Fix mypy warnings in FatFS and SD salt code. 2019-10-09 17:07:25 +02:00
Pavol Rusnak
ad76b5fb9f
core: regenerate mocks 2019-09-25 10:27:04 +00:00
Pavol Rusnak
78041d261b
crypto: refactor bip39 api 2019-09-23 17:56:36 +02:00
Andrew Kozlik
6350b1c61c core: Implement SD card protection. 2019-09-18 18:55:58 +02:00
Andrew Kozlik
4f01003637 storage: Add external salt parameter to unlock() and change_pin(). 2019-09-18 18:53:42 +02:00
Andrew Kozlik
84674a7463 core/usb: Add write_blocking() to trezor.io.HID. 2019-09-11 15:33:16 +02:00
Pavol Rusnak
aa8d14c0ea
core/modtrezorio: add FatFS support 2019-09-03 15:14:24 +02:00
Andrew Kozlik
8297b81cd5 core/crypto: Add AES mode constants. 2019-08-09 12:46:08 +02:00
Andrew Kozlik
0a594ea1e9
Merge pull request #280 from trezor/andrewkozlik/slip-0021 
Add SLIP-0021 implementation and tests.
 2019-08-06 14:26:34 +02:00
Andrew Kozlik
217c910b4b cardano: Implement SLIP-0023 and add SLIP-0039 support for Cardano. 2019-07-25 19:43:05 +02:00
Tomas Susanka
d2597d54c1 core/shamir: persistence 
updates #270
 2019-07-24 15:12:04 +02:00