Merge pull request #19674 from karalabe/usb-ios-fixup

vendor: pull fixed usb library for nocgo builds

vendor/github.com/karalabe/usb/AUTHORS

@@ -1,6 +1,7 @@
 Felix Lange <fjl@twurst.com>
 Guillaume Ballet <gballet@gmail.com>
 Jakob Weisblat <jakobw@yubico.com>
+Martin Holst Swende <martin@swende.se>
 Mateusz Mikołajczyk <mikolajczyk.mateusz@gmail.com>
 Péter Szilágyi <peterke@gmail.com>
 Rosen Penev <rosenp@gmail.com>

vendor/github.com/karalabe/usb/appveyor.yml

@@ -30,3 +30,6 @@ install:
 build_script:
   - go install ./...
   - go test -v ./...
+  - set CGO_ENABLED=0
+  - go install ./...
+  - go test -v ./...

vendor/github.com/karalabe/usb/hidapi/hidapi/hidapi.h

@@ -388,4 +388,3 @@ extern "C" {
 #endif
 
 #endif
-

vendor/github.com/karalabe/usb/hidapi/windows/hid.c

@@ -428,7 +428,7 @@ struct hid_device_info HID_API_EXPORT * HID_API_CALL hid_enumerate(unsigned shor
 			if (str) {
 				len = strlen(str);
 				cur_dev->path = (char*) calloc(len+1, sizeof(char));
-				strncpy(cur_dev->path, str, len+1);
+				strncpy(cur_dev->path, str, sizeof(cur_dev->path));
 				cur_dev->path[len] = '\0';
 			}
 			else

vendor/github.com/karalabe/usb/usb_disabled.go

@@ -27,20 +27,20 @@ func Supported() bool {
 // Enumerate returns a list of all the USB devices attached to the system which
 // match the vendor and product id. On platforms that this file implements the
 // function is a noop and returns an empty list always.
-func Enumerate(vendorID uint16, productID uint16) []DeviceInfo {
+func Enumerate(vendorID uint16, productID uint16) ([]DeviceInfo, error) {
-	return nil
+	return nil, nil
 }
 
 // EnumerateRaw returns a list of all the USB devices attached to the system which
 // match the vendor and product id. On platforms that this file implements the
 // function is a noop and returns an empty list always.
 func EnumerateRaw(vendorID uint16, productID uint16) ([]DeviceInfo, error) {
-	return nil
+	return nil, nil
 }
 
 // EnumerateHid returns a list of all the HID devices attached to the system which
 // match the vendor and product id. On platforms that this file implements the
 // function is a noop and returns an empty list always.
 func EnumerateHid(vendorID uint16, productID uint16) ([]DeviceInfo, error) {
-	return nil
+	return nil, nil
 }

vendor/vendor.json

@@ -267,10 +267,10 @@
 			"revisionTime": "2017-04-30T22:20:11Z"
 		},
 		{
-			"checksumSHA1": "3v8Z4/daUVp9PCcFzEGYVkPadG8=",
+			"checksumSHA1": "0ixnoiChdbeva2xNe3z/vYzqcL4=",
 			"path": "github.com/karalabe/usb",
-			"revision": "c012609e094b8a96375fee53cc11f1bcd5cf3aa2",
+			"revision": "0efdeddd92369dc00d4fb1b9cd56a442bdb61f82",
-			"revisionTime": "2019-06-04T10:57:36Z",
+			"revisionTime": "2019-06-06T09:23:27Z",
 			"tree": true
 		},
 		{