Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clone ring from the head of the ring repository into third_party #2681

Merged
merged 4 commits into from
Apr 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
uses: actions/cache@v2
env:
# Increment this value to invalidate previous cache entries.
CACHE_VERSION: 1
CACHE_VERSION: 2
with:
path: |
./cargo-cache/bin
Expand Down
6 changes: 5 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,8 @@ members = [
"remote_attestation/rust",
"xtask",
]
exclude = ["experimental/uefi/app", "oak_functions/loader/fuzz"]
exclude = [
"experimental/uefi/app",
"oak_functions/loader/fuzz",
"third_party/ring"
]
8 changes: 8 additions & 0 deletions third_party/ring/.cargo/audit.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[advisories]
# https://github.com/bheisler/criterion.rs/issues/534. serde_cbor is a
# benchmark-only dependency.
ignore = ["RUSTSEC-2021-0127"]

[output]
deny = ["warnings", "yanked", "unsound", "unmaintained"]
quiet = false
11 changes: 11 additions & 0 deletions third_party/ring/.clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
BasedOnStyle: Google
MaxEmptyLinesToKeep: 3
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
DerivePointerAlignment: false
PointerAlignment: Right
# TODO(davidben): The default for Google style is now Regroup, but the default
# IncludeCategories does not recognize <openssl/header.h>. We should
# reconfigure IncludeCategories to match. For now, keep it at Preserve.
IncludeBlocks: Preserve

1 change: 1 addition & 0 deletions third_party/ring/.coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
service_name: travis-pro
21 changes: 21 additions & 0 deletions third_party/ring/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
root = true

[*]
# Visual Studio 2017 does this wrong
# https://developercommunity.visualstudio.com/content/problem/22922/editorconfig-support-interprets-charset-utf-8-as-u.html
# charset = utf-8
end_of_line = lf
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.{c,cc,h,inl}]
indent_size = 2

[*.{py,rs,toml}]
indent_size = 4

[*.pl]
trim_trailing_whitespace = false
indent_style = tab
indent_size = 4
7 changes: 7 additions & 0 deletions third_party/ring/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
* text=auto !eol
crypto/**/*.pl linguist-language=Assembly
crypto/perlasm/*.pl linguist-language=Perl
*.bin binary
*.der binary
**/*.h linguist-language=C
**/*.inl linguist-language=C
8 changes: 8 additions & 0 deletions third_party/ring/.github/codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
coverage:
status:
patch:
default:
# Even when coverage hasn't decreased, Codecov would report a reduction
# in coverage of about 0.01%, but only for the patch-level measurement.
# Work around that.
threshold: 0.02%
Loading