Skip to content

Commit f7306c4

Browse files
committed
Add pledge(2) support when built for OpenBSD
While here, update dependencies and the module version, so the new //go:build syntax may be used.
1 parent de8d7aa commit f7306c4

File tree

5 files changed

+34
-17
lines changed

5 files changed

+34
-17
lines changed

go.mod

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
module github.com/jrick/ss
22

3-
go 1.16
3+
go 1.17
44

55
require (
6-
github.com/companyzero/sntrup4591761 v0.0.0-20190320150934-1ea2d0911e48
7-
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
8-
golang.org/x/sys v0.0.0-20200808120158-1030fc2bf1d9 // indirect
6+
github.com/companyzero/sntrup4591761 v0.0.0-20200131011700-2b0d299dbd22
7+
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
8+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1
99
)
10+
11+
require golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect

go.sum

+12-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
github.com/companyzero/sntrup4591761 v0.0.0-20190320150934-1ea2d0911e48 h1:5J5+W6LVdeJeHzqrNARVzXGD/u0jqZ+yiFYWhkHMnts=
2-
github.com/companyzero/sntrup4591761 v0.0.0-20190320150934-1ea2d0911e48/go.mod h1:mqO8bOUjFw4AUP6X5CFkXV4IZJXnDy7oghYhbVsDb2M=
3-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
4-
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g=
5-
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
6-
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
7-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
8-
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
9-
golang.org/x/sys v0.0.0-20200808120158-1030fc2bf1d9 h1:yi1hN8dcqI9l8klZfy4B8mJvFmmAxJEePIQQFNSd7Cs=
10-
golang.org/x/sys v0.0.0-20200808120158-1030fc2bf1d9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
11-
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM=
12-
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
13-
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
1+
github.com/companyzero/sntrup4591761 v0.0.0-20200131011700-2b0d299dbd22 h1:vfqLMkB1UqwJliW0I/34oscQawInrVfL1uPjGEEt2YY=
2+
github.com/companyzero/sntrup4591761 v0.0.0-20200131011700-2b0d299dbd22/go.mod h1:LoZJNGDWmVPqMEHmeJzj4Weq4Stjc6FKY6FVpY3Hem0=
3+
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
4+
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
5+
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
6+
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
7+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
8+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
9+
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
10+
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
11+
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
12+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

pledge_openbsd.go

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package main
2+
3+
import "golang.org/x/sys/unix"
4+
5+
func pledge(promises string) error {
6+
return unix.PledgePromises(promises)
7+
}

pledge_stubs.go

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
//go:build ignore
2+
3+
package main
4+
5+
func pledge(promises string) error {
6+
return nil
7+
}

ss.go

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ func init() {
3838
}
3939

4040
func main() {
41+
pledge("stdio rpath wpath cpath getpw tty")
42+
4143
flag.Parse() // for -h usage
4244
if len(os.Args) < 2 { // one command is required
4345
usage()

0 commit comments

Comments
 (0)