Skip to content

Commit a6fa239

Browse files
rscrsc
committed
[dev.boringcrypto.go1.8] crypto/internal/boring: clear "executable stack" bit from syso
Change-Id: Ie9dd13f3ae78a423a231f47e746a38f96768b93c Reviewed-on: https://go-review.googlesource.com/58830 Reviewed-by: Ian Lance Taylor <[email protected]> Reviewed-on: https://go-review.googlesource.com/58971 Reviewed-by: Adam Langley <[email protected]>
1 parent d5efcb1 commit a6fa239

3 files changed

Lines changed: 3 additions & 1 deletion

File tree

‎src/crypto/internal/boring/build/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ mkdir $chroot/godriver
5757
cp ../goboringcrypto.h $chroot/godriver
5858

5959
sudo http_proxy=$http_proxy chroot $chroot /root_setup_in_chroot.sh
60-
sudo chroot --userspec=$USER:$USER $chroot /build_in_chroot.sh
60+
sudo chroot --userspec=$(id -u):$(id -g) $chroot /build_in_chroot.sh
6161
cp $chroot/godriver/goboringcrypto_linux_amd64.syso ..
6262
sha256sum ../goboringcrypto_linux_amd64.syso
6363
echo DONE

‎src/crypto/internal/boring/build/build_in_chroot.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,8 @@ __umodti3:
183183
xorl %ecx, %ecx
184184
movl %ecx, 0(%ecx)
185185
jmp 1b
186+
187+
.section .note.GNU-stack,"",@progbits
186188
EOF
187189
clang-4.0 -c -o umod.o umod.s
188190

‎src/crypto/internal/boring/goboringcrypto_linux_amd64.syso‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)