This fixes 6-digit tokencodes, PIN-less tokens, and the mlockall() dependency. It also adds native sdtid support, but that wouldn't be terribly helpful unless openconnect allowed users to pass in an XML file seed. Maybe at some point we should let users specify --token-secret=@/path/to/file like "curl --data". Signed-off-by: Kevin Cernekee <cernekee at gmail.com> --- android/0001-Remove-call-to-mlockall.patch | 33 ---------------------------- android/Makefile | 3 +-- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 android/0001-Remove-call-to-mlockall.patch diff --git a/android/0001-Remove-call-to-mlockall.patch b/android/0001-Remove-call-to-mlockall.patch deleted file mode 100644 index c09afb6..0000000 diff --git a/android/Makefile b/android/Makefile index 1e52992..ac67605 100644 --- a/android/Makefile +++ b/android/Makefile @@ -295,7 +295,7 @@ tomcrypt: $(TOMCRYPT_DEPS) # # Build libstoken # -STOKEN_VER := 0.2 +STOKEN_VER := 0.5 STOKEN_SRC := sources/stoken-$(STOKEN_VER) STOKEN_BUILD := $(TRIPLET)/stoken @@ -305,7 +305,6 @@ stoken-$(STOKEN_VER).tar.gz: $(STOKEN_SRC)/configure: stoken-$(STOKEN_VER).tar.gz mkdir -p sources tar xfz $< -C sources - cd $(STOKEN_SRC) && patch -p1 < ../../0001-Remove-call-to-mlockall.patch touch $@ $(STOKEN_BUILD)/Makefile: $(TOOLCHAIN_BUILT) $(STOKEN_SRC)/configure $(TOMCRYPT_DEPS) -- 1.7.9.5