Merge branch 'master' into notsure2

This commit is contained in:
notsure2 2020-12-20 01:02:48 +02:00
commit c42b2a555f
3 changed files with 5 additions and 3 deletions

View File

@ -17,6 +17,6 @@ jobs:
- name: Release
uses: softprops/action-gh-release@v1
with:
files: release/*
files: ./release/ck-*
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@ -291,7 +291,7 @@ func (sesh *Session) passiveClose() error {
func genRandomPadding() []byte {
lenB := make([]byte, 1)
common.CryptoRandRead(lenB)
pad := make([]byte, lenB[0]+1)
pad := make([]byte, int(lenB[0])+1)
common.CryptoRandRead(pad)
return pad
}

View File

@ -21,9 +21,11 @@ CGO_ENABLED=0 gox -ldflags "-X main.version=${v}" -os="$os" -arch="$arch" -osarc
CGO_ENABLED=0 GOOS="linux" GOARCH="mips" GOMIPS="softfloat" go build -ldflags "-X main.version=${v}" -o ck-client-linux-mips_softfloat-"${v}"
CGO_ENABLED=0 GOOS="linux" GOARCH="mipsle" GOMIPS="softfloat" go build -ldflags "-X main.version=${v}" -o ck-client-linux-mipsle_softfloat-"${v}"
mv ck-client-* ../../release
popd
os="linux"
arch="amd64 386 arm arm64"
pushd ../ck-server || exit 1
pushd cmd/ck-server || exit 1
CGO_ENABLED=0 gox -ldflags "-X main.version=${v}" -os="$os" -arch="$arch" -osarch="$osarch" -output="$output"
mv ck-server-* ../../release
popd