dnrops
/
swift-nio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Final language fix (#1732)

This commit is contained in:
Fabian Fett 2021-01-22 19:39:10 +01:00 committed by GitHub
parent 6b41c18bf6
commit f745421d49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/CNIOSHA1/update_and_patch_sha1.sh vendored
View File

@ -53,9 +53,7 @@ $sed -e $'/#define _CRYPTO_SHA1_H_/a #include <stdint.h>\\\n#include <stddef.h>'
$sed -e 's/u_int\([0-9]\+\)_t/uint\1_t/g' \ $sed -e 's/u_int\([0-9]\+\)_t/uint\1_t/g' \
-e '/^#include/d' \ -e '/^#include/d' \
-e $'/__FBSDID/c #include "include/CNIOSHA1.h"\\n#include <string.h>\\n#if !defined(bzero)\\n#define bzero(b,l) memset((b), \'\\\\0\', (l))\\n#endif\\n#if !defined(bcopy)\\n#define bcopy(s,d,l) memmove((d), (s), (l))\\n#endif\\n#ifdef __ANDROID__\\n#include <sys/endian.h>\\n#elif __linux__\\n#include <sys/types.h>\\n#endif' \ -e $'/__FBSDID/c #include "include/CNIOSHA1.h"\\n#include <string.h>\\n#if !defined(bzero)\\n#define bzero(b,l) memset((b), \'\\\\0\', (l))\\n#endif\\n#if !defined(bcopy)\\n#define bcopy(s,d,l) memmove((d), (s), (l))\\n#endif\\n#ifdef __ANDROID__\\n#include <sys/endian.h>\\n#elif __linux__\\n#include <sys/types.h>\\n#endif' \
-i "$here/c_nio_sha1.c" -e 's/sanit[y]/soundness/g' \
$sed -e 's/sanity check/soundness check/g' \
-i "$here/c_nio_sha1.c" -i "$here/c_nio_sha1.c"
mv "$here/c_nio_sha1.h" "$here/include/CNIOSHA1.h" mv "$here/c_nio_sha1.h" "$here/include/CNIOSHA1.h"

4
docker/docker-compose.yaml
View File

@ -22,10 +22,6 @@ services:
- CAP_NET_RAW - CAP_NET_RAW
- CAP_NET_BIND_SERVICE - CAP_NET_BIND_SERVICE
sanity:
<<: *common
command: /bin/bash -xcl "./scripts/soundness.sh"
soundness: soundness:
<<: *common <<: *common
command: /bin/bash -xcl "./scripts/soundness.sh" command: /bin/bash -xcl "./scripts/soundness.sh"

4
scripts/soundness.sh
View File

@ -40,9 +40,7 @@ unacceptable_terms=(
-e blacklis[t] -e blacklis[t]
-e whitelis[t] -e whitelis[t]
-e slav[e] -e slav[e]
# this needs to be commented out until we have changed the CI to pick up the -e sanit[y]
# soundness check instead.
# -e sanit[y]
) )
if git grep --color=never -i "${unacceptable_terms[@]}" > /dev/null; then if git grep --color=never -i "${unacceptable_terms[@]}" > /dev/null; then
printf "\033[0;31mUnacceptable language found.\033[0m\n" printf "\033[0;31mUnacceptable language found.\033[0m\n"