Skip to content

Use welcoming language #63

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

Merged
merged 1 commit into from
Jan 26, 2021
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Tests/CryptoTests/SecureBytes/SecureBytesTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import XCTest
#endif

final class SecureBytesTests: XCTestCase {
func testBasicSanity() {
func testBasicSoundness() {
var first = SecureBytes()
var second = SecureBytes()

Expand Down
4 changes: 2 additions & 2 deletions docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ services:
- CAP_NET_RAW
- CAP_NET_BIND_SERVICE

sanity:
soundness:
<<: *common
command: /bin/bash -xcl "./scripts/sanity.sh"
command: /bin/bash -xcl "./scripts/soundness.sh"

test:
<<: *common
Expand Down
19 changes: 17 additions & 2 deletions scripts/sanity.sh → scripts/soundness.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,22 @@ function replace_acceptable_years() {
sed -e 's/20[12][890]-20[12][90]/YEARS/' -e 's/2019/YEARS/' -e 's/2020/YEARS/'
}

printf "=> Checking for unacceptable language... "
# This greps for unacceptable terminology. The square bracket[s] are so that
# "git grep" doesn't find the lines that greps :).
# We exclude the vendored BoringSSL copy from this check.
unacceptable_terms=(
-e blacklis[t]
-e whitelis[t]
-e slav[e]
-e sanit[y]
)
if git grep --color=never -i "${unacceptable_terms[@]}" ':(exclude)Sources/CCryptoBoringSSL*' > /dev/null; then
printf "\033[0;31mUnacceptable language found.\033[0m\n"
git grep -i "${unacceptable_terms[@]}" ':(exclude)Sources/CCryptoBoringSSL*'
exit 1
fi
printf "\033[0;32mokay.\033[0m\n"

# Run gyb, if generated files was changed -> fail
printf "=> Detecting manual edits in generated Swift files by comparing to gyb output\n"
Expand All @@ -37,7 +53,6 @@ if [[ "$FIRST_OUT" != "$SECOND_OUT" ]]; then
fi
printf "\033[0;32mokay.\033[0m\n"


printf "=> Checking format\n"
FIRST_OUT="$(git status --porcelain)"
# only checking direcotry named BoringSSL, rest is shared code and we need to preserve original format
Expand Down Expand Up @@ -68,7 +83,7 @@ else
fi

printf "=> Checking license headers\n"
tmp=$(mktemp /tmp/.swift-crypto-sanity_XXXXXX)
tmp=$(mktemp /tmp/.swift-crypto-soundness_XXXXXX)

for language in swift-or-c bash dtrace; do
printf " * $language... "
Expand Down