aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-06-06 22:41:24 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2019-06-07 11:31:53 +0200
commit820515f324531251fd4eeb4798ab0df2bdc054a3 (patch)
tree80417402a0c2ed644d133d2eb822bb859ef2e505
parentconf: tick count is upstream now (diff)
downloadwireguard-windows-820515f324531251fd4eeb4798ab0df2bdc054a3.tar.xz
wireguard-windows-820515f324531251fd4eeb4798ab0df2bdc054a3.zip
firewall: GUID generation is now upstream
-rw-r--r--tunnel/firewall/blocker.go4
-rw-r--r--tunnel/firewall/helpers.go14
2 files changed, 2 insertions, 16 deletions
diff --git a/tunnel/firewall/blocker.go b/tunnel/firewall/blocker.go
index 605b47bf..7da391ca 100644
--- a/tunnel/firewall/blocker.go
+++ b/tunnel/firewall/blocker.go
@@ -50,11 +50,11 @@ func createWfpSession() (uintptr, error) {
func registerBaseObjects(session uintptr) (*baseObjects, error) {
bo := &baseObjects{}
var err error
- bo.provider, err = randGUID()
+ bo.provider, err = windows.GenerateGUID()
if err != nil {
return nil, wrapErr(err)
}
- bo.filters, err = randGUID()
+ bo.filters, err = windows.GenerateGUID()
if err != nil {
return nil, wrapErr(err)
}
diff --git a/tunnel/firewall/helpers.go b/tunnel/firewall/helpers.go
index 237a5f57..abb2684c 100644
--- a/tunnel/firewall/helpers.go
+++ b/tunnel/firewall/helpers.go
@@ -6,9 +6,7 @@
package firewall
import (
- "crypto/rand"
"fmt"
- "io"
"os"
"runtime"
"syscall"
@@ -136,15 +134,3 @@ func getCurrentProcessAppID() (*wtFwpByteBlob, error) {
}
return appID, nil
}
-
-func randGUID() (windows.GUID, error) {
- guid := windows.GUID{}
- n, err := rand.Read((*[16]byte)(unsafe.Pointer(&guid))[:])
- if err != nil {
- return guid, err
- }
- if n != 16 {
- return guid, io.ErrShortBuffer
- }
- return guid, nil
-}