Skip to content

Commit 662cb9f

Browse files
authored
Clone ring from the head of the ring repository into third_party (#2681)
* Clone ring from the head of the ring repository into third_party Ring has been cloned cloned into third_party, using commit 32b2c6c39ef459aad47f476fe9139b8d57532ab1 from https://github.com/briansmith/ring. This is done so that we will be able to later port our own patch onto it, specifically UEFI compatibility from: briansmith/ring#1406. * exclude ring from workspace * format * increment cache version
1 parent 5e507a0 commit 662cb9f

File tree

323 files changed

+127552
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

323 files changed

+127552
-2
lines changed

.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
uses: actions/cache@v2
6565
env:
6666
# Increment this value to invalidate previous cache entries.
67-
CACHE_VERSION: 1
67+
CACHE_VERSION: 2
6868
with:
6969
path: |
7070
./cargo-cache/bin

Cargo.toml

+5-1
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,8 @@ members = [
4545
"remote_attestation/rust",
4646
"xtask",
4747
]
48-
exclude = ["experimental/uefi/app", "oak_functions/loader/fuzz"]
48+
exclude = [
49+
"experimental/uefi/app",
50+
"oak_functions/loader/fuzz",
51+
"third_party/ring"
52+
]

third_party/ring/.cargo/audit.toml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[advisories]
2+
# https://github.com/bheisler/criterion.rs/issues/534. serde_cbor is a
3+
# benchmark-only dependency.
4+
ignore = ["RUSTSEC-2021-0127"]
5+
6+
[output]
7+
deny = ["warnings", "yanked", "unsound", "unmaintained"]
8+
quiet = false

third_party/ring/.clang-format

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
BasedOnStyle: Google
2+
MaxEmptyLinesToKeep: 3
3+
AllowShortIfStatementsOnASingleLine: false
4+
AllowShortLoopsOnASingleLine: false
5+
DerivePointerAlignment: false
6+
PointerAlignment: Right
7+
# TODO(davidben): The default for Google style is now Regroup, but the default
8+
# IncludeCategories does not recognize <openssl/header.h>. We should
9+
# reconfigure IncludeCategories to match. For now, keep it at Preserve.
10+
IncludeBlocks: Preserve
11+

third_party/ring/.coveralls.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
service_name: travis-pro

third_party/ring/.editorconfig

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
root = true
2+
3+
[*]
4+
# Visual Studio 2017 does this wrong
5+
# https://developercommunity.visualstudio.com/content/problem/22922/editorconfig-support-interprets-charset-utf-8-as-u.html
6+
# charset = utf-8
7+
end_of_line = lf
8+
indent_style = space
9+
insert_final_newline = true
10+
trim_trailing_whitespace = true
11+
12+
[*.{c,cc,h,inl}]
13+
indent_size = 2
14+
15+
[*.{py,rs,toml}]
16+
indent_size = 4
17+
18+
[*.pl]
19+
trim_trailing_whitespace = false
20+
indent_style = tab
21+
indent_size = 4

third_party/ring/.gitattributes

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
* text=auto !eol
2+
crypto/**/*.pl linguist-language=Assembly
3+
crypto/perlasm/*.pl linguist-language=Perl
4+
*.bin binary
5+
*.der binary
6+
**/*.h linguist-language=C
7+
**/*.inl linguist-language=C

third_party/ring/.github/codecov.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
coverage:
2+
status:
3+
patch:
4+
default:
5+
# Even when coverage hasn't decreased, Codecov would report a reduction
6+
# in coverage of about 0.01%, but only for the patch-level measurement.
7+
# Work around that.
8+
threshold: 0.02%

0 commit comments

Comments
 (0)