Skip to content

Commit

Permalink
Update bugfix with changes from stable (google#377)
Browse files Browse the repository at this point in the history
* Add Feitian OpenSK USB Dongle (google#257) (google#258)

Co-authored-by: superskybird <[email protected]>

Co-authored-by: Geoffrey <[email protected]>
Co-authored-by: superskybird <[email protected]>

* Bugfix (google#304)

* Add Feitian OpenSK USB Dongle (google#257)

Co-authored-by: superskybird <[email protected]>

* Fix `config.py` tool according to the new API of fido2 python package (google#284)

* Fix fido2 API update.

Since fido2 0.8.1 the device descriptor moved to NamedTuple, breaking
our configuration tool.
Code is now updated accordingly and the setup script ensure we're
using the correct version for fido2 package.

* Make Yapf happy

* Fix missing update for fido2 0.9.1

Also split the comment into 2 lines so that the touch is not hidden
at the end of the screen.

* adds README changes, logo and certificate (google#285)

Co-authored-by: Geoffrey <[email protected]>
Co-authored-by: superskybird <[email protected]>
Co-authored-by: kaczmarczyck <[email protected]>

* Compare all timestamps in UTC timezone. (google#309)

* Merge bugfix into stable (google#324)

* Add Feitian OpenSK USB Dongle (google#257)

Co-authored-by: superskybird <[email protected]>

* Fix `config.py` tool according to the new API of fido2 python package (google#284)

* Fix fido2 API update.

Since fido2 0.8.1 the device descriptor moved to NamedTuple, breaking
our configuration tool.
Code is now updated accordingly and the setup script ensure we're
using the correct version for fido2 package.

* Make Yapf happy

* Fix missing update for fido2 0.9.1

Also split the comment into 2 lines so that the touch is not hidden
at the end of the screen.

* adds README changes, logo and certificate (google#285)

* Fix broken parsing. (google#317)

* Fix broken parsing.

By setting the default value before pre-parsing we ensure that the item
can't be None. As an extra safety the custom action also checks for
None.

Co-authored-by: Geoffrey <[email protected]>
Co-authored-by: superskybird <[email protected]>
Co-authored-by: kaczmarczyck <[email protected]>

* Coveralls workflow applied also to stable (google#342)

* Coveralls (google#339)

* Add code coverage report as part of the workflows

* Remove -Clink-dead-code which seems to be problematic

* Manually set features to avoid debug_* failing unit tests.

* Update badges

* Add libraries directory to trigger code coverage reporting.

* Fix coveralls badge not pointing to the branch

* Badges to stable branch

* adds and links new security policy

* Add erase_storage application example (google#352)

* Fix coveralls workflow (google#356)

* Return error instead of debug assert (google#363)

With dirty storage we hit the assert. Returning an error permits to continue to
catch if the invariant is broken for normal operation while being able to
continue fuzzing with dirty storage.

* Remove elf2tab dev-dependency (google#366)

We don't use it anymore. Not sure when we used to use it.

Fixes google#364

Co-authored-by: kaczmarczyck <[email protected]>

* Install Rust tools with stable compiler

We only need the frozen nightly for Tock (and maybe the app).

* fix python lint with encoding, see commit 7418196

* more encoding

Co-authored-by: Jean-Michel Picod <[email protected]>
Co-authored-by: Geoffrey <[email protected]>
Co-authored-by: superskybird <[email protected]>
Co-authored-by: Julien Cretin <[email protected]>
  • Loading branch information
5 people committed Nov 19, 2021
1 parent 420f062 commit 5472867
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ def checked_command_output(self, cmd, env=None, cwd=None):

def update_rustc_if_needed(self):
target_toolchain_fullstring = "stable"
with open("rust-toolchain", "r") as f:
with open("rust-toolchain", "r", encoding="utf-8") as f:
target_toolchain_fullstring = f.readline().strip()
target_toolchain = target_toolchain_fullstring.split("-", maxsplit=1)
if len(target_toolchain) == 1:
Expand Down
2 changes: 1 addition & 1 deletion fuzz/make_corpus.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def make_corpus(corpus_dir, corpus_json):

if os.path.isfile(corpus_json) and \
os.path.splitext(corpus_json)[-1] == ".json":
with open(corpus_json) as corpus_file:
with open(corpus_json, encoding="utf-8") as corpus_file:
corpus = json.load(corpus_file)
else:
raise TypeError
Expand Down

0 comments on commit 5472867

Please sign in to comment.