Prepare release 0.2.4

jmckinlay · Sep 30, 2018 · dc6dc1f · dc6dc1f
1 parent 4807f21
commit dc6dc1f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -47,12 +47,13 @@ endif
             -ldflags "$(LDFLAGS)" \
 	    -o output/velociraptor.exe ./bin/
 
-darwin: required_assets gui_assets
-	GOOS=darwin GOARCH=amd64 \
-            go build \
+# Build using xgo for all supported platforms.
+xgo: required_assets gui_assets
+	xgo -out velociraptor-v0.2.4 -v \
+            --targets='windows/*,darwin/*,linux/*' \
             -tags release \
             -ldflags "$(LDFLAGS)" \
-	    -o output/velociraptor.darwin ./bin/
+	    ./bin/
 
 # Build release binaries. The GUI will embed assets and ship with
 # everything in it.

diff --git a/constants/constants.go b/constants/constants.go
@@ -1,7 +1,7 @@
 package constants
 
 var (
-	VERSION                    = "0.2.3"
+	VERSION                    = "0.2.4"
 	ENROLLMENT_WELL_KNOWN_FLOW = "aff4:/flows/E:Enrol"
 
 	// Temporary attribute

diff --git a/glob/accessor_darwin.go b/glob/accessor_darwin.go
@@ -24,22 +24,22 @@ func (self *OSFileInfo) FullPath() string {
 
 func (self *OSFileInfo) Mtime() TimeVal {
 	return TimeVal{
-		Sec:  self.sys().Mtimespec.Sec,
-		Nsec: self.sys().Mtimespec.Nsec,
+		Sec:  int64(self.sys().Mtimespec.Sec),
+		Nsec: int64(self.sys().Mtimespec.Nsec),
 	}
 }
 
 func (self *OSFileInfo) Ctime() TimeVal {
 	return TimeVal{
-		Sec:  self.sys().Ctimespec.Sec,
-		Nsec: self.sys().Ctimespec.Nsec,
+		Sec:  int64(self.sys().Ctimespec.Sec),
+		Nsec: int64(self.sys().Ctimespec.Nsec),
 	}
 }
 
 func (self *OSFileInfo) Atime() TimeVal {
 	return TimeVal{
-		Sec:  self.sys().Atimespec.Sec,
-		Nsec: self.sys().Atimespec.Nsec,
+		Sec:  int64(self.sys().Atimespec.Sec),
+		Nsec: int64(self.sys().Atimespec.Nsec),
 	}
 }
 

diff --git a/glob/accessor_linux.go b/glob/accessor_linux.go
@@ -30,22 +30,22 @@ func (self *OSFileInfo) FullPath() string {
 
 func (self *OSFileInfo) Mtime() TimeVal {
 	return TimeVal{
-		Sec:  self.sys().Mtim.Sec,
-		Nsec: self.sys().Mtim.Nsec,
+		Sec:  int64(self.sys().Mtim.Sec),
+		Nsec: int64(self.sys().Mtim.Nsec),
 	}
 }
 
 func (self *OSFileInfo) Ctime() TimeVal {
 	return TimeVal{
-		Sec:  self.sys().Ctim.Sec,
-		Nsec: self.sys().Ctim.Nsec,
+		Sec:  int64(self.sys().Ctim.Sec),
+		Nsec: int64(self.sys().Ctim.Nsec),
 	}
 }
 
 func (self *OSFileInfo) Atime() TimeVal {
 	return TimeVal{
-		Sec:  self.sys().Atim.Sec,
-		Nsec: self.sys().Atim.Nsec,
+		Sec:  int64(self.sys().Atim.Sec),
+		Nsec: int64(self.sys().Atim.Nsec),
 	}
 }
 

diff --git a/vql/windows/crypto.go b/vql/windows/crypto.go
@@ -12,10 +12,11 @@ import (
 	"crypto/sha1"
 	"crypto/x509"
 	"encoding/hex"
-	"github.com/mattn/go-pointer"
 	"strings"
 	"unicode/utf16"
 	"unsafe"
+
+	"github.com/mattn/go-pointer"
 	vql_subsystem "www.velocidex.com/golang/velociraptor/vql"
 	vfilter "www.velocidex.com/golang/vfilter"
 )
@@ -41,15 +42,15 @@ func cert_walker(cert *C.char, len C.int,
 	// Make a copy of the slice so windows may free its own copy.
 	der_cert := append(
 		[]byte{},
-		(*[1 << 30]byte)(unsafe.Pointer(cert))[0:len]...)
+		(*[1 << 10]byte)(unsafe.Pointer(cert))[0:len]...)
 
 	certificates, err := x509.ParseCertificates(der_cert)
 	if err != nil {
 		return
 	}
 
 	store_name := append([]uint16{},
-		(*[1 << 30]uint16)(unsafe.Pointer(store))[0:store_len]...)
+		(*[1 << 10]uint16)(unsafe.Pointer(store))[0:store_len]...)
 
 	result := pointer.Restore(unsafe.Pointer(ctx)).(*certContext)
 	for _, c := range certificates {