diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | wrappers/php/Makefile | 2 | ||||
| -rw-r--r-- | wrappers/python/eduvpncommon/discovery.py | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -14,7 +14,7 @@ WRAPPERS ?= $(notdir $(patsubst %/,%,$(wildcard wrappers/*/))) test-wrappers: build $(MAKE) $(foreach wrapper,$(WRAPPERS),.test-$(wrapper)) -clean: .clean_libs $(foreach wrapper,$(WRAPPERS),.clean-$(wrapper)) +clean: .clean-libs $(foreach wrapper,$(WRAPPERS),.clean-$(wrapper)) .clean-libs: $(MAKE) -C exports clean diff --git a/wrappers/php/Makefile b/wrappers/php/Makefile index 758cfe3..89b9759 100644 --- a/wrappers/php/Makefile +++ b/wrappers/php/Makefile @@ -36,7 +36,7 @@ test: install-header install-dev-dependencies composers = composer composer.phar ./composer ./composer.phar # Find first composer from list above, default to 'composer' -find_composer = $(firstword $(foreach bin,$(composers),$(if $(shell command -v $(bin)),$(bin),)) composer) +find_composer = $(firstword $(foreach bin,$(composers),$(if $(shell command -v $(bin) 2>/dev/null),$(bin),)) composer) # Lazy variable: https://blog.jgc.org/2016/07/lazy-gnu-make-variables.html COMPOSER ?= $(eval COMPOSER := $(find_composer))$(COMPOSER) diff --git a/wrappers/python/eduvpncommon/discovery.py b/wrappers/python/eduvpncommon/discovery.py index 50bcc9e..34a03ba 100644 --- a/wrappers/python/eduvpncommon/discovery.py +++ b/wrappers/python/eduvpncommon/discovery.py @@ -29,7 +29,7 @@ class _GoSlice(Structure): return _GoSlice((c_char * len(bs))(*bs), len(bs), len(bs)) -_lib.Verify.argtypes, _lib.Verify.restype = [_GoSlice, _GoSlice, _GoSlice, c_uint64], c_int64 +_lib.Verify.argtypes, _lib.Verify.restype = [_GoSlice, _GoSlice, _GoSlice, c_uint64], c_int8 _lib.InsecureTestingSetExtraKey.argtypes, _lib.InsecureTestingSetExtraKey.restype = [_GoSlice], None |