.gitignore

@@ -1,12 +0,0 @@
-VisualStudio/
-bin/
-build/
-buildroot-configs/
-floppy/
-hotbird64-mass-build/
-lib/
-src/VisualStudio-Linux-Remote/
-*.vcxproj*
-*.html
-*.pdf
-*.txt

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "debian"]
-	path = debian
-	url = https://github.com/Wind4/vlmcsd-debian.git
-[submodule "docker"]
-	path = docker
-	url = https://github.com/Wind4/vlmcsd-docker.git

GNUmakefile

@@ -1,19 +1,32 @@
-.NOTPARALLEL:
+################################################################################
 
-MAX_THREADS ?= 16
+.PHONY: clean
 
-PROGRAM_NAME ?= bin/vlmcsd
-CLIENT_NAME ?= bin/vlmcs
-MULTI_NAME ?= bin/vlmcsdmulti
-OBJ_NAME ?= build/libkms-static.o
-A_NAME ?= lib/libkms.a
+PROGRAM_NAME ?= vlmcsd
+CLIENT_NAME ?= vlmcs
+MULTI_NAME ?= vlmcsdmulti
+OBJ_NAME ?= libkms-static.o
+A_NAME ?= libkms.a
+CONFIG ?= config.h
+COMPILER_LANGUAGE ?= c
 
-BASE_PROGRAM_NAME=$(notdir $(PROGRAM_NAME))
-BASE_CLIENT_NAME=$(notdir $(CLIENT_NAME))
-BASE_MULTI_NAME=$(notdir $(MULTI_NAME))
-BASE_DLL_NAME=$(notdir $(DLL_NAME))
-BASE_A_NAME=$(notdir $(A_NAME))
+# crypto library to use for standard algos, could save ~1-2kb ;)
+# can be either 'openssl', 'polarssl' or anything other for internal impl
+CRYPTO ?= internal
 
+# use DNS_PARSER=internal if your OS doesn't supply the DNS parser routines
+DNS_PARSER ?= OS
+
+# You should supply your own version string here
+
+VLMCSD_VERSION ?= $(shell test -d .svn && echo svn`svnversion`)
+
+FEATURES ?= full
+VERBOSE ?= NO
+
+################################################################################
+
+CC ?= gcc
 TARGETPLATFORM := $(shell LANG=en_US.UTF-8 $(CC) -v 2>&1 | grep '^Target: ' | cut -f 2 -d ' ')
 
 ifneq (,$(findstring darwin,$(TARGETPLATFORM)))
@@ -93,63 +106,490 @@ endif
 endif
 
 ifeq ($(CYGWIN),1)
-  DLL_NAME ?= lib/cygkms.dll
+  DLL_NAME ?= cygkms.dll
 else ifeq ($(WIN),1)
-  DLL_NAME ?= lib/libkms.dll
+  DLL_NAME ?= libkms.dll
 else ifeq ($(DARWIN),1)
-  DLL_NAME ?= lib/libkms.dylib
+  DLL_NAME ?= libkms.dylib
 else
-  DLL_NAME ?= lib/libkms.so
+  DLL_NAME ?= libkms.so
 endif
 
-.DEFAULT:
-	+@(test -d bin || mkdir bin) & (test -d lib || mkdir lib) & (test -d build || mkdir build)
-	+@$(MAKE) -j$(MAX_THREADS) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME)
+BASECFLAGS = -DVLMCSD_COMPILER=\"$(notdir $(CC))\" -DVLMCSD_PLATFORM=\"$(TARGETPLATFORM)\" -DCONFIG=\"$(CONFIG)\" -DBUILD_TIME=$(shell date '+%s') -g -Os -fno-strict-aliasing -fomit-frame-pointer -ffunction-sections -fdata-sections
+BASELDFLAGS = 
+STRIPFLAGS =
+CLIENTLDFLAGS =
+SERVERLDFLAGS =
 
-all:
-	+@(test -d bin || mkdir bin) & (test -d lib || mkdir lib) & (test -d build || mkdir build)
-	+@$(MAKE) -j$(MAX_THREADS) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME)
+ifndef SAFE_MODE
+  BASECFLAGS += -fvisibility=hidden -pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants
+  
+  ifeq ($(ELF),1)
+    BASELDFLAGS += -Wl,-z,norelro
+  endif
+
+  ifneq (,$(findstring gcc,$(notdir $(CC))))
+    BASECFLAGS += -flto
+  endif
+
+endif
+
+ifeq ($(NOLIBS),1)
+  NOLRESOLV=1
+  NOLPTHREAD=1
+endif
+
+ifneq ($(NOLIBS),1)
+  ifeq ($(MINGW),1)
+    BASELDFLAGS += -lws2_32 -liphlpapi
+  endif
+endif 
+
+ifneq ($(NO_DNS),1)
+  ifneq ($(ANDROID),1)
+  ifneq ($(NOLRESOLV),1)
+
+    ifeq ($(MINGW),1)
+      CLIENTLDFLAGS += -ldnsapi
+    endif
+
+    ifeq ($(LINUX),1)
+      CLIENTLDFLAGS += -lresolv
+    endif
+
+    ifeq ($(HURD),1)
+      CLIENTLDFLAGS += -lresolv
+    endif
+
+    ifeq ($(DARWIN),1)
+      CLIENTLDFLAGS += -lresolv
+    endif
+
+    ifeq ($(CYGWIN),1)
+      DNS_PARSER := internal
+      CLIENTLDFLAGS += -lresolv
+    endif
+
+    ifeq ($(OPENBSD),1)
+      DNS_PARSER := internal
+    endif
+
+    ifeq ($(SOLARIS),1)
+      CLIENTLDFLAGS += -lresolv
+    endif
+
+  endif
+  endif
+else
+  BASECFLAGS += -DNO_DNS
+endif 
+
+ifneq ($(CAT),2)
+  BASECFLAGS += "-Wall"
+endif  
+
+ifeq ($(DARWIN), 1)
+  STRIPFLAGS += -Wl,-S -Wl,-x
+  BASECFLAGS += -Wno-deprecated-declarations
+else ifeq ($(shell uname), SunOS)
+  STRIPFLAGS += -s
+  ifeq ($(notdir $(LD_ALTEXEC)),gld)
+    BASELDFLAGS += -Wl,--gc-sections
+  endif
+  BASELDFLAGS += -lsocket
+else
+  ifneq ($(CC),tcc)
+  	BASELDFLAGS += -Wl,--gc-sections
+  endif
+  STRIPFLAGS += -s
+endif
+
+LIBRARY_CFLAGS = -DSIMPLE_SOCKETS -DNO_TIMEOUT -DNO_SIGHUP -DNO_CL_PIDS -DNO_EXTENDED_PRODUCT_LIST -DNO_BASIC_PRODUCT_LIST -DNO_LOG -DNO_RANDOM_EPID -DNO_INI_FILE -DNO_INI_FILE -DNO_HELP -DNO_CUSTOM_INTERVALS -DNO_PID_FILE -DNO_USER_SWITCH -DNO_VERBOSE_LOG -DNO_LIMIT -DNO_VERSION_INFORMATION -DNO_PRIVATE_IP_DETECT
+
+ifeq ($(FEATURES), embedded)
+  BASECFLAGS += -DNO_HELP -DNO_USER_SWITCH -DNO_BASIC_PRODUCT_LIST -DNO_CUSTOM_INTERVALS -DNO_PID_FILE -DNO_VERBOSE_LOG -DNO_VERSION_INFORMATION
+else ifeq ($(FEATURES), autostart)
+  BASECFLAGS += -DNO_HELP -DNO_VERSION_INFORMATION
+else ifeq ($(FEATURES), minimum)
+  BASECFLAGS += $(LIBRARY_CFLAGS)
+else ifeq ($(FEATURES), most)
+  BASECFLAGS += -DNO_SIGHUP -DNO_PID_FILE -DNO_LIMIT
+else ifeq ($(FEATURES), inetd)
+  BASECFLAGS += -DNO_SIGHUP -DNO_SOCKETS -DNO_PID_FILE -DNO_LIMIT -DNO_VERSION_INFORMATION
+else ifeq ($(FEATURES), fixedepids)
+  BASECFLAGS += -DNO_SIGHUP -DNO_CL_PIDS -DNO_RANDOM_EPID -DNO_INI_FILE
+endif
+
+ifdef INI
+  BASECFLAGS += -DINI_FILE=\"$(INI)\"
+endif
+
+ifeq ($(NO_GETIFADDRS), 1)
+  BASECFLAGS += -DNO_GETIFADDRS
+endif
+
+ifeq ($(THREADS), 1)
+  BASECFLAGS += -DUSE_THREADS
+endif
+
+ifeq ($(CHILD_HANDLER), 1)
+  BASECFLAGS += -DCHILD_HANDLER
+endif
+
+ifeq ($(NO_TIMEOUT), 1)
+  BASECFLAGS += -DNO_TIMEOUT
+endif
+
+ifdef WINDOWS
+  BASECFLAGS += -DEPID_WINDOWS=\"$(WINDOWS)\"
+endif
+
+ifdef OFFICE2010
+  BASECFLAGS += -DEPID_OFFICE2010=\"$(OFFICE2010)\"
+endif
+
+ifdef OFFICE2013
+  BASECFLAGS += -DEPID_OFFICE2013=\"$(OFFICE2013)\"
+endif
+
+ifdef HWID
+  BASECFLAGS += -DHWID=$(HWID)
+endif
+
+ifdef TERMINAL_WIDTH
+  BASECFLAGS += -DTERMINAL_FIXED_WIDTH=$(TERMINAL_WIDTH) -DDISPLAY_WIDTH=\"$(TERMINAL_WIDTH)\"
+endif
+
+ifeq ($(NOPROCFS), 1)
+  BASECFLAGS += -DNO_PROCFS
+endif
+
+ifeq ($(AUXV), 1)
+  BASECFLAGS += -DUSE_AUXV
+endif
+
+ifneq ($(ANDROID), 1)
+ifneq ($(MINIX), 1)
+ifneq ($(NOLPTHREAD), 1)
+
+  ifeq ($(THREADS), 1)
+    SERVERLDFLAGS += -lpthread
+  endif
+  
+  ifeq (,$(findstring NO_LIMIT,$(CFLAGS) $(BASECFLAGS)))  
+    SERVERLDFLAGS += -lpthread
+  endif
+
+endif
+endif
+endif
+
+$(MULTI_NAME): BASECFLAGS += -DMULTI_CALL_BINARY=1
+
+all: $(CLIENT_NAME) $(PROGRAM_NAME)
+
+#ifdef CAT
+  allmulti: $(CLIENT_NAME) $(PROGRAM_NAME) $(MULTI_NAME)
+#endif
+
+ifneq ($(strip $(VLMCSD_VERSION)),)
+  BASECFLAGS += -DVERSION=\"$(VLMCSD_VERSION),\ built\ $(shell date -u '+%Y-%m-%d %H:%M:%S' | sed -e 's/ /\\ /g')\ UTC\" 
+endif
+
+ifdef CAT
+  BASECFLAGS += -DONE_FILE
+endif
+
+SRCS = crypto.c kms.c endian.c output.c shared_globals.c helpers.c
+HEADERS = $(CONFIG) types.h rpc.h vlmcsd.h endian.h crypto.h kms.h network.h output.h shared_globals.h vlmcs.h helpers.h
+DEPS = $(MULTI_SRCS:.c=.d)
+
+VLMCSD_SRCS = vlmcsd.c $(SRCS)
+VLMCSD_OBJS = $(VLMCSD_SRCS:.c=.o)
+
+VLMCS_SRCS = vlmcs.c $(SRCS)
+VLMCS_OBJS = $(VLMCS_SRCS:.c=.o)
+
+MULTI_SRCS = vlmcsd.c vlmcs.c vlmcsdmulti.c $(SRCS)
+MULTI_OBJS = $(SRCS:.c=.o) vlmcsd-m.o vlmcs-m.o vlmcsdmulti-m.o
+
+DLL_SRCS = libkms.c $(SRCS)
+DLL_OBJS = $(DLL_SRCS:.c=.o)
+
+PDFDOCS = vlmcs.1.pdf vlmcsd.7.pdf vlmcsd.8.pdf vlmcsdmulti.1.pdf vlmcsd.ini.5.pdf vlmcsd-floppy.7.pdf
+HTMLDOCS = $(PDFDOCS:.pdf=.html)
+UNIXDOCS = $(PDFDOCS:.pdf=.unix.txt)
+DOSDOCS = $(PDFDOCS:.pdf=.dos.txt)
+
+ifneq ($(NO_DNS),1)
+
+  VLMCS_SRCS += dns_srv.c
+  MULTI_SRCS += dns_srv.c
+  MULTI_OBJS += dns_srv.o
+
+ifeq ($(DNS_PARSER),internal)
+ifneq ($(MINGW),1)
+  VLMCS_SRCS += ns_parse.c ns_name.c
+  MULTI_SRCS += ns_parse.c ns_name.c
+  MULTI_OBJS += ns_parse.o ns_name.o
+  BASECFLAGS += "-DDNS_PARSER_INTERNAL"
+endif
+endif
+
+endif
+
+ifeq ($(MSRPC),1)
+  VLMCSD_SRCS += msrpc-server.c
+  VLMCS_SRCS += msrpc-client.c
+  MULTI_SRCS += msrpc-server.c msrpc-client.c
+  MULTI_OBJS += msrpc-server-m.o msrpc-client-m.o
+  DLL_SRCS += msrpc-server.c
+  BASECFLAGS += -DUSE_MSRPC -Wno-unknown-pragmas
+  BASELDFLAGS += -lrpcrt4
+else
+  SRCS += network.c rpc.c  
+endif
+
+ifeq ($(GETIFADDRS),musl)
+ifneq ($(NO_GETIFADDRS),1)
+  BASECFLAGS += -DGETIFADDRS_MUSL
+  VLMCSD_SRCS += getifaddrs-musl.c
+  MULTI_SRCS += getifaddrs-musl.c
+  VLMCS_SRCS += getifaddrs-musl.c
+  DLL_SRCS += getifaddrs-musl.c
+  MULTI_OBJS += getifaddrs-musl.o
+endif
+endif
+
+ifeq ($(ANDROID),1)
+ifneq ($(NO_GETIFADDRS),1)
+  VLMCSD_SRCS += ifaddrs-android.c
+  MULTI_SRCS += ifaddrs-android.c
+  DLL_SRCS += ifaddrs-android.c
+  MULTI_OBJS += ifaddrs-android.o
+endif
+endif
+
+ifeq "$(WIN)" "1"
+	VLMCSD_SRCS += ntservice.c
+	MULTI_SRCS += ntservice.c
+	MULTI_OBJS += ntservice.o
+endif
+
+ifeq ($(CRYPTO), openssl_with_aes)
+	BASECFLAGS += -D_CRYPTO_OPENSSL -D_USE_AES_FROM_OPENSSL
+	BASELDFLAGS += -lcrypto
+	SRCS += crypto_openssl.c
+else ifeq ($(CRYPTO), openssl_with_aes_soft)
+	BASECFLAGS += -D_CRYPTO_OPENSSL -D_USE_AES_FROM_OPENSSL -D_OPENSSL_SOFTWARE
+	BASELDFLAGS += -lcrypto
+	SRCS += crypto_openssl.c
+else ifeq ($(CRYPTO), openssl)
+	BASECFLAGS += -D_CRYPTO_OPENSSL
+	BASELDFLAGS += -lcrypto
+	SRCS += crypto_openssl.c
+else ifeq ($(CRYPTO), polarssl)
+	BASECFLAGS += -D_CRYPTO_POLARSSL
+	BASELDFLAGS += -lpolarssl
+else ifeq ($(CRYPTO), windows)
+	BASECFLAGS += -D_CRYPTO_WINDOWS
+	SRCS += crypto_windows.c
+else
+	BASECFLAGS += -D_CRYPTO_INTERNAL
+	SRCS += crypto_internal.c
+endif
+
+ifneq ($(STRIP),0)
+	BASELDFLAGS += $(STRIPFLAGS)
+endif
+
+ifeq ($(OPENSSL_HMAC),0)
+	BASECFLAGS += -D_OPENSSL_NO_HMAC
+endif
+
+ifeq ($(DEPENDENCIES),2)
+    BASECFLAGS += -MMD
+endif
+
+ifeq ($(VERBOSE),3)
+    COMPILER := $(shell printf "%-40s" $(notdir $(CC)))
+    ARCHIVER := $(shell printf "%-40s" $(notdir $(AR)))
+endif
+
+ARCMD := AR
+
+ifdef CAT
+    LDCMD := CC/LD
+else
+    LDCMD := LD    
+endif
+
+-include $(MULTI_SRCS:.c=.d)
+
+%.o: %.c 
+  ifeq ($(VERBOSE),1)
+	$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -c $<
+  ifeq ($(DEPENDENCIES),1)
+	$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -MM -MF $*.d $<
+  endif
+  else
+	@echo "$(COMPILER)	CC	$@ <- $<"
+	@$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -c $<
+  ifeq ($(DEPENDENCIES),1)
+	@echo "$(COMPILER)	DEP	$*.d <- $<"
+	@$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -MM -MF $*.d $<
+  endif
+  endif
+
+%-m.o: %.c
+  ifeq ($(VERBOSE),1)
+	$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -o $@ -c $<
+  ifeq ($(DEPENDENCIES),1)
+	$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -MM -MF $*.d $<
+  endif
+  else
+	@echo "$(COMPILER)	CC	$@ <- $<"
+	@$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -o $@ -c $<
+  ifeq ($(DEPENDENCIES),1)
+	@echo "$(COMPILER)	DEP	$*.d <- $<"
+	@$(CC) -x$(COMPILER_LANGUAGE) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(PLATFORMFLAGS) -MM -MF $*.d $<
+  endif
+  endif
+
+
+ifdef CAT
+  BUILDCOMMAND = cat $^ | $(CC) -x$(COMPILER_LANGUAGE) -o $@ -
+  VLMCSD_PREREQUISITES = $(VLMCSD_SRCS)
+  VLMCS_PREREQUISITES = $(VLMCS_SRCS)
+  MULTI_PREREQUISITES = $(MULTI_SRCS)
+  DLL_PREREQUISITES = $(DLL_SRCS)
+  OBJ_PREREQUISITES = $(DLL_SRCS)
+else
+  BUILDCOMMAND = $(CC) -o $@ $^
+  VLMCSD_PREREQUISITES = $(VLMCSD_OBJS)
+  VLMCS_PREREQUISITES = $(VLMCS_OBJS)
+  MULTI_PREREQUISITES = $(MULTI_OBJS)
+  DLL_PREREQUISITES = $(DLL_OBJS)
+  OBJ_PREREQUISITES = $(DLL_OBJS)
+endif
+
+ifeq ($(VERBOSE),1)
+  BUILDCOMMANDPREFIX = +
+else
+  BUILDCOMMANDPREFIX = +@
+endif
+
+INFOCOMMAND = +@echo "$(COMPILER)	$(LDCMD)	$@ <- $^"
+ARINFOCOMMAND = +@echo "$(ARCHIVER)	$(ARCMD)	$@ <. $^"
+
+VLMCSD_COMMAND = $(BUILDCOMMANDPREFIX)$(BUILDCOMMAND) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS) $(SERVERLDFLAGS)
+VLMCS_COMMAND = $(BUILDCOMMANDPREFIX)$(BUILDCOMMAND) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS) $(CLIENTLDFLAGS)
+MULTI_COMMAND = $(BUILDCOMMANDPREFIX)$(BUILDCOMMAND) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS) $(CLIENTLDFLAGS) $(SERVERLDFLAGS)
+DLL_COMMAND = $(BUILDCOMMANDPREFIX)$(BUILDCOMMAND) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS) $(SERVERLDFLAGS) -fvisibility=hidden -shared -DIS_LIBRARY=1 $(LIBRARY_CFLAGS) -UNO_SOCKETS -UUSE_MSRPC
+OBJ_COMMAND = $(BUILDCOMMANDPREFIX)$(BUILDCOMMAND) $(PLATFORMFLAGS) $(BASECFLAGS) $(CFLAGS) $(BASELDFLAGS) $(LDFLAGS) $(SERVERLDFLAGS) -fvisibility=hidden -c -DIS_LIBRARY=1 $(LIBRARY_CFLAGS) -UNO_SOCKETS -UUSE_MSRPC
+  
+$(PROGRAM_NAME): $(VLMCSD_PREREQUISITES)
+  ifneq ($(VERBOSE),1)
+	$(INFOCOMMAND)
+  endif
+	$(VLMCSD_COMMAND)
+
+$(CLIENT_NAME): $(VLMCS_PREREQUISITES)
+  ifneq ($(VERBOSE),1)
+	$(INFOCOMMAND)
+  endif
+	$(VLMCS_COMMAND)
+
+$(MULTI_NAME): $(MULTI_PREREQUISITES)
+  ifneq ($(VERBOSE),1)
+	$(INFOCOMMAND)
+  endif
+	$(MULTI_COMMAND)
+
+$(DLL_NAME): $(DLL_PREREQUISITES)
+  ifneq ($(VERBOSE),1)
+	$(INFOCOMMAND)
+  endif
+	$(DLL_COMMAND)
+
+ifndef CAT
+$(OBJ_NAME):
+	+@echo Cannot make $@ without CAT defined. Please create $(A_NAME)
+else
+$(OBJ_NAME): $(OBJ_PREREQUISITES)
+  ifneq ($(VERBOSE),1)
+	$(INFOCOMMAND)
+  endif
+	$(OBJ_COMMAND)
+endif
+
+ifdef CAT
+$(A_NAME): $(OBJ_NAME)
+else
+$(A_NAME): BASECFLAGS += -fvisibility=hidden -DIS_LIBRARY=1 $(LIBRARY_CFLAGS) -UNO_SOCKETS -UUSE_MSRPC
+$(A_NAME): $(DLL_OBJS)
+endif
+  ifneq ($(VERBOSE),1)
+	$(ARINFOCOMMAND)
+  endif
+	+@rm -f $@
+	$(BUILDCOMMANDPREFIX)$(AR) rcs $@ $^
+
+%.pdf : %
+  ifeq ($(shell uname), Darwin)
+	groff -Tps -mandoc -c $< | pstopdf -i -o $@
+  else
+	groff -Tpdf -mandoc -c $< > $@
+  endif
+
+%.html : %
+	groff -Thtml -mandoc -c $< > $@ 
+
+%.unix.txt : %
+	groff -P -c -Tutf8 -mandoc -c $< | col -bx > $@
+
+%.dos.txt : %.unix.txt
+#	unix2dos -n $< $@
+#	sed -e 's/$$/\r/' $< > $@
+	awk 'sub("$$", "\r")' $< > $@
+
+pdfdocs : $(PDFDOCS)
+
+dosdocs : $(DOSDOCS)
+
+unixdocs : $(UNIXDOCS)
+
+htmldocs : $(HTMLDOCS)
+
+alldocs : $(UNIXDOCS) $(HTMLDOCS) $(PDFDOCS) $(DOSDOCS)
 
 clean:
-	+@$(MAKE) -j$(MAX_THREADS) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME)
-	+@$(MAKE) -j$(MAX_THREADS) -C man $@
+	rm -f *.o *.d *_all.c libkms_all_*.c $(PROGRAM_NAME) $(MULTI_NAME) $(DLL_NAME) $(CLIENT_NAME) $(PDFDOCS) $(DOSDOCS) $(UNIXDOCS) $(HTMLDOCS) $(OBJ_NAME) $(A_NAME) *.a
 
-alldocs:
-	+@$(MAKE) -j$(MAX_THREADS) -C man $@
-
-dosdocs:
-	+@$(MAKE) -j$(MAX_THREADS) -C man $@
-
-unixdocs:
-	+@$(MAKE) -j$(MAX_THREADS) -C man $@
-
-htmldocs:
-	+@$(MAKE) -j$(MAX_THREADS) -C man $@
-
-pdfdocs:
-	+@$(MAKE) -j$(MAX_THREADS) -C man $@
-
-GNUmakefile:
+dnsclean:
+	rm -f dns_srv.o
 
 help:
 	@echo "Type"
-	@echo "    ${MAKE}               - to build $(BASE_PROGRAM_NAME) and $(BASE_CLIENT_NAME)"
-	@echo "    ${MAKE} clean         - to remove all targets and temporary files"
-	@echo "    ${MAKE} pdfdocs       - Create PDF versions of the documentation (Requires groff with PDF support)."
-	@echo "    ${MAKE} htmldocs      - Create HTML versions of the documentation."
-	@echo "    ${MAKE} unixdocs      - Create Unix TXT versions of the documentation."
-	@echo "    ${MAKE} dosdocs       - Create DOS/Windows TXT versions of the documentation."
-	@echo "    ${MAKE} alldocs       - Create all versions of the documentation."
-	@echo "    ${MAKE} vlmcsd        - to build KMS server $(PROGRAM_NAME)"
-	@echo "    ${MAKE} vlmcs         - to build KMS client $(CLIENT_NAME)"
-	@echo "    ${MAKE} vlmcsdmulti   - to build $(BASE_PROGRAM_NAME) and $(BASE_CLIENT_NAME) in a single multi-call binary $(MULTI_NAME)"
-	@echo "    ${MAKE} libkms        - to build the shared library $(DLL_NAME)"
-	@echo "    ${MAKE} libkms-static - to build the static library $(A_NAME)"
+	@echo "    ${MAKE}          - to build $(PROGRAM_NAME) and $(CLIENT_NAME)"
+	@echo "    ${MAKE} clean    - to remove $(PROGRAM_NAME) and $(CLIENT_NAME)"
+	@echo "    ${MAKE} help     - to see this help"
+	@echo "    ${MAKE} pdfdocs  - Create PDF versions of the documentation (Requires groff with PDF support)."
+	@echo "    ${MAKE} htmldocs - Create HTML versions of the documentation."
+	@echo "    ${MAKE} unixdocs - Create Unix TXT versions of the documentation."
+	@echo "    ${MAKE} dosdocs  - Create DOS/Windows TXT versions of the documentation."
+	@echo "    ${MAKE} alldocs  - Create all versions of the documentation."
+	@echo "    ${MAKE} -j <x>   - Use <x> parallel tasks (SMP support) when compiling $(PROGRAM_NAME) and $(CLIENT_NAME)"
+	@echo ""
+	@echo "    ${MAKE} $(PROGRAM_NAME) - to build the server only."
+	@echo "    ${MAKE} $(CLIENT_NAME) - to build the client only."
+	@echo "    ${MAKE} $(MULTI_NAME) - to build $(PROGRAM_NAME) and $(CLIENT_NAME) in a single multi-call binary"
+	@echo "    ${MAKE} $(DLL_NAME) - to build the shared library $(DLL_NAME)"
+	@echo "    ${MAKE} $(A_NAME) - to build the static library $(A_NAME)"
 	@echo ""
 	@echo "Options"
 	@echo "    CONFIG=<x>                   Compile <x> as instead of config.h."
-	@echo "    INI=<x>                      Compile $(BASE_PROGRAM_NAME) with default ini file <x>"
-	@echo "    DATA=<x>                     Compile $(BASE_PROGRAM_NAME) and $(BASE_CLIENT_NAME) with default KMS data file <x>"
+	@echo "    INI=<x>                      Compile $(PROGRAM_NAME) with default ini file <x>"
 	@echo "    PROGRAM_NAME=<x>             Use <x> as output file name for the KMS server. Defaults to vlmcsd."
 	@echo "    CLIENT_NAME=<x>              Use <x> as output file name for the KMS client. Defaults to vlmcs."
 	@echo "    MULTI_NAME=<x>               Use <x> as output file name for the multi-call binary. Defaults to vlmcsdmulti."
@@ -161,7 +601,7 @@ help:
 	@echo "    CRYPTO=windows               Use Windows CryptoAPI instead of internal crypto code for SHA256/HMAC calculations."
 	@echo "    MSRPC=1                      Use Microsoft RPC instead of vlmcsd's internal RPC. Only works with Windows and Cygwin targets."
 	@echo "    CC=<x>                       Use compiler <x>. Supported compilers are gcc, icc, tcc and clang. Others may or may not work."
-	@echo "    AR=<x>                       Use <x> instead of ar to build $(BASE_A_NAME). Set to gcc-ar if you want to use gcc's LTO feature."
+	@echo "    AR=<x>                       Use <x> instead of ar to build $(A_NAME). Set to gcc-ar if you want to use gcc's LTO feature."
 	@echo "    COMPILER_LANGUAGE=<x>        May be c or c++."
 	@echo "    TERMINAL_WIDTH=<x>           Assume a fixed terminal width of <x> columns. Use in case of problems only."  
 	@echo "    VLMCSD_VERSION=<x>           Sets <x> as your version identifier. Defaults to \"private build\"."
@@ -170,24 +610,27 @@ help:
 	@echo "    PLATFORMFLAGS=<x>            Pass <x> as additional arguments to the compiler and the linker."
 	@echo "    BASECFLAGS=<x>               Pass only <x> as arguments to the compiler (advanced users only)."
 	@echo "    BASELDFLAGS=<x>              Pass only <x> as arguments to the linker (advanced users only)."
-	@echo "    STRIP=0                      Don't strip debug information from $(BASE_PROGRAM_NAME) and $(BASE_CLIENT_NAME) (for developers)."
+	@echo "    STRIP=0                      Don't strip debug information from $(PROGRAM_NAME) and $(CLIENT_NAME) (for developers)."
 	@echo "    VERBOSE=1                    Be verbose when making targets."
 	@echo "    VERBOSE=3                    Show name of compiler."
 	@echo "    THREADS=1                    Use threads instead of fork(). Automatically set for native Windows. Recommended for Cygwin."
+	@echo "    WINDOWS=<x>                  Use <x> as the default ePID for Windows (when using $(PROGRAM_NAME) with -r 0)."
+	@echo "    OFFICE2010=<x>               Use <x> as the default ePID for Office2010 (when using $(PROGRAM_NAME) with -r 0)."
+	@echo "    OFFICE2013=<x>               Use <x> as the default ePID for Office2013 (when using $(PROGRAM_NAME) with -r 0)."
 	@echo "    HWID=<x>                     Use <x> as the default HWID (when it can't be found in an ini file)."
-	@echo "    FEATURES=full                Compile $(BASE_PROGRAM_NAME) with all features (default)."
-	@echo "    FEATURES=most                Compile $(BASE_PROGRAM_NAME) without rarely used features."
-	@echo "    FEATURES=embedded            Compile $(BASE_PROGRAM_NAME) with typical features for embedded systems."
-	@echo "    FEATURES=autostart           Removes features typically not needed if you place $(BASE_PROGRAM_NAME) in an autostart script."
-	@echo "    FEATURES=inetd               Compile $(BASE_PROGRAM_NAME) for running through an internet superserver only."
-	@echo "    FEATURES=minimum             Compiles only basic features of $(BASE_PROGRAM_NAME)."
-	@echo "    FEATURES=fixedepids          $(BASE_PROGRAM_NAME) only uses bultin internal ePIDs."
+	@echo "    FEATURES=full                Compile $(PROGRAM_NAME) with all features (default)."
+	@echo "    FEATURES=most                Compile $(PROGRAM_NAME) without rarely used features."
+	@echo "    FEATURES=embedded            Compile $(PROGRAM_NAME) with typical features for embedded systems."
+	@echo "    FEATURES=autostart           Removes features typically not needed if you place $(PROGRAM_NAME) in an autostart script."
+	@echo "    FEATURES=inetd               Compile $(PROGRAM_NAME) for running through an internet superserver only."
+	@echo "    FEATURES=minimum             Compiles only basic features of $(PROGRAM_NAME)."
+	@echo "    FEATURES=fixedepids          $(PROGRAM_NAME) only uses bultin internal ePIDs."
 	@echo ""
-	@echo "Useful CFLAGS to save memory when running $(BASE_PROGRAM_NAME) on very small embedded devices (finer control than FEATURES=)"
-	@echo "    -DNO_STRICT_MODES            Don't support enhanced emulator detection prevention."
-	@echo "    -DNO_CLIENT_LIST             Don't support maintaining a client list (CMIDs)."
+	@echo "Useful CFLAGS to save memory when running $(PROGRAM_NAME) on very small embedded devices (finer control than FEATURES=)"
+	@echo "    -DNO_EXTENDED_PRODUCT_LIST   Don't compile the detailed product list."
+	@echo "    -DNO_BASIC_PRODUCT_LIST      Don't compile the basic product list."
 	@echo "    -DNO_VERBOSE_LOG             Don't support verbose logging. Removes -v option."
-	@echo "    -DNO_LOG                     Don't add support for logging. Implies -DNO_VERBOSE_LOG."
+	@echo "    -DNO_LOG                     Don't add support for logging. Implies -DNO_VERBOSE_LOG -DNO_EXTENDED_PRODUCT_LIST and -DNO_BASIC_PRODUCT_LIST."
 	@echo "    -DNO_RANDOM_EPID             Don't support random ePIDs."
 	@echo "    -DNO_INI_FILE                Don't support reading ePIDs/HWIDs from a file."
 	@echo "    -DNO_PID_FILE                Don't support writing a PID file. Removes -p option."
@@ -195,19 +638,13 @@ help:
 	@echo "    -DNO_HELP                    Don't support command line help."
 	@echo "    -DNO_CUSTOM_INTERVALS        Don't support custom intervals for retry and refresh activation. Removes -A and -R options."
 	@echo "    -DNO_FREEBIND                Don't support binding to foreign IP addresses. Removes -F0 and -F1 options. Only affects FreeBSD and Linux."
-	@echo "    -DNO_SOCKETS                 Don't support standalone operation. Requires an internet superserver to start $(BASE_PROGRAM_NAME)."
-	@echo "    -DSIMPLE_SOCKETS             Compile $(BASE_PROGRAM_NAME) with basic socket support only. Removes -L option."
-	@echo "    -DSIMPLE_RPC                 Don't support RPC with NDR64 and BTFN in $(BASE_PROGRAM_NAME) (but do in $(BASE_CLIENT_NAME)). Makes emulator detection easy."
-	@echo "    -DNO_TAP                     Compile $(BASE_PROGRAM_NAME) without VPN support (Windows and Cygwin only)."
-	@echo "    -DNO_CL_PIDS                 Don't support specifying ePIDs and HwId from the command line in $(BASE_PROGRAM_NAME)."
-	@echo "    -DNO_LIMIT                   Don't support limiting concurrent clients in $(BASE_PROGRAM_NAME)."
-	@echo "    -DNO_SIGHUP                  Don't support SIGHUP handling in $(BASE_PROGRAM_NAME)."
-	@echo "    -DNO_VERSION_INFORMATION     Don't support displaying version information in $(BASE_PROGRAM_NAME) and $(BASE_CLIENT_NAME). Removes -V option."
-	@echo "    -DNO_PRIVATE_IP_DETECT       Don't support protection against clients with public IP addresses in $(BASE_PROGRAM_NAME)"	
-	@echo "    -DSMALL_AES                  Use a smaller (saves about 200 bytes) but slower implementation of AES."
-	@echo "    -DNO_EXTERNAL_DATA           Don't support loading an external database. Mutually exclusive with -DNO_INTERNAL_DATA"
-	@echo "    -DNO_INTERNAL_DATA           Don't compile an internal database. Mutually exclusive with -DNO_EXTERNAL_DATA"
-	@echo "    -DUNSAFE_DATA_LOAD           Don't check the KMS data file for integrity. Saves some bytes but is dangerous."
+	@echo "    -DSIMPLE_SOCKETS             Compile $(PROGRAM_NAME) with basic socket support only. Removes -L option."
+	@echo "    -DNO_SOCKETS                 Don't support standalone operation. Requires an internet superserver to start $(PROGRAM_NAME)."
+	@echo "    -DNO_CL_PIDS                 Don't support specifying ePIDs and HwId from the command line in $(PROGRAM_NAME)."
+	@echo "    -DNO_LIMIT                   Don't support limiting concurrent clients in $(PROGRAM_NAME)."
+	@echo "    -DNO_SIGHUP                  Don't support SIGHUP handling in $(PROGRAM_NAME)."
+	@echo "    -DNO_VERSION_INFORMATION     Don't support displaying version information in $(PROGRAM_NAME) and $(CLIENT_NAME). Removes -V option."
+	@echo "    -DNO_PRIVATE_IP_DETECT       Don't support protection against clients with public IP addresses in $(PROGRAM_NAME)"	
 	@echo ""
 	@echo "Troubleshooting options"
 	@echo "    CAT=1                        Combine all sources in a single in-memory file and compile directly to target."
@@ -219,15 +656,17 @@ help:
 	@echo "    OPENSSL_HMAC=0               Compile for openssl versions that don't have HMAC support (required on some embedded devices)."
 	@echo "    NO_TIMEOUT=1                 Do not set timeouts for sockets (for systems that don't support it)."
 	@echo "    CHILD_HANDLER=1              Install a handler for SIGCHLD (for systems that don't support SA_NOCLDWAIT)."
-	@echo "    NO_DNS=1                     Compile $(BASE_CLIENT_NAME) without support for detecting KMS servers via DNS."
-	@echo "    NO_GETIFADDRS=1              Compile $(BASE_PROGRAM_NAME) without using getifaddrs()."
-	@echo "    GETIFADDRS=musl              Compile $(BASE_PROGRAM_NAME) with its own implementation of getifaddrs() based on musl."
-	@echo "    DNS_PARSER=internal          Use $(BASE_CLIENT_NAME) internal DNS parsing routines. No effect on MingW (native Windows)."
+	@echo "    NO_DNS=1                     Compile $(CLIENT_NAME) without support for detecting KMS servers via DNS."
+	@echo "    NO_GETIFADDRS=1              Compile $(PROGRAM_NAME) without using getifaddrs()."
+	@echo "    GETIFADDRS=musl              Compile $(PROGRAM_NAME) with its own implementation of getifaddrs() based on musl."
+	@echo "    DNS_PARSER=internal          Use $(CLIENT_NAME) internal DNS parsing routines. No effect on MingW (native Windows)."
 	@echo ""
 	@echo "Other useful CFLAGS"
-	@echo "    -DNO_COMPILER_UAA            Do not use compiler support for byte swapping and unaligned access"
-	@echo "    -DFULL_INTERNAL_DATA         Embed full internal KMS data in $(BASE_PROGRAM_NAME)."
-	@echo "    -DSUPPORT_WINE               Add code that the Windows version of $(BASE_PROGRAM_NAME) runs on Wine if MSRPC=1"
+	@echo "    -DSUPPORT_WINE               Add code that the Windows version of $(PROGRAM_NAME) runs on Wine if MSRPC=1"
 	@echo "    -D_PEDANTIC                  Report rare error/warning conditions instead of silently ignoring them."
-	@echo "    -DFD_SETSIZE=<x>             Allow <x> -L statements in $(BASE_PROGRAM_NAME) (default: 64 on Windows, 1024 on most Unixes)."
-
+	@echo "    -DINCLUDE_BETAS              Include SKU / activation IDs for obsolete beta/preview products."
+	@echo "    -DFD_SETSIZE=<x>             Allow <x> -L statements in $(PROGRAM_NAME) (default: 64 on Windows, 1024 on most Unixes)."
+	@echo "    -flto                        Use link time optimization. Not supported by old compilers (gcc < 4.7). Use whenever supported."
+	@echo "    -flto=jobserver              Utilize all CPUs during link time optimization. Requires ${MAKE} -j <cpus>"
+	@echo "    -fno-stack-protector         No stack checking. Smaller binaries."
+	@echo "    -pipe                        Use pipes instead of temporary files (faster compilation, extends the life of your SSD)." 

KMSServer_c_mingw_gcc.c

@@ -41,8 +41,6 @@
 #define TRANSMIT_AS_TABLE_SIZE    0            
 #define WIRE_MARSHAL_TABLE_SIZE   0            
 
-#if !MULTI_CALL_BINARY
-
 typedef struct _KMSServer_MIDL_TYPE_FORMAT_STRING
     {
     short          Pad;
@@ -70,8 +68,6 @@ extern const KMSServer_MIDL_TYPE_FORMAT_STRING KMSServer__MIDL_TypeFormatString;
 extern const KMSServer_MIDL_PROC_FORMAT_STRING KMSServer__MIDL_ProcFormatString;
 extern const KMSServer_MIDL_EXPR_FORMAT_STRING KMSServer__MIDL_ExprFormatString;
 
-#endif // !MULTI_CALL_BINARY
-
 #define GENERIC_BINDING_TABLE_SIZE   0            
 
 
@@ -235,6 +231,8 @@ int RequestActivation(
         }
     };
 
+#endif // !MULTI_CALL_BINARY
+
 static const unsigned short KMSServer_FormatStringOffsetTable[] =
     {
     0
@@ -243,6 +241,7 @@ static const unsigned short KMSServer_FormatStringOffsetTable[] =
 //typedef void *(__RPC_API midl_user_allocate_t)(size_t);
 typedef void *(__RPC_API *midl_allocate_t)(size_t);
 
+#if !MULTI_CALL_BINARY
 /*static*/ const MIDL_STUB_DESC KMSServer_StubDesc =
     {
     (void *)& KMSServer___RpcClientInterface,

KMSServer_c_x64_mingw_gcc.c

@@ -33,8 +33,6 @@
 
 #include "KMSServer_h.h"
 
-#if !MULTI_CALL_BINARY
-
 #define TYPE_FORMAT_STRING_SIZE   43                                
 #define PROC_FORMAT_STRING_SIZE   61                                
 #define EXPR_FORMAT_STRING_SIZE   1                                 
@@ -72,8 +70,6 @@ extern const KMSServer_MIDL_TYPE_FORMAT_STRING KMSServer__MIDL_TypeFormatString;
 extern const KMSServer_MIDL_PROC_FORMAT_STRING KMSServer__MIDL_ProcFormatString;
 extern const KMSServer_MIDL_EXPR_FORMAT_STRING KMSServer__MIDL_ExprFormatString;
 
-#endif // !MULTI_CALL_BINARY
-
 #define GENERIC_BINDING_TABLE_SIZE   0            
 
 
@@ -237,12 +233,14 @@ int RequestActivation(
         }
     };
 
+#endif //!MULTI_CALL_BINARY
+
 static const unsigned short KMSServer_FormatStringOffsetTable[] =
     {
     0
     };
 
-#endif //!MULTI_CALL_BINARY
+
 
 #endif /* defined(_M_AMD64)*/
 
@@ -278,8 +276,6 @@ static const unsigned short KMSServer_FormatStringOffsetTable[] =
 #include "ndr64types.h"
 #include "pshpack8.h"
 
-#if !MULTI_CALL_BINARY
-
 typedef 
 struct 
 {
@@ -367,6 +363,7 @@ NDR64_FORMAT_UINT32
 __midl_frag1_t;
 extern const __midl_frag1_t __midl_frag1;
 
+#if !MULTI_CALL_BINARY
 /*static*/ const __midl_frag13_t __midl_frag13 =
 { 
 /*  */
@@ -655,7 +652,6 @@ extern const __midl_frag1_t __midl_frag1;
 
 #include "poppack.h"
 
-#if !MULTI_CALL_BINARY
 
 static const FormatInfoRef KMSServer_Ndr64ProcTable[] =
     {
@@ -665,6 +661,7 @@ static const FormatInfoRef KMSServer_Ndr64ProcTable[] =
 //typedef void *__RPC_USER MIDL_user_allocate_t(SIZE_T)
 typedef void *(__RPC_API *midl_allocate_t)(size_t);
 
+#if !MULTI_CALL_BINARY
 /*static*/ const MIDL_STUB_DESC KMSServer_StubDesc =
     {
     (void *)& KMSServer___RpcClientInterface,
@@ -688,6 +685,7 @@ typedef void *(__RPC_API *midl_allocate_t)(size_t);
     (void *)& KMSServer_ProxyInfo,   /* proxy/server info */
     0
     };
+#endif // !MULTI_CALL_BINARY
 
 static const MIDL_SYNTAX_INFO KMSServer_SyntaxInfo [  2 ] = 
     {
@@ -713,8 +711,6 @@ static const MIDL_SYNTAX_INFO KMSServer_SyntaxInfo [  2 ] =
     }
     };
 
-#endif // !MULTI_CALL_BINARY
-
 /*static*/ const MIDL_STUBLESS_PROXY_INFO KMSServer_ProxyInfo =
     {
     &KMSServer_StubDesc,

KMSServer_h.h

@@ -18,10 +18,6 @@
 */
 /* @@MIDL_FILE_HEADING(  ) */
 
-#if _WIN32
-#include "winsock2.h"
-#endif
-
 #pragma warning( disable: 4049 )  /* more than 64k source lines */
 
 

README

@@ -1,14 +1,13 @@
 To view the documentation cd to the directory containing the distribution
 files and type
 
-man man/vlmcsd.8
+man ./vlmcsd.8
 	to see documentation for vlmcsd
 
-man man/vlmcs.1
+man ./vlmcs.1
 	to see documentation for vlmcs
 
-man man/vlmcsd.7
+man ./vlmcsd.7
 	to see general documentation for kms
 
 If you don't have man, you may also use the .txt, .html and .pdf files
-in the man directory

config.h

@@ -12,17 +12,17 @@
 
 
 
- /*
-  * ----------------------------------------------------------------------------------------
-  * Useful customizations. These options are mandatory. You cannot comment them out.
-  * Feel free to change them to fit your needs.
-  * ----------------------------------------------------------------------------------------
-  */
+/*
+ * ----------------------------------------------------------------------------------------
+ * Useful customizations. These options are mandatory. You cannot comment them out.
+ * Feel free to change them to fit your needs.
+ * ----------------------------------------------------------------------------------------
+ */
 
 #ifndef VERSION
-  /*
-   * Define your own version identifier here, e.g. '#define VERSION "my vlmcsd based on 1103"'
-   */
+/*
+ * Define your own version identifier here, e.g. '#define VERSION "my vlmcsd based on svn560"'
+ */
 
 #define VERSION "private build"
 
@@ -31,9 +31,25 @@
 
 
 
+/*
+ * Define default ePIDs and HWID here. Preferrably grab ePIDs and HWID
+ * from a real KMS server.
+ */
+
+#ifndef EPID_WINDOWS
+#define EPID_WINDOWS "06401-00206-271-398432-03-1033-9600.0000-1422016"
+#endif
+
+#ifndef EPID_OFFICE2010
+#define EPID_OFFICE2010 "06401-00096-199-198384-03-1033-9600.0000-1422016"
+#endif
+
+#ifndef EPID_OFFICE2013
+#define EPID_OFFICE2013 "06401-00206-234-384729-03-1033-9600.0000-1422016"
+#endif
 
 #ifndef HWID // HwId from the Ratiborus VM
-#define HWID 0x3A, 0x1C, 0x04, 0x96, 0x00, 0xB6, 0x00, 0x76
+#define HWID 0x36, 0x4F, 0x46, 0x3A, 0x88, 0x63, 0xD3, 0x5F
 #endif
 
 
@@ -47,39 +63,25 @@
 
 
 
- /*
-  * -------------------------------
-  * Defaults
-  * -------------------------------
-  */
-
+/*
+ * -------------------------------
+ * Defaults
+ * -------------------------------
+ */
 
 
 #ifndef INI_FILE
-  /*
-   * Uncomment and customize the following line if you want vlmcsd to look for an ini file
-   * at a default location.
-   */
+/*
+ * Uncomment and customize the following line if you want vlmcsd to look for an ini file
+ * at a default location
+ */
 
-   //#define INI_FILE "/etc/vlmcsd.ini"
+//#define INI_FILE "/etc/vlmcsd.ini"
 
 #endif // INI_FILE
 
 
 
-
-
-#ifndef DATA_FILE
-/*
- * Uncomment and customize the following line if you want vlmcsd to look for a KMS data file
- * at a custom default location.
- */
-
- //#define DATA_FILE "/etc/vlmcsd.kmd"
-
-#endif // DATA_FILE
-
-
 /*
  * ----------------------------------------------------------------------------------------
  * Troubleshooting options. Please note that disabling features may also help troubleshooting.
@@ -91,15 +93,15 @@
 
 
 #ifndef CHILD_HANDLER
- /*
-  * Uncomment the following #define if you are compiling for a platform that does
-  * not correctly handle the SA_NOCLDWAIT flag when ignoring SIGCHLD, i.e. forked
-  * processes remain as "zombies" after dying. This option will add a SIGCHLD handler that
-  * "waits" for a child that has terminated. This is only required for a few
-  * unixoid OSses.
-  */
+/*
+ * Uncomment the following #define if you are compiling for a platform that does
+ * not correctly handle the SA_NOCLDWAIT flag when ignoring SIGCHLD, i.e. forked
+ * processes remain as "zombies" after dying. This option will add a SIGCHLD handler that
+ * "waits" for a child that has terminated. This is only required for a few
+ * unixoid OSses.
+ */
 
-  //#define CHILD_HANDLER
+//#define CHILD_HANDLER
 
 #endif // CHILD_HANDLER
 
@@ -110,7 +112,7 @@
  * not support custom socket send or receive timeouts.
  */
 
- //#define NO_TIMEOUT
+//#define NO_TIMEOUT
 
 #endif // NO_TIMEOUT
 
@@ -122,7 +124,7 @@
  * detecting KMS servers via DNS.
  */
 
- //#define NO_DNS
+//#define NO_DNS
 
 #endif // NO_DNS
 
@@ -134,7 +136,7 @@
  * This affects the output of "vlmcsd -x" only. It should be rarely necessary to use this.
  */
 
- //#define TERMINAL_FIXED_WIDTH 80
+//#define TERMINAL_FIXED_WIDTH 80
 
 #endif // TERMINAL_FIXED_WIDTH
 
@@ -148,7 +150,7 @@
  * you are testing any KMS server or client emulator that may send malformed KMS packets.
  */
 
- //#define _PEDANTIC
+//#define _PEDANTIC
 
 #endif // _PEDANTIC
 
@@ -159,19 +161,27 @@
 /*
  * Cygwin, Linux, Android, NetBSD, DragonflyBSD:
  *    Do not rely on a properly mounted proc filesystem and use the less reliable
- *    argv[0] to determine the program's executable name.
- *    Use only if absolutely necessary (very old versions of these OSses).
+ *    argv[0] to determine the program's executable name when restarting vlmcsd
+ *    by sending a SIGHUP signal. Use only if absolutely necessary (very old versions
+ *    of these OSses).
  *
- * Minix, OpenBSD:
- *    This option has no effect since the OS always must use the less reliable argv[0].
+ * FreeBSD:
+ *    Do not use sysctl and but the less reliable
+ *    argv[0] to determine the program's executable name when restarting vlmcsd
+ *    by sending a SIGHUP signal. Use only if absolutely necessary (very old FreeBSD).
  *
- * FreeBSD, Mac OS X, iOS, Solaris, Windows:
+ * OpenBSD:
+ *    This option has no effect since OpenBSD always must use the less reliable argv[0].
+ *
+ * Mac OS X, Solaris:
  *    This option is not neccessary (and has no effect) since these OSses provide
  *    a reliable way to determine the executable name.
  *
+ * Windows:
+ *    This option is not used because Windows doesn't support signals.
  */
 
- //#define NO_PROCFS
+//#define NO_PROCFS
 
 #endif // NO_PROCFS
 
@@ -181,9 +191,9 @@
 #ifndef USE_AUXV
 /*
  * Linux only:
- *    Use the process' ELF aux vector to determine the executable name.
- *    This is actually the best method but is supported only with
- *
+ *    Use the process' ELF aux vector to determine the executable name when restarting
+ *    vlmcsd by sending a SIGHUP signal. This is actually the best method but is supported
+ *    only with
  *        * the musl library
  *        * the glbic library 2.16 or newer
  *
@@ -191,10 +201,10 @@
  *    Use it only if your system supports it and you do not plan to use the binary on older systems.
  *    It won't work on debian 7 or Red Hat 6.x.
  *
- *    It is safe to try this by yourself. vlmcsd won't compile if your system doesn't support it.
+ *    It it safe to try this by yourself. vlmcsd won't compile if your system doesn't support it.
  */
 
- //#define USE_AUXV
+//#define USE_AUXV
 
 #endif // USE_AUXV
 
@@ -209,7 +219,7 @@
  * This may be necessary for some embedded devices that have OpenSSL without HMAC support.
  */
 
- //#define _OPENSSL_NO_HMAC
+//#define _OPENSSL_NO_HMAC
 
 #endif // _OPENSSL_NO_HMAC
 
@@ -224,26 +234,26 @@
 
 
 #ifndef USE_THREADS
- /*
-  * Do not use fork() but threads to serve your clients.
-  *
-  * Unix-like operarting systems:
-  *    You may use this or not. Entirely your choice. Threads do not require explicitly allocating
-  *    a shared memory segment which might be a problem on some systems. Using fork() is more robust
-  *    although the threaded version of vlmcsd is rock solid too.
-  *
-  *    Some older unixoid OSses may not have pthreads. Do NOT use USE_THREADS and define NO_SIGHUP
-  *    and NO_LIMIT instead to disable use of the pthreads, shared memory and semaphores.
-  *
-  * Cygwin:
-  *    It is recommended to use threads since fork() is extremely slow (no copy on write) and somewhat
-  *    unstable.
-  *
-  * Windows:
-  *    This option has no effect since fork() is not supported.
-  */
+/*
+ * Do not use fork() but threads to serve your clients.
+ *
+ * Unix-like operarting systems:
+ *    You may use this or not. Entirely your choice. Threads do not require explicitly allocating
+ *    a shared memory segment which might be a problem on some systems. Using fork() is more robust
+ *    although the threaded version of vlmcsd is rock solid too.
+ *
+ *    Some older unixoid OSses may not have pthreads. Do NOT use USE_THREADS and define NO_SIGHUP
+ *    and NO_LIMIT instead to disable use of the pthreads, shared memory and semaphores.
+ *
+ * Cygwin:
+ *    It is recommended to use threads since fork() is extremely slow (no copy on write) and somewhat
+ *    unstable.
+ *
+ * Windows:
+ *    This option has no effect since fork() is not supported.
+ */
 
-  //#define USE_THREADS
+//#define USE_THREADS
 
 #endif // USE_THREADS
 
@@ -264,7 +274,7 @@
  * Do not define both _CRYPTO_OPENSSL and _CRYPTO_POLARSSL
  */
 
- //#define _CRYPTO_POLARSSL
+//#define _CRYPTO_POLARSSL
 
 #endif // _CRYPTO_POLARSSL
 
@@ -285,7 +295,7 @@
  * Do not define both _CRYPTO_OPENSSL and _CRYPTO_POLARSSL
  */
 
- //#define _CRYPTO_OPENSSL
+//#define _CRYPTO_OPENSSL
 
 #endif // _CRYPTO_OPENSSL
 
@@ -305,7 +315,7 @@
  * Don't use this except for your own research on the internals of OpenSSL.
  */
 
- //#define _USE_AES_FROM_OPENSSL
+//#define _USE_AES_FROM_OPENSSL
 
 #endif // _USE_AES_FROM_OPENSSL
 
@@ -321,20 +331,28 @@
  * compiled without support for hardware accelerated AES. It's worth a try if _USE_AES_FROM_OPENSSL doesn't work.
  */
 
- //#define _OPENSSL_SOFTWARE
+//#define _OPENSSL_SOFTWARE
 
 #endif // _OPENSSL_SOFTWARE
 
 
 
 
-#ifndef FULL_INTERNAL_DATA
 /*
- * Includes the full database in vlmcsd.
+ * ------------------------------------------------------------------------------------------
+ * Extra features not compiled by default because they are rarely needed
+ * ------------------------------------------------------------------------------------------
  */
 
- //#define FULL_INTERNAL_DATA
-#endif // FULL_INTERNAL_DATA
+
+#ifndef INCLUDE_BETAS
+/*
+ * Uncomment the following #define if you want obsolete beta/preview SKUs
+ * to be included in the extended product list.
+ */
+
+//#define INCLUDE_BETAS
+#endif
 
 
 
@@ -348,11 +366,11 @@
 
 
 #ifndef NO_FREEBIND
- /*
-  * Do not compile support for FREEBIND (Linux) and IP_BINDANY (FreeBSD). This disables the -F1 command
-  * line option and you can bind only to (listen on) IP addresses that are currently up and running on
-  * your system.
-  */
+/*
+ * Do not compile support for FREEBIND (Linux) and IP_BINDANY (FreeBSD). This disables the -F1 command
+ * line option and you can bind only to (listen on) IP addresses that are currently up and running on
+ * your system.
+ */
 
 //#define NO_FREEBIND
 
@@ -361,14 +379,35 @@
 
 
 
-#ifndef NO_TAP
- /*
-  * Do not compile support for using a VPN adapter under Windows. Disables -O command line option.
-  */
+#ifndef NO_EXTENDED_PRODUCT_LIST
+/*
+ * Do not compile the extended product list. Removes the list of Activation GUIDs (aka
+ * Client SKU Id, License Id) and their respective product names (e.g. Windows 8.1 Enterprise).
+ *
+ * This affects logging only and does not have an effect on activation itself. As long as you
+ * do not also define NO_BASIC_PRODUCT_LIST more generic names like Windows 8.1 or Office 2013
+ * will still be logged. Saves a lot of space without loosing much functionality.
+ *
+ */
 
-//#define NO_TAP
+//#define NO_EXTENDED_PRODUCT_LIST
 
-#endif // NO_TAP
+#endif // NO_EXTENDED_PRODUCT_LIST
+
+
+
+
+#ifndef NO_BASIC_PRODUCT_LIST
+/*
+ * Do not compile the basic product list. Removes the list KMS GUIDs (aka Server SKU Id) and their
+ * respective product names. Only affects logging not activation. This has a negative impact only
+ * if you activate a product that is not (yet) in the extended product list. On the other hand you
+ * do not save much space by not compiling this list.
+ */
+
+//#define NO_BASIC_PRODUCT_LIST
+
+#endif // NO_BASIC_PRODUCT_LIST
 
 
 
@@ -378,7 +417,7 @@
  * Removes the -V option from vlmcsd and vlmcs that displays the version information
  */
 
- //#define NO_VERSION_INFORMATION
+//#define NO_VERSION_INFORMATION
 
 #endif // NO_VERSION_INFORMATION
 
@@ -391,7 +430,7 @@
  * option in the vlmcs client. Disables ini file directive LogVerbose.
  */
 
- //#define NO_VERBOSE_LOG
+//#define NO_VERBOSE_LOG
 
 #endif // NO_VERBOSE_LOG
 
@@ -402,51 +441,24 @@
 /*
  * Disables logging completely. You can neither log to a file nor to the console. -D and -f will
  * start vlmcsd in foreground. -e will not be available. Disables ini file directive LogFile.
- * Implies NO_VERBOSE_LOG.
+ * Implies NO_VERBOSE_LOG, NO_EXTENDED_PRODUCT_LIST and NO_BASIC_PRODUCT_LIST.
  */
 
- //#define NO_LOG
+//#define NO_LOG
 
 #endif // NO_LOG
 
 
 
 
-#ifndef NO_STRICT_MODES
-/*
- * Disables emulator detection protection. Removes -M0, -M1, -E0, -E1, -K0, -K1, -K2 and -K3 from
- * vlmcsd command line options and WhitelistingLevel from INI file parameters. vlmcsd always behaves
- * as if it was started with -K0, -M0.
- */
-
- //#define NO_STRICT_MODES
-
-#endif // NO_STRICT_MODES
-
-
-
-
-
-#ifndef NO_CLIENT_LIST
-/*
- * Disables the ability to maintain a list of Client Machine IDs (CMIDs). Removes -M0, -M1, -E0 and -E1
- * from vlmcsd command line options.
- */
-
- //#define NO_CLIENT_LIST
-
-#endif // !NO_CLIENT_LIST
-
-
-
 #ifndef NO_RANDOM_EPID
- /*
-  * Disables the ability to generate random ePIDs. Useful if you managed to grab ePID/HWID from a
-  * real KMS server and want to use these. Removes -r from the vlmcsd command line and the ini
-  * file directive RandomizationLevel (The randomization level will be harcoded to 0).
-  */
+/*
+ * Disables the ability to generate random ePIDs. Useful if you managed to grab ePID/HWID from a
+ * real KMS server and want to use these. Removes -r from the vlmcsd command line and the ini
+ * file directive RandomizationLevel (The randomization level will be harcoded to 0).
+ */
 
-  //#define NO_RANDOM_EPID
+//#define NO_RANDOM_EPID
 
 #endif // NO_RANDOM_EPID
 
@@ -458,7 +470,7 @@
  * Disables the ability to use a configuration file (aka ini file). Removes -i from the command line.
  */
 
- //#define NO_INI_FILE
+//#define NO_INI_FILE
 
 #endif // NO_INI_FILE
 
@@ -466,59 +478,19 @@
 
 
 #ifndef NO_PID_FILE
- /*
+/*
  * Disables the abilty to write a pid file containing the process id of vlmcsd. If your init system
  * does not need this feature, you can safely disables this but it won't save much space. Disables
  * the use of -p from the command line and PidFile from the ini file.
  */
 
- //#define NO_PID_FILE
+//#define NO_PID_FILE
 
 #endif // NO_PID_FILE
 
 
 
 
-#ifndef NO_EXTERNAL_DATA
- /*
- * Disables the abilty to load external KMS data from a file. Disables command line options -j
- * and ini file parameter KmsData. Implies UNSAFE_DATA_LOAD.
- */
-
- //#define NO_EXTERNAL_DATA
-
-#endif // NO_EXTERNAL_DATA
-
-
-
-
-#ifndef NO_INTERNAL_DATA
- /*
- * Compiles vlmcsd and vlmcs without an internal database. If no database is found at
- * either the default location or the file specified with command line option -j.,
- * the program exits with an error message.
- */
-
- //#define NO_INTERNAL_DATA
-
-#endif // NO_INTERNAL_DATA
-
-
-
-
-#ifndef UNSAFE_DATA_LOAD
- /*
- * Does not check an external KMS data file for integrity.
- * This save some bytes but it dangerous if you load a KMS data file from an unknown source.
- */
-
- //#define UNSAFE_DATA_LOAD
-
-#endif // UNSAFE_DATA_LOAD
-
-
-
-
 #ifndef NO_USER_SWITCH
 /*
  * Disables switching to another uid and/or gid after starting the program and setting up the sockets.
@@ -530,7 +502,7 @@
  * Cygwin.
  */
 
- //#define NO_USER_SWITCH
+//#define NO_USER_SWITCH
 
 #endif // NO_USER_SWITCH
 
@@ -543,7 +515,7 @@
  * access to the man files vlmcsd.8 and vlmcs.1
  */
 
- //#define NO_HELP
+//#define NO_HELP
 
 #endif // NO_HELP
 
@@ -557,7 +529,7 @@
  * -A and -R from the command line as well as ActivationInterval and RenewalInterval in the ini file.
  */
 
- //#define NO_CUSTOM_INTERVALS
+//#define NO_CUSTOM_INTERVALS
 
 #endif // NO_CUSTOM_INTERVALS
 
@@ -570,7 +542,7 @@
  * Removes -o from the command line.
  */
 
- //#define NO_PRIVATE_IP_DETECT
+//#define NO_PRIVATE_IP_DETECT
 
 #endif // NO_PRIVATE_IP_DETECT
 
@@ -584,7 +556,7 @@
  * command line. Socket setup is the job of your superserver.
  */
 
- //#define NO_SOCKETS
+//#define NO_SOCKETS
 
 #endif // NO_SOCKETS
 
@@ -597,7 +569,7 @@
  * Removes -0, -3, -w and -H from the vlmcsd command line.
  */
 
- //#define NO_CL_PIDS
+//#define NO_CL_PIDS
 
 #endif // NO_CL_PIDS
 
@@ -616,7 +588,7 @@
  * and NO_LIMIT instead to disable use of the pthreads, shared memory and semaphores.
  */
 
- //#define NO_LIMIT
+//#define NO_LIMIT
 
 #endif // NO_LIMIT
 
@@ -636,33 +608,20 @@
  * This option has no effect on native Windows since Posix signaling is not supported. It can be used with Cygwin.
  */
 
- //#define NO_SIGHUP
+//#define NO_SIGHUP
 
 #endif // NO_SIGHUP
 
 
 
 
-#ifndef SIMPLE_RPC
-/*
- * Uses a simple version of the RPC protocol which does not support NDR64 and BTFN.
- * Supports RPC with the features present in Windows XP and earlier only. Using this creates
- * smaller binaries but makes emulator detection easier.
- */
-
- //#define SIMPLE_RPC
-#endif // !SIMPLE_RPC
-
-
-
-
 #ifndef SIMPLE_SOCKETS
 /*
  * Disables the ability to choose IP addresses using the -L option in vlmcsd. vlmcsd will listen on all IP addresses.
  * It still supports IPv4 and IPv6.
  */
 
- //#define SIMPLE_SOCKETS
+//#define SIMPLE_SOCKETS
 
 #endif // SIMPLE_SOCKETS
 

crypto.c

@@ -17,22 +17,28 @@ const BYTE AesKeyV6[] = {
 	0xA9, 0x4A, 0x41, 0x95, 0xE2, 0x01, 0x43, 0x2D, 0x9B, 0xCB, 0x46, 0x04, 0x05, 0xD8, 0x4A, 0x21 };
 
 static const BYTE SBox[] = {
-	    0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5, 0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
-	    0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0, 0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
-	    0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC, 0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
-	    0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A, 0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75,
-	    0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0, 0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84,
-	    0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B, 0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF,
-	    0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85, 0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8,
-	    0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5, 0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2,
-	    0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17, 0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73,
-	    0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88, 0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB,
-	    0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C, 0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79,
-	    0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9, 0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08,
-	    0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6, 0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A,
-	    0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E, 0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
-	    0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94, 0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
-	    0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68, 0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16
+	0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5, 0x30, 0x01, 0x67, 0x2B,
+	0xFE, 0xD7, 0xAB, 0x76, 0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0,
+	0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0, 0xB7, 0xFD, 0x93, 0x26,
+	0x36, 0x3F, 0xF7, 0xCC, 0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
+	0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A, 0x07, 0x12, 0x80, 0xE2,
+	0xEB, 0x27, 0xB2, 0x75, 0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0,
+	0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84, 0x53, 0xD1, 0x00, 0xED,
+	0x20, 0xFC, 0xB1, 0x5B, 0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF,
+	0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85, 0x45, 0xF9, 0x02, 0x7F,
+	0x50, 0x3C, 0x9F, 0xA8, 0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5,
+	0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2, 0xCD, 0x0C, 0x13, 0xEC,
+	0x5F, 0x97, 0x44, 0x17, 0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73,
+	0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88, 0x46, 0xEE, 0xB8, 0x14,
+	0xDE, 0x5E, 0x0B, 0xDB, 0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C,
+	0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79, 0xE7, 0xC8, 0x37, 0x6D,
+	0x8D, 0xD5, 0x4E, 0xA9, 0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08,
+	0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6, 0xE8, 0xDD, 0x74, 0x1F,
+	0x4B, 0xBD, 0x8B, 0x8A, 0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E,
+	0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E, 0xE1, 0xF8, 0x98, 0x11,
+	0x69, 0xD9, 0x8E, 0x94, 0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
+	0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68, 0x41, 0x99, 0x2D, 0x0F,
+	0xB0, 0x54, 0xBB, 0x16
 };
 
 
@@ -117,7 +123,7 @@ void AesInitKey(AesCtx *Ctx, const BYTE *Key, int_fast8_t IsV6, int RijndaelKeyB
 
 	memcpy(Ctx->Key, Key, RijndaelKeyBytes);
 
-	for ( i = (uint_fast8_t)RijndaelKeyDwords; i < ( Ctx->rounds + 1 ) << 2; i++ )
+	for ( i = RijndaelKeyDwords; i < ( Ctx->rounds + 1 ) << 2; i++ )
 	{
 		temp = Ctx->Key[ i - 1 ];
 
@@ -215,45 +221,31 @@ void AesCmacV4(BYTE *Message, size_t MessageSize, BYTE *MacOut)
 
 #if !defined(_CRYPTO_OPENSSL) || !defined(_USE_AES_FROM_OPENSSL)
 
-#ifndef SMALL_AES
-
 static const BYTE SBoxR[] = {
-	0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38, 0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
-	0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87, 0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB,
-	0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D, 0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
-	0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2, 0x76, 0x5B, 0xA2, 0x49, 0x6D, 0x8B, 0xD1, 0x25,
-	0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92,
-	0x6C, 0x70, 0x48, 0x50, 0xFD, 0xED, 0xB9, 0xDA, 0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84,
-	0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A, 0xF7, 0xE4, 0x58, 0x05, 0xB8, 0xB3, 0x45, 0x06,
-	0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02, 0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B,
-	0x3A, 0x91, 0x11, 0x41, 0x4F, 0x67, 0xDC, 0xEA, 0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73,
-	0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85, 0xE2, 0xF9, 0x37, 0xE8, 0x1C, 0x75, 0xDF, 0x6E,
-	0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89, 0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B,
-	0xFC, 0x56, 0x3E, 0x4B, 0xC6, 0xD2, 0x79, 0x20, 0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4,
-	0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31, 0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F,
-	0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D, 0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF,
-	0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0, 0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
-	0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26, 0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D
+	0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38, 0xBF, 0x40, 0xA3, 0x9E,
+	0x81, 0xF3, 0xD7, 0xFB, 0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87,
+	0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB, 0x54, 0x7B, 0x94, 0x32,
+	0xA6, 0xC2, 0x23, 0x3D, 0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
+	0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2, 0x76, 0x5B, 0xA2, 0x49,
+	0x6D, 0x8B, 0xD1, 0x25, 0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16,
+	0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92, 0x6C, 0x70, 0x48, 0x50,
+	0xFD, 0xED, 0xB9, 0xDA, 0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84,
+	0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A, 0xF7, 0xE4, 0x58, 0x05,
+	0xB8, 0xB3, 0x45, 0x06, 0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02,
+	0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B, 0x3A, 0x91, 0x11, 0x41,
+	0x4F, 0x67, 0xDC, 0xEA, 0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73,
+	0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85, 0xE2, 0xF9, 0x37, 0xE8,
+	0x1C, 0x75, 0xDF, 0x6E, 0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89,
+	0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B, 0xFC, 0x56, 0x3E, 0x4B,
+	0xC6, 0xD2, 0x79, 0x20, 0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4,
+	0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31, 0xB1, 0x12, 0x10, 0x59,
+	0x27, 0x80, 0xEC, 0x5F, 0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D,
+	0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF, 0xA0, 0xE0, 0x3B, 0x4D,
+	0xAE, 0x2A, 0xF5, 0xB0, 0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
+	0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26, 0xE1, 0x69, 0x14, 0x63,
+	0x55, 0x21, 0x0C, 0x7D
 };
 
-#define GetSBoxR(x) SBoxR[x]
-
-#else // SMALL_AES
-
-static uint8_t SBoxR(uint8_t byte)
-{
-	uint8_t i;
-
-	for (i = 0; TRUE; i++)
-	{
-		if (byte == SBox[i]) return i;
-	}
-}
-
-#define GetSBoxR(x) SBoxR(x)
-
-#endif // SMALL_AES
-
 
 static void ShiftRowsR(BYTE *state)
 {
@@ -272,9 +264,7 @@ static void SubBytesR(BYTE *block)
 	uint_fast8_t i;
 
 	for (i = 0; i < AES_BLOCK_BYTES; i++)
-	{
-		block[i] = GetSBoxR( block[i] );
-	}
+		block[i] = SBoxR[ block[i] ];
 }
 
 

crypto.h

@@ -14,10 +14,12 @@
 #include "endian.h"
 #include <stdint.h>
 
+//#define AES_ROUNDS      (10)
 #define AES_KEY_BYTES   (16) // 128 Bits
 #define AES_BLOCK_BYTES (16)
 #define AES_BLOCK_WORDS (AES_BLOCK_BYTES / sizeof(DWORD))
 #define AES_KEY_DWORDS  (AES_KEY_BYTES / sizeof(DWORD))
+//#define V4_ROUNDS		(11)
 #define V4_KEY_BYTES	(20) // 160 Bits
 
 #define ROR32(v, n)  ( (v) << (32 - n) | (v) >> n )
@@ -37,7 +39,7 @@ typedef struct {
 void AesInitKey(AesCtx *Ctx, const BYTE *Key, int_fast8_t IsV6, int AesKeyBytes);
 void AesEncryptBlock(const AesCtx *const Ctx, BYTE *block);
 void AesDecryptBlock(const AesCtx *const Ctx, BYTE *block);
-void AesEncryptCbc(const AesCtx *const Ctx, BYTE *restrict iv, BYTE *restrict data, size_t *restrict len);
+void AesEncryptCbc(const AesCtx *const Ctx, BYTE *iv, BYTE *data, size_t *len);
 void AesDecryptCbc(const AesCtx *const Ctx, BYTE *iv, BYTE *data, size_t len);
 void MixColumnsR(BYTE *restrict state);
 

crypto_internal.c

@@ -95,7 +95,7 @@ static void Sha256Update(Sha256Ctx *Ctx, BYTE *data, size_t len)
 	unsigned int  b_len = Ctx->Len & 63,
 								r_len = (b_len ^ 63) + 1;
 
-	Ctx->Len += (unsigned int)len;
+	Ctx->Len += len;
 
 	if ( len < r_len )
 	{

crypto_windows.c

@@ -39,7 +39,7 @@ static int_fast8_t AcquireCryptContext()
 {
 	if (!hRsaAesProvider)
 	{
-		return (int_fast8_t)CryptAcquireContextW
+		return CryptAcquireContextW
 		(
 			&hRsaAesProvider,		// Provider handle
 			NULL,					// No key container name
@@ -163,7 +163,7 @@ int_fast8_t Sha256Hmac(const BYTE* key, BYTE* restrict data, DWORD len, BYTE* re
 	if (hKey) CryptDestroyKey(hKey);
 	if (hHmacHash) CryptDestroyHash(hHmacHash);
 
-	return (int_fast8_t)success;
+	return success;
 }
 
 #endif // _WIN32 || __CYGWIN__

crypto_windows.h

@@ -11,9 +11,6 @@
 #else // _WIN32 || __CYGWIN__
 
 #include "types.h"
-#if _MSC_VER
-#include "Wincrypt.h"
-#endif
 
 typedef struct _Sha2356HmacCtx
 {
@@ -21,7 +18,7 @@ typedef struct _Sha2356HmacCtx
 	HCRYPTKEY hKey;
 } Sha256HmacCtx;
 
-int_fast8_t Sha256(BYTE* restrict data, DWORD DataSize, BYTE* restrict hash);
+int_fast8_t Sha256(BYTE *data, DWORD len, BYTE *hash);
 int_fast8_t Sha256Hmac(const BYTE* key, BYTE* restrict data, DWORD len, BYTE* restrict hmac);
 
 /*int_fast8_t Sha256HmacInit(Sha256HmacCtx *Ctx, BYTE *key, uint8_t keySize);

debian

@@ -1 +0,0 @@
-Subproject commit 96200e41ef8b25388b2fa0f78c29133424b2c425

dns_srv.c

@@ -22,7 +22,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <netdb.h>
- //#ifndef DNS_PARSER_INTERNAL
+//#ifndef DNS_PARSER_INTERNAL
 #if __ANDROID__
 #include <netinet/in.h>
 #include "nameser.h"
@@ -46,7 +46,7 @@
 #include "ns_name.h"
 #include "ns_parse.h"
 
- // Define macros to redirect DNS parser functions to internal versions
+// Define macros to redirect DNS parser functions to internal versions
 
 #undef ns_msg
 #undef ns_initparse
@@ -86,14 +86,14 @@ static unsigned int isqrt(unsigned int n)
 	unsigned int c = 0x8000;
 	unsigned int g = 0x8000;
 
-	for (;;)
+	for(;;)
 	{
-		if (g*g > n)
+		if(g*g > n)
 			g ^= c;
 
 		c >>= 1;
 
-		if (c == 0) return g;
+		if(c == 0) return g;
 
 		g |= c;
 	}
@@ -106,11 +106,11 @@ static unsigned int isqrt(unsigned int n)
  */
 static int kmsServerListCompareFunc1(const void* a, const void* b)
 {
-	if (!a && !b) return 0;
-	if (a && !b) return -1;
-	if (!a && b) return 1;
+	if ( !a && !b) return 0;
+	if ( a && !b) return -1;
+	if ( !a && b) return 1;
 
-	int priority_order = (int)((*(kms_server_dns_ptr*)a)->priority) - ((int)(*(kms_server_dns_ptr*)b)->priority);
+	int priority_order =  (int)((*(kms_server_dns_ptr*)a)->priority) - ((int)(*(kms_server_dns_ptr*)b)->priority);
 
 	if (priority_order) return priority_order;
 
@@ -154,12 +154,12 @@ static int getDnsRawAnswer(const char *restrict query, unsigned char** receive_b
 	if (*query == '.')
 	{
 #		if __ANDROID__ || __GLIBC__ /* including __UCLIBC__*/ || __APPLE__ || __CYGWIN__ || __FreeBSD__ || __NetBSD__ || __DragonFly__ || __OpenBSD__ || __sun__
-		bytes_received = res_querydomain("_vlmcs._tcp", query + 1, ns_c_in, ns_t_srv, *receive_buffer, RECEIVE_BUFFER_SIZE);
+			bytes_received = res_querydomain("_vlmcs._tcp", query + 1, ns_c_in,	ns_t_srv, *receive_buffer, RECEIVE_BUFFER_SIZE);
 #		else
-		char* querystring = (char*)alloca(strlen(query) + 12);
-		strcpy(querystring, "_vlmcs._tcp");
-		strcat(querystring, query);
-		bytes_received = res_query(querystring, ns_c_in, ns_t_srv, *receive_buffer, RECEIVE_BUFFER_SIZE);
+			char* querystring = (char*)alloca(strlen(query) + 12);
+			strcpy(querystring, "_vlmcs._tcp");
+			strcat(querystring, query);
+			bytes_received = res_query(querystring, ns_c_in, ns_t_srv, *receive_buffer, RECEIVE_BUFFER_SIZE);
 #		endif
 	}
 	else
@@ -169,7 +169,7 @@ static int getDnsRawAnswer(const char *restrict query, unsigned char** receive_b
 
 	if (bytes_received < 0)
 	{
-		errorout("Fatal: DNS query to %s%s failed: %s\n", "_vlmcs._tcp", *query == '.' ? query : "", hstrerror(h_errno));
+		errorout("Fatal: DNS query to %s%s failed: %s\n", "_vlmcs._tcp",	*query == '.' ? query : "", hstrerror(h_errno));
 		return 0;
 	}
 
@@ -236,9 +236,9 @@ int getKmsServerList(kms_server_dns_ptr** serverlist, const char *restrict query
 			continue;
 		}
 
-		sprintf(kms_server->serverName + strlen(kms_server->serverName), ":%hu", GET_UA16BE(&srvrecord->port));
-		kms_server->priority = GET_UA16BE(&srvrecord->priority);
-		kms_server->weight = GET_UA16BE(&srvrecord->weight);
+        sprintf(kms_server->serverName + strlen(kms_server->serverName), ":%hu", GET_UA16BE(&srvrecord->port));
+        kms_server->priority = GET_UA16BE(&srvrecord->priority);
+        kms_server->weight = GET_UA16BE(&srvrecord->weight);
 
 	}
 
@@ -254,7 +254,7 @@ int getKmsServerList(kms_server_dns_ptr** serverlist, const char *restrict query
 int getKmsServerList(kms_server_dns_ptr** serverlist, const char *const restrict query)
 {
 #	define MAX_DNS_NAME_SIZE 254
-	* serverlist = NULL;
+	*serverlist = NULL;
 	PDNS_RECORD receive_buffer;
 	char dnsDomain[MAX_DNS_NAME_SIZE];
 	char FqdnQuery[MAX_DNS_NAME_SIZE];
@@ -309,7 +309,7 @@ int getKmsServerList(kms_server_dns_ptr** serverlist, const char *const restrict
 
 		memset(kms_server, 0, sizeof(kms_server_dns_t));
 
-		vlmcsd_snprintf(kms_server->serverName, sizeof(kms_server->serverName), "%s:%hu", dns_iterator->Data.SRV.pNameTarget, dns_iterator->Data.SRV.wPort);
+		snprintf(kms_server->serverName, sizeof(kms_server->serverName), "%s:%hu", dns_iterator->Data.SRV.pNameTarget, dns_iterator->Data.SRV.wPort);
 		kms_server->priority = dns_iterator->Data.SRV.wPriority;
 		kms_server->weight = dns_iterator->Data.SRV.wWeight;
 

dns_srv.h

@@ -96,7 +96,7 @@ typedef enum __ns_class {
 
 #endif
 
-int getKmsServerList(kms_server_dns_ptr** serverlist, const char *const restrict query);
+int getKmsServerList(kms_server_dns_ptr** serverlist, const char *restrict query);
 void sortSrvRecords(kms_server_dns_ptr* serverlist, const int answers);
 
 #endif // NO_DNS

docker

@@ -1 +0,0 @@
-Subproject commit 4195d04f687973a514e3fb663bd87161afd46697

endian.c

@@ -6,67 +6,67 @@
 #include "endian.h"
 
 #if defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && defined(__LITTLE_ENDIAN)  \
-	&& defined(BS16) && defined(BS32) && defined(BS64) && !defined(NO_COMPILER_UAA)
+	&& defined(BS16) && defined(BS32) && defined(BS64)
 
 #else // ! defined(__BYTE_ORDER)
 
 void PUT_UAA64BE(void *p, unsigned long long v, unsigned int i)
 {
 	unsigned char *_p = (unsigned char *)&((unsigned long long *)p)[i];
-	_p[ 0 ] = (unsigned char)(v >> 56);
-	_p[ 1 ] = (unsigned char)(v >> 48);
-	_p[ 2 ] = (unsigned char)(v >> 40);
-	_p[ 3 ] = (unsigned char)(v >> 32);
-	_p[ 4 ] = (unsigned char)(v >> 24);
-	_p[ 5 ] = (unsigned char)(v >> 16);
-	_p[ 6 ] = (unsigned char)(v >> 8);
-	_p[ 7 ] = (unsigned char)(v);
+	_p[ 0 ] = v >> 56;
+	_p[ 1 ] = v >> 48;
+	_p[ 2 ] = v >> 40;
+	_p[ 3 ] = v >> 32;
+	_p[ 4 ] = v >> 24;
+	_p[ 5 ] = v >> 16;
+	_p[ 6 ] = v >> 8;
+	_p[ 7 ] = v;
 }
 
 void PUT_UAA32BE(void *p, unsigned int v, unsigned int i)
 {
 	unsigned char *_p = (unsigned char *)&((unsigned int *)p)[i];
-	_p[ 0 ] = (unsigned char)(v >> 24);
-	_p[ 1 ] = (unsigned char)(v >> 16);
-	_p[ 2 ] = (unsigned char)(v >> 8);
-	_p[ 3 ] = (unsigned char)(v);
+	_p[ 0 ] = v >> 24;
+	_p[ 1 ] = v >> 16;
+	_p[ 2 ] = v >> 8;
+	_p[ 3 ] = v;
 }
 
 void PUT_UAA16BE(void *p, unsigned short v, unsigned int i)
 {
 	unsigned char *_p = (unsigned char *)&((unsigned short *)p)[i];
-	_p[ 0 ] = (unsigned char)(v >> 8);
-	_p[ 1 ] = (unsigned char)(v);
+	_p[ 0 ] = v >> 8;
+	_p[ 1 ] = v;
 }
 
 
 void PUT_UAA64LE(void *p, unsigned long long v, unsigned int i)
 {
 	unsigned char *_p = (unsigned char *)&((unsigned long long *)p)[i];
-	_p[ 0 ] = (unsigned char)(v);
-	_p[ 1 ] = (unsigned char)(v >> 8);
-	_p[ 2 ] = (unsigned char)(v >> 16);
-	_p[ 3 ] = (unsigned char)(v >> 24);
-	_p[ 4 ] = (unsigned char)(v >> 32);
-	_p[ 5 ] = (unsigned char)(v >> 40);
-	_p[ 6 ] = (unsigned char)(v >> 48);
-	_p[ 7 ] = (unsigned char)(v >> 56);
+	_p[ 0 ] = v;
+	_p[ 1 ] = v >> 8;
+	_p[ 2 ] = v >> 16;
+	_p[ 3 ] = v >> 24;
+	_p[ 4 ] = v >> 32;
+	_p[ 5 ] = v >> 40;
+	_p[ 6 ] = v >> 48;
+	_p[ 7 ] = v >> 56;
 }
 
 void PUT_UAA32LE(void *p, unsigned int v, unsigned int i)
 {
 	unsigned char *_p = (unsigned char *)&((unsigned int *)p)[i];
-	_p[ 0 ] = (unsigned char)(v);
-	_p[ 1 ] = (unsigned char)(v >> 8);
-	_p[ 2 ] = (unsigned char)(v >> 16);
-	_p[ 3 ] = (unsigned char)(v >> 24);
+	_p[ 0 ] = v;
+	_p[ 1 ] = v >> 8;
+	_p[ 2 ] = v >> 16;
+	_p[ 3 ] = v >> 24;
 }
 
 void PUT_UAA16LE(void *p, unsigned short v, unsigned int i)
 {
 	unsigned char *_p = (unsigned char *)&((unsigned short *)p)[i];
-	_p[ 0 ] = (unsigned char)(v);
-	_p[ 1 ] = (unsigned char)(v >> 8);
+	_p[ 0 ] = v;
+	_p[ 1 ] = v >> 8;
 }
 
 
@@ -136,12 +136,8 @@ unsigned short GET_UAA16LE(void *p, unsigned int i)
 		(unsigned short)_p[ 0 ] |
 		(unsigned short)_p[ 1 ] << 8;
 }
-#endif
 
 
-#if defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && defined(__LITTLE_ENDIAN)  \
-	&& defined(BS16) && defined(BS32) && defined(BS64)
-#else
 unsigned short BE16(unsigned short x)
 {
 	return GET_UAA16BE(&x, 0);
@@ -167,7 +163,7 @@ unsigned long long BE64(unsigned long long x)
 	return GET_UAA64BE(&x, 0);
 }
 
-unsigned long long LE64(unsigned long long x)
+inline unsigned long long LE64(unsigned long long x)
 {
 	return GET_UAA64LE(&x, 0);
 }

endian.h

@@ -9,17 +9,17 @@
 //
 // Unaligned access
 //
-
-#if !defined(NO_COMPILER_UAA)
 #define UAA16(p, i) (((PACKED16*)p)->val[i])
 #define UAA32(p, i) (((PACKED32*)p)->val[i])
 #define UAA64(p, i) (((PACKED64*)p)->val[i])
-#endif 
+
+#define UA64(p)  UAA64(p, 0)
+#define UA32(p)  UAA32(p, 0)
+#define UA16(p)  UAA16(p, 0)
 
 //
 //Byteswap: Use compiler support if available
 //
-#ifndef NO_COMPILER_UAA
 #ifdef __has_builtin // Clang supports this
 
 #if __has_builtin(__builtin_bswap16)
@@ -56,7 +56,6 @@
 #endif // GNU C > 4.7
 #endif // __GNUC__ > 4
 #endif // __GNUC__
-#endif // NO_COMPILER_UAA
 
 //
 // Byteorder
@@ -199,10 +198,6 @@
 #define __BE64(x)  BS64(x)
 #define __LE64(x)  (x)
 
-#define PUT_UA16(p, v) PUT_UA16LE(p, v)
-#define PUT_UA32(p, v) PUT_UA32LE(p, v)
-#define PUT_UA64(p, v) PUT_UA64LE(p, v)
-
 #else // __BYTE_ORDER == __BIG_ENDIAN
 
 #define __BE16(x)  (x)
@@ -212,38 +207,8 @@
 #define __BE64(x)  (x)
 #define __LE64(x)  BS64(x)
 
-#define PUT_UA16(p, v) PUT_UA16BE(p, v)
-#define PUT_UA32(p, v) PUT_UA32BE(p, v)
-#define PUT_UA64(p, v) PUT_UA64BE(p, v)
-
 #endif // __BYTE_ORDER
 
-#define BE16(x)  __BE16(x)
-#define LE16(x)  __LE16(x)
-#define BE32(x)  __BE32(x)
-#define LE32(x)  __LE32(x)
-#define BE64(x)  __BE64(x)
-#define LE64(x)  __LE64(x)
-
-#else
-
-extern unsigned short BE16(unsigned short x);
-
-extern unsigned short LE16(unsigned short x);
-
-extern unsigned int BE32(unsigned int x);
-
-extern unsigned int LE32(unsigned int x);
-
-extern unsigned long long BE64(unsigned long long x);
-
-extern unsigned long long LE64(unsigned long long x);
-
-#endif // defined(__BYTE_ORDER)
-
-#if defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && defined(__LITTLE_ENDIAN)  \
-	&& defined(BS16) && defined(BS32) && defined(BS64) &&!defined(NO_COMPILER_UAA)
-
 #define PUT_UAA64BE(p, v, i)  ( UAA64(p, i) = __BE64(v) )
 #define PUT_UAA32BE(p, v, i)  ( UAA32(p, i) = __BE32(v) )
 #define PUT_UAA16BE(p, v, i)  ( UAA16(p, i) = __BE16(v) )
@@ -260,38 +225,57 @@ extern unsigned long long LE64(unsigned long long x);
 #define GET_UAA32LE(p, i)  __LE32(UAA32(p, i))
 #define GET_UAA16LE(p, i)  __LE16(UAA16(p, i))
 
+#define BE16(x)  __BE16(x)
+#define LE16(x)  __LE16(x)
+#define BE32(x)  __BE32(x)
+#define LE32(x)  __LE32(x)
+#define BE64(x)  __BE64(x)
+#define LE64(x)  __LE64(x)
 
 #else // ! defined(__BYTE_ORDER)
 
-extern void PUT_UAA64BE(void* p, unsigned long long v, unsigned int i);
+extern void PUT_UAA64BE(void *p, unsigned long long v, unsigned int i);
 
-extern void PUT_UAA32BE(void* p, unsigned int v, unsigned int i);
+extern void PUT_UAA32BE(void *p, unsigned int v, unsigned int i);
 
-extern void PUT_UAA16BE(void* p, unsigned short v, unsigned int i);
+extern void PUT_UAA16BE(void *p, unsigned short v, unsigned int i);
 
 
-extern void PUT_UAA64LE(void* p, unsigned long long v, unsigned int i);
+extern void PUT_UAA64LE(void *p, unsigned long long v, unsigned int i);
 
-extern void PUT_UAA32LE(void* p, unsigned int v, unsigned int i);
+extern void PUT_UAA32LE(void *p, unsigned int v, unsigned int i);
 
-extern void PUT_UAA16LE(void* p, unsigned short v, unsigned int i);
+extern void PUT_UAA16LE(void *p, unsigned short v, unsigned int i);
 
 
-extern unsigned long long GET_UAA64BE(void* p, unsigned int i);
+extern unsigned long long GET_UAA64BE(void *p, unsigned int i);
 
-extern unsigned int GET_UAA32BE(void* p, unsigned int i);
+extern unsigned int GET_UAA32BE(void *p, unsigned int i);
 
-extern unsigned short GET_UAA16BE(void* p, unsigned int i);
+extern unsigned short GET_UAA16BE(void *p, unsigned int i);
 
 
-extern unsigned long long GET_UAA64LE(void* p, unsigned int i);
+extern unsigned long long GET_UAA64LE(void *p, unsigned int i);
 
-extern unsigned int GET_UAA32LE(void* p, unsigned int i);
+extern unsigned int GET_UAA32LE(void *p, unsigned int i);
 
-extern unsigned short GET_UAA16LE(void* p, unsigned int i);
-#endif
+extern unsigned short GET_UAA16LE(void *p, unsigned int i);
 
 
+extern unsigned short BE16(unsigned short x);
+
+extern unsigned short LE16(unsigned short x);
+
+extern unsigned int BE32(unsigned int x);
+
+extern unsigned int LE32(unsigned int x);
+
+extern unsigned long long BE64(unsigned long long x);
+
+extern unsigned long long LE64(unsigned long long x);
+
+#endif // defined(__BYTE_ORDER)
+
 
 #define PUT_UA64BE(p, v)  PUT_UAA64BE(p, v, 0)
 #define PUT_UA32BE(p, v)  PUT_UAA32BE(p, v, 0)

floppy/.config-uClibc-ng

@@ -0,0 +1,254 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# uClibc-ng 1.0.15 C Library Configuration
+#
+# TARGET_alpha is not set
+# TARGET_arc is not set
+# TARGET_arm is not set
+# TARGET_avr32 is not set
+# TARGET_bfin is not set
+# TARGET_c6x is not set
+# TARGET_cris is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+TARGET_i386=y
+# TARGET_ia64 is not set
+# TARGET_lm32 is not set
+# TARGET_m68k is not set
+# TARGET_metag is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios2 is not set
+# TARGET_or1k is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sparc is not set
+# TARGET_x86_64 is not set
+# TARGET_xtensa is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="i386"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_386 is not set
+CONFIG_486=y
+# CONFIG_586 is not set
+# CONFIG_686 is not set
+TARGET_SUBARCH="i486"
+
+#
+# Using ELF file format
+#
+ARCH_HAS_DEPRECATED_SYSCALLS=y
+ARCH_LITTLE_ENDIAN=y
+
+#
+# Using Little Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+DO_XSI_MATH=y
+# UCLIBC_HAS_FENV is not set
+# UCLIBC_HAS_LONG_DOUBLE_MATH is not set
+KERNEL_HEADERS="/root/openadk/target_generic-x86_uclibc-ng/usr/include"
+HAVE_DOT_CONFIG=y
+
+#
+# General Library Settings
+#
+DOPIC=y
+ARCH_HAS_UCONTEXT=y
+HAVE_SHARED=y
+# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
+LDSO_LDD_SUPPORT=y
+LDSO_CACHE_SUPPORT=y
+# LDSO_PRELOAD_ENV_SUPPORT is not set
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+LDSO_BASE_FILENAME="ld.so"
+# LDSO_STANDALONE_SUPPORT is not set
+# LDSO_PRELINK_SUPPORT is not set
+# UCLIBC_STATIC_LDCONFIG is not set
+LDSO_RUNPATH=y
+LDSO_RUNPATH_OF_EXECUTABLE=y
+LDSO_SAFE_RUNPATH=y
+LDSO_SEARCH_INTERP_PATH=y
+LDSO_LD_LIBRARY_PATH=y
+LDSO_NO_CLEANUP=y
+UCLIBC_CTOR_DTOR=y
+# LDSO_GNU_HASH_SUPPORT is not set
+# HAS_NO_THREADS is not set
+UCLIBC_HAS_THREADS_NATIVE=y
+UCLIBC_HAS_THREADS=y
+UCLIBC_HAS_TLS=y
+PTHREADS_DEBUG_SUPPORT=y
+UCLIBC_HAS_SYSLOG=y
+UCLIBC_HAS_LFS=y
+MALLOC=y
+# MALLOC_SIMPLE is not set
+# MALLOC_STANDARD is not set
+MALLOC_GLIBC_COMPAT=y
+# UCLIBC_HAS_OBSTACK is not set
+UCLIBC_DYNAMIC_ATEXIT=y
+COMPAT_ATEXIT=y
+UCLIBC_HAS_UTMPX=y
+UCLIBC_HAS_UTMP=y
+UCLIBC_SUSV2_LEGACY=y
+UCLIBC_SUSV3_LEGACY=y
+UCLIBC_HAS_CONTEXT_FUNCS=y
+# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_SUSV4_LEGACY=y
+# UCLIBC_STRICT_HEADERS is not set
+# UCLIBC_HAS_STUBS is not set
+UCLIBC_HAS_SHADOW=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
+UCLIBC_HAS_PTY=y
+ASSUME_DEVPTS=y
+UNIX98PTY_ONLY=y
+UCLIBC_HAS_GETPT=y
+UCLIBC_HAS_LIBUTIL=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y
+
+#
+# Advanced Library Settings
+#
+UCLIBC_PWD_BUFFER_SIZE=256
+UCLIBC_GRP_BUFFER_SIZE=256
+
+#
+# Support various families of functions
+#
+UCLIBC_LINUX_MODULE_26=y
+# UCLIBC_LINUX_MODULE_24 is not set
+UCLIBC_LINUX_SPECIFIC=y
+UCLIBC_HAS_GNU_ERROR=y
+UCLIBC_BSD_SPECIFIC=y
+UCLIBC_HAS_BSD_ERR=y
+UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
+# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
+# UCLIBC_NTP_LEGACY is not set
+UCLIBC_SV4_DEPRECATED=y
+UCLIBC_HAS_REALTIME=y
+UCLIBC_HAS_ADVANCED_REALTIME=y
+UCLIBC_HAS_EPOLL=y
+UCLIBC_HAS_XATTR=y
+# UCLIBC_HAS_PROFILING is not set
+UCLIBC_HAS_CRYPT_IMPL=y
+UCLIBC_HAS_SHA256_CRYPT_IMPL=y
+# UCLIBC_HAS_SHA512_CRYPT_IMPL is not set
+UCLIBC_HAS_CRYPT=y
+UCLIBC_HAS_NETWORK_SUPPORT=y
+UCLIBC_HAS_SOCKET=y
+UCLIBC_HAS_IPV4=y
+UCLIBC_HAS_IPV6=y
+# UCLIBC_HAS_RPC is not set
+UCLIBC_USE_NETLINK=y
+UCLIBC_SUPPORT_AI_ADDRCONFIG=y
+UCLIBC_HAS_BSD_RES_CLOSE=y
+UCLIBC_HAS_COMPAT_RES_STATE=y
+# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
+UCLIBC_HAS_RESOLVER_SUPPORT=y
+UCLIBC_HAS_LIBRESOLV_STUB=y
+UCLIBC_HAS_LIBNSL_STUB=y
+
+#
+# String and Stdio Support
+#
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_STDIO_FUTEXES=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+UCLIBC_HAS_WCHAR=y
+# UCLIBC_HAS_LOCALE is not set
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+UCLIBC_HAS_STDIO_BUFSIZ_4096=y
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+UCLIBC_HAS_STDIO_GETC_MACRO=y
+UCLIBC_HAS_STDIO_PUTC_MACRO=y
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+# UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE is not set
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+UCLIBC_HAS_PRINTF_M_SPEC=y
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_GETOPT_LONG=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
+UCLIBC_HAS_ARGP=y
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+# UCLIBC_HAS_REGEX_OLD is not set
+UCLIBC_HAS_FNMATCH=y
+# UCLIBC_HAS_FNMATCH_OLD is not set
+UCLIBC_HAS_WORDEXP=y
+UCLIBC_HAS_NFTW=y
+UCLIBC_HAS_FTW=y
+UCLIBC_HAS_FTS=y
+UCLIBC_HAS_GLOB=y
+UCLIBC_HAS_GNU_GLOB=y
+
+#
+# Library Installation Options
+#
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="/usr/"
+MULTILIB_DIR="lib"
+HARDWIRED_ABSPATH=y
+
+#
+# Security options
+#
+# UCLIBC_BUILD_PIE is not set
+UCLIBC_HAS_ARC4RANDOM=y
+# ARC4RANDOM_USES_NODEV is not set
+# UCLIBC_HAS_SSP is not set
+UCLIBC_BUILD_RELRO=y
+UCLIBC_BUILD_NOW=y
+UCLIBC_BUILD_NOEXECSTACK=y
+
+#
+# Development/debugging options
+#
+CROSS_COMPILER_PREFIX=""
+UCLIBC_EXTRA_CFLAGS=""
+# DODEBUG is not set
+# DOSTRIP is not set
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+# UCLIBC_HAS_BACKTRACE is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set

getifaddrs-musl.c

@@ -152,7 +152,7 @@ static void copy_lladdr(struct sockaddr **r, union sockany *sa, void *addr, size
 static int netlink_msg_to_ifaddr(void *pctx, struct nlmsghdr *h)
 {
 	struct ifaddrs_ctx *ctx = pctx;
-	struct ifaddrs_storage *ifs, *ifs0 = NULL;
+	struct ifaddrs_storage *ifs, *ifs0;
 	struct ifinfomsg *ifi = NLMSG_DATA(h);
 	struct ifaddrmsg *ifa = NLMSG_DATA(h);
 	struct rtattr *rta;

helpers.c

@@ -0,0 +1,369 @@
+/*
+ * Helper functions used by other modules
+ */
+
+#ifndef CONFIG
+#define CONFIG "config.h"
+#endif // CONFIG
+#include CONFIG
+
+#ifndef _WIN32
+#include <errno.h>
+#endif // _WIN32
+#include <getopt.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include "helpers.h"
+#include "output.h"
+#include "endian.h"
+#include "shared_globals.h"
+
+
+/*
+ *  UCS2 <-> UTF-8 functions
+ *  All functions use little endian UCS2 since we only need it to communicate with Windows via RPC
+ */
+
+// Convert one character from UTF-8 to UCS2
+// Returns 0xffff, if utf-8 evaluates to > 0xfffe (outside basic multilingual pane)
+WCHAR utf8_to_ucs2_char (const unsigned char *input, const unsigned char **end_ptr)
+{
+    *end_ptr = input;
+    if (input[0] == 0)
+        return ~0;
+
+    if (input[0] < 0x80) {
+        *end_ptr = input + 1;
+        return LE16(input[0]);
+    }
+
+    if ((input[0] & 0xE0) == 0xE0) {
+
+    	if (input[1] == 0 || input[2] == 0)
+            return ~0;
+
+    	*end_ptr = input + 3;
+
+    	return
+            LE16((input[0] & 0x0F)<<12 |
+            (input[1] & 0x3F)<<6  |
+            (input[2] & 0x3F));
+    }
+
+    if ((input[0] & 0xC0) == 0xC0) {
+        if (input[1] == 0)
+            return ~0;
+
+        *end_ptr = input + 2;
+
+        return
+            LE16((input[0] & 0x1F)<<6  |
+            (input[1] & 0x3F));
+    }
+    return ~0;
+}
+
+// Convert one character from UCS2 to UTF-8
+// Returns length of UTF-8 char (1, 2 or 3) or -1 on error (UTF-16 outside UCS2)
+// char *utf8 must be large enough to hold 3 bytes
+int ucs2_to_utf8_char (const WCHAR ucs2_le, char *utf8)
+{
+    const WCHAR ucs2 = LE16(ucs2_le);
+
+    if (ucs2 < 0x80) {
+        utf8[0] = ucs2;
+        utf8[1] = '\0';
+        return 1;
+    }
+
+    if (ucs2 >= 0x80  && ucs2 < 0x800) {
+        utf8[0] = (ucs2 >> 6)   | 0xC0;
+        utf8[1] = (ucs2 & 0x3F) | 0x80;
+        utf8[2] = '\0';
+        return 2;
+    }
+
+    if (ucs2 >= 0x800 && ucs2 < 0xFFFF) {
+
+    	if (ucs2 >= 0xD800 && ucs2 <= 0xDFFF) {
+    		/* Ill-formed (UTF-16 ouside of BMP) */
+    		return -1;
+    	}
+
+    	utf8[0] = ((ucs2 >> 12)       ) | 0xE0;
+        utf8[1] = ((ucs2 >> 6 ) & 0x3F) | 0x80;
+        utf8[2] = ((ucs2      ) & 0x3F) | 0x80;
+        utf8[3] = '\0';
+        return 3;
+    }
+
+    return -1;
+}
+
+
+// Converts UTF8 to UCS2. Returns size in bytes of the converted string or -1 on error
+size_t utf8_to_ucs2(WCHAR* const ucs2_le, const char* const utf8, const size_t maxucs2, const size_t maxutf8)
+{
+	const unsigned char* current_utf8 = (unsigned char*)utf8;
+	WCHAR* current_ucs2_le = ucs2_le;
+
+	for (; *current_utf8; current_ucs2_le++)
+	{
+		size_t size = (char*)current_utf8 - utf8;
+
+		if (size >= maxutf8) return (size_t)-1;
+		if (((*current_utf8 & 0xc0) == 0xc0) && (size >= maxutf8 - 1)) return (size_t)-1;
+		if (((*current_utf8 & 0xe0) == 0xe0) && (size >= maxutf8 - 2)) return (size_t)-1;
+		if (current_ucs2_le - ucs2_le >= (intptr_t)maxucs2 - 1) return (size_t)-1;
+
+		*current_ucs2_le = utf8_to_ucs2_char(current_utf8, &current_utf8);
+		current_ucs2_le[1] = 0;
+
+		if (*current_ucs2_le == (WCHAR)-1) return (size_t)-1;
+	}
+	return current_ucs2_le - ucs2_le;
+}
+
+// Converts UCS2 to UTF-8. Return TRUE or FALSE
+BOOL ucs2_to_utf8(const WCHAR* const ucs2_le, char* utf8, size_t maxucs2, size_t maxutf8)
+{
+	char utf8_char[4];
+	const WCHAR* current_ucs2 = ucs2_le;
+	unsigned int index_utf8 = 0;
+
+	for(*utf8 = 0; *current_ucs2; current_ucs2++)
+	{
+		if (current_ucs2 - ucs2_le > (intptr_t)maxucs2) return FALSE;
+		int len = ucs2_to_utf8_char(*current_ucs2, utf8_char);
+		if (index_utf8 + len > maxutf8) return FALSE;
+		strncat(utf8, utf8_char, len);
+		index_utf8+=len;
+	}
+
+	return TRUE;
+}
+
+/* End of UTF-8 <-> UCS2 conversion */
+
+
+// Checks, whether a string is a valid integer number between min and max. Returns TRUE or FALSE. Puts int value in *value
+BOOL stringToInt(const char *const szValue, const unsigned int min, const unsigned int max, unsigned int *const value)
+{
+	char *nextchar;
+
+	errno = 0;
+	long long result = strtoll(szValue, &nextchar, 10);
+
+	if (errno || result < (long long)min || result > (long long)max || *nextchar)
+	{
+		return FALSE;
+	}
+
+	*value = (unsigned int)result;
+	return TRUE;
+}
+
+
+//Converts a String Guid to a host binary guid in host endianess
+int_fast8_t string2Uuid(const char *const restrict input, GUID *const restrict guid)
+{
+	int i;
+
+	if (strlen(input) < GUID_STRING_LENGTH) return FALSE;
+	if (input[8] != '-' || input[13] != '-' || input[18] != '-' || input[23] != '-') return FALSE;
+
+	for (i = 0; i < GUID_STRING_LENGTH; i++)
+	{
+		if (i == 8 || i == 13 || i == 18 || i == 23) continue;
+
+		const char c = toupper((int)input[i]);
+
+		if (c < '0' || c > 'F' || (c > '9' && c < 'A')) return FALSE;
+	}
+
+	char inputCopy[GUID_STRING_LENGTH + 1];
+	strncpy(inputCopy, input, GUID_STRING_LENGTH + 1);
+	inputCopy[8] = inputCopy[13] = inputCopy[18] = 0;
+
+	hex2bin((BYTE*)&guid->Data1, inputCopy, 8);
+	hex2bin((BYTE*)&guid->Data2, inputCopy + 9, 4);
+	hex2bin((BYTE*)&guid->Data3, inputCopy + 14, 4);
+	hex2bin(guid->Data4, input + 19, 16);
+
+	guid->Data1 =  BE32(guid->Data1);
+	guid->Data2 =  BE16(guid->Data2);
+	guid->Data3 =  BE16(guid->Data3);
+	return TRUE;
+}
+
+
+// convert GUID to little-endian
+void LEGUID(GUID *const restrict out, const GUID* const restrict in)
+{
+	#if __BYTE_ORDER != __LITTLE_ENDIAN
+	out->Data1 = LE32(in->Data1);
+	out->Data2 = LE16(in->Data2);
+	out->Data3 = LE16(in->Data3);
+	memcpy(out->Data4, in->Data4, sizeof(out->Data4));
+	#else
+	memcpy(out, in, sizeof(GUID));
+	#endif
+}
+
+
+//Checks a command line argument if it is numeric and between min and max. Returns the numeric value or exits on error
+__pure unsigned int getOptionArgumentInt(const char o, const unsigned int min, const unsigned int max)
+{
+	unsigned int result;
+
+	if (!stringToInt(optarg, min, max, &result))
+	{
+		printerrorf("Fatal: Option \"-%c\" must be numeric between %u and %u.\n", o, min, max);
+		exit(!0);
+	}
+
+	return result;
+}
+
+
+// Resets getopt() to start parsing from the beginning
+void optReset(void)
+{
+	#if __minix__ || defined(__BSD__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
+	optind = 1;
+	optreset = 1; // Makes newer BSD getopt happy
+	#elif defined(__UCLIBC__) // uClibc headers also define __GLIBC__ so be careful here
+	optind = 0; // uClibc seeks compatibility with GLIBC
+	#elif defined(__GLIBC__)
+	optind = 0; // Makes GLIBC getopt happy
+	#else // Standard for most systems
+	optind = 1;
+	#endif
+}
+
+
+#if defined(_WIN32) || defined(USE_MSRPC)
+
+// Returns a static message buffer containing text for a given Win32 error. Not thread safe (same as strerror)
+char* win_strerror(const int message)
+{
+	#define STRERROR_BUFFER_SIZE 256
+	static char buffer[STRERROR_BUFFER_SIZE];
+
+	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK, NULL, message, 0, buffer, STRERROR_BUFFER_SIZE, NULL);
+	return buffer;
+}
+
+#endif // defined(_WIN32) || defined(USE_MSRPC)
+
+
+/*
+ * parses an address in the form host:[port] in addr
+ * returns host and port in seperate strings
+ */
+void parseAddress(char *const addr, char** szHost, char** szPort)
+{
+	*szHost = addr;
+
+#	ifndef NO_SOCKETS
+	*szPort = (char*)defaultport;
+#	else // NO_SOCKETS
+	*szPort = "1688";
+#	endif // NO_SOCKETS
+
+	char *lastcolon = strrchr(addr, ':');
+	char *firstcolon = strchr(addr, ':');
+	char *closingbracket = strrchr(addr, ']');
+
+	if (*addr == '[' && closingbracket) //Address in brackets
+	{
+		*closingbracket = 0;
+		(*szHost)++;
+
+		if (closingbracket[1] == ':')
+			*szPort = closingbracket + 2;
+	}
+	else if (firstcolon && firstcolon == lastcolon) //IPv4 address or hostname with port
+	{
+		*firstcolon = 0;
+		*szPort = firstcolon + 1;
+	}
+}
+
+
+// Initialize random generator (needs to be done in each thread)
+void randomNumberInit()
+{
+	struct timeval tv;
+	gettimeofday(&tv, NULL);
+	srand((unsigned int)(tv.tv_sec ^ tv.tv_usec));
+}
+
+
+// We always exit immediately if any OOM condition occurs
+__noreturn void OutOfMemory(void)
+{
+	errorout("Fatal: Out of memory");
+	exit(!0);
+}
+
+
+void* vlmcsd_malloc(size_t len)
+{
+	void* buf = malloc(len);
+	if (!buf) OutOfMemory();
+	return buf;
+}
+
+
+/*
+ * Converts hex digits to bytes in big-endian order.
+ * Ignores any non-hex characters
+ */
+void hex2bin(BYTE *const bin, const char *hex, const size_t maxbin)
+{
+	static const char *const hexdigits = "0123456789ABCDEF";
+	char* nextchar;
+	size_t i;
+
+	for (i = 0; (i < 16) && utf8_to_ucs2_char((const unsigned char*)hex, (const unsigned char**)&nextchar) != (WCHAR)-1; hex = nextchar)
+	{
+		const char* pos = strchr(hexdigits, toupper((int)*hex));
+		if (!pos) continue;
+
+		if (!(i & 1)) bin[i >> 1] = 0;
+		bin[i >> 1] |= (char)(pos - hexdigits);
+		if (!(i & 1)) bin[i >> 1] <<= 4;
+		i++;
+		if (i >> 1 > maxbin) break;
+	}
+}
+
+
+__pure BOOL getArgumentBool(int_fast8_t *result, const char *const argument)
+{
+	if (
+		!strncasecmp(argument, "true", 4) ||
+		!strncasecmp(argument, "on", 2) ||
+		!strncasecmp(argument, "yes", 3) ||
+		!strncasecmp(argument, "1", 1)
+	)
+	{
+		*result = TRUE;
+		return TRUE;
+	}
+	else if (
+			!strncasecmp(argument, "false", 5) ||
+			!strncasecmp(argument, "off", 3) ||
+			!strncasecmp(argument, "no", 2) ||
+			!strncasecmp(argument, "0", 1)
+	)
+	{
+		*result = FALSE;
+		return TRUE;
+	}
+
+	return FALSE;
+}
+

helpers.h

@@ -9,10 +9,6 @@
 #include <stdint.h>
 #include "types.h"
 
-#if __ANDROID__
-#include <sys/syscall.h>
-#endif // __ANDROID__
-
 #define GUID_LE 0
 #define GUID_BE 1
 #define GUID_SWAP 2
@@ -20,38 +16,19 @@
 BOOL stringToInt(const char *const szValue, const unsigned int min, const unsigned int max, unsigned int *const value);
 unsigned int getOptionArgumentInt(const char o, const unsigned int min, const unsigned int max);
 void optReset(void);
-__pure DWORD timeSpanString2Seconds(const char *const restrict argument);
-#define timeSpanString2Minutes(x) (timeSpanString2Seconds(x) / 60)
 char* win_strerror(const int message);
 int ucs2_to_utf8_char (const WCHAR ucs2_le, char *utf8);
 size_t utf8_to_ucs2(WCHAR* const ucs2_le, const char* const utf8, const size_t maxucs2, const size_t maxutf8);
 WCHAR utf8_to_ucs2_char (const unsigned char * input, const unsigned char ** end_ptr);
 BOOL ucs2_to_utf8(const WCHAR* const ucs2_le, char* utf8, size_t maxucs2, size_t maxutf8);
-int_fast8_t string2UuidLE(const char *const restrict input, GUID *const restrict guid);
+int_fast8_t string2Uuid(const char *const restrict input, GUID *const restrict guid);
 void randomNumberInit();
+void LEGUID(GUID *const restrict result, const GUID* const restrict guid);
 void parseAddress(char *const addr, char** szHost, char** szPort);
 __noreturn void OutOfMemory(void);
 void* vlmcsd_malloc(size_t len);
 void hex2bin(BYTE *const bin, const char *hex, const size_t maxbin);
-void loadKmsData();
-#if !defined(DATA_FILE) || !defined(NO_SIGHUP)
-void getExeName();
-#endif // !defined(DATA_FILE) || !defined(NO_SIGHUP)
 __pure BOOL getArgumentBool(int_fast8_t *result, const char *const argument);
-char* vlmcsd_strdup(const char* src);
 
-#if defined(NO_SOCKETS) || IS_LIBRARY
-#define exitOnWarningLevel(x)
-#else // !NO_SOCKETS
-void exitOnWarningLevel(const int_fast8_t level);
-#endif // !NO_SOCKETS
-
-
-#if __ANDROID__ && !defined(USE_THREADS) // Bionic does not wrap these syscalls (intentionally because Google fears, developers don't know how to use it)
-int shmget(key_t key, size_t size, int shmflg);
-void *shmat(int shmid, const void *shmaddr, int shmflg);
-int shmdt(const void *shmaddr);
-int shmctl(int shmid, int cmd, /*struct shmid_ds*/void *buf);
-#endif // __ANDROID__ && !defined(USE_THREADS)
 
 #endif // HELPERS_H

kms.h

@@ -6,12 +6,8 @@
 #endif // CONFIG
 #include CONFIG
 
-#if _MSC_VER
-//#include <time.h>
-#else
 #include <sys/time.h>
-#endif // _MSC_VER
-//#include <stdlib.h>
+#include <stdlib.h>
 #include "types.h"
 //
 // REQUEST... types are actually fixed size
@@ -54,15 +50,6 @@
 #define ActivationInterval VLActivationInterval
 #define RenewalInterval VLRenewalInterval
 
-#define MAX_CLIENTS 671
-
-typedef struct
-{
-	GUID Guid[MAX_CLIENTS];
-	int_fast16_t CurrentCount;
-	int_fast16_t MaxCount;
-	int_fast16_t CurrentPosition;
-} ClientList_t, *PClientList_t;
 
 typedef struct {
 	VERSION_INFO;
@@ -80,7 +67,7 @@ typedef struct {
 } /*__packed*/ REQUEST;
 
 typedef struct {
-	VERSION_INFO;
+	VERSION_INFO;					
 	DWORD PIDSize;					// Size of PIDData in bytes.
 	WCHAR KmsPID[PID_BUFFER_SIZE];	// ePID (must include terminating zero)
 	GUID CMID;						// Client machine id. Must be the same as in request.
@@ -228,154 +215,49 @@ typedef union
 
 typedef BYTE hwid_t[8];
 
-typedef enum 
-{
-	None = 0,
-	UseNdr64 = 1 << 0,
-	UseForEpid = 1 << 1,
-	MayBeServer = 1 << 2,
-} HostBuildFlag;
-
-typedef struct CsvlkData
-{
-	union
-	{
-		uint64_t EPidOffset;
-		char* EPid;
-	};
-
-	int64_t ReleaseDate;
-	uint32_t GroupId;
-	uint32_t MinKeyId;
-	uint32_t MaxKeyId;
-	uint8_t MinActiveClients;
-	uint8_t Reserved[3];
-
-} CsvlkData_t, *PCsvlkData_t;
-
-typedef struct VlmcsdData
-{
-	union
-	{
-		GUID Guid;
-		uint8_t GuidBytes[16];
-	};
-
-	union
-	{
-		uint64_t NameOffset;
-		char* Name;
-	};
-
-	uint8_t AppIndex;
-	uint8_t KmsIndex;
-	uint8_t ProtocolVersion;
-	uint8_t NCountPolicy;
-	uint8_t IsRetail;
-	uint8_t IsPreview;
-	uint8_t EPidIndex;
-	uint8_t reserved;
-
-} VlmcsdData_t, *PVlmcsdData_t;
-
 typedef struct
 {
-	union
-	{
-		uint64_t Offset;
-		void* Pointer;
-	};
-} DataPointer_t;
+	GUID guid;
+	const char* name;
+	const char* pid;
+	uint8_t AppIndex;
+	uint8_t KmsIndex;
+} KmsIdList;
 
-#define KMS_OPTIONS_USENDR64 1 << 0
+#define KMS_PARAM_MAJOR AppIndex
+#define KMS_PARAM_REQUIREDCOUNT KmsIndex
 
-typedef struct HostBuild
-{
-	union
-	{
-		uint64_t DisplayNameOffset;
-		char* DisplayName;
-	};
+#define APP_ID_WINDOWS 0
+#define APP_ID_OFFICE2010 1
+#define APP_ID_OFFICE2013 2
 
-	int64_t ReleaseDate;
-	int32_t BuildNumber;
-	int32_t PlatformId;
-	HostBuildFlag Flags;
-	uint8_t reserved[4];
+#define KMS_ID_VISTA 0
+#define KMS_ID_WIN7 1
+#define KMS_ID_WIN8_VL 2
+#define KMS_ID_WIN_BETA 3
+#define KMS_ID_WIN8_RETAIL 4
+#define KMS_ID_WIN81_VL 5
+#define KMS_ID_WIN81_RETAIL 6
+#define KMS_ID_WIN2008A 7
+#define KMS_ID_WIN2008B 8
+#define KMS_ID_WIN2008C 9
+#define KMS_ID_WIN2008R2A 10
+#define KMS_ID_WIN2008R2B 11
+#define KMS_ID_WIN2008R2C 12
+#define KMS_ID_WIN2012 13
+#define KMS_ID_WIN2012R2 14
+#define KMS_ID_OFFICE2010 15
+#define KMS_ID_OFFICE2013 16
+#define KMS_ID_WIN_SRV_BETA 17
+#define KMS_ID_OFFICE2016 18
+#define KMS_ID_WIN10_VL 19
+#define KMS_ID_WIN10_RETAIL 20
 
-} HostBuild_t, *PHostBuild_t;
+#define PWINGUID &AppList[APP_ID_WINDOWS].guid
+#define POFFICE2010GUID &AppList[APP_ID_OFFICE2010].guid
+#define POFFICE2013GUID &AppList[APP_ID_OFFICE2013].guid
 
-typedef struct VlmcsdHeader
-{
-	BYTE Magic[4];
-	VERSION_INFO;
-	uint8_t CsvlkCount;
-	uint8_t Flags;
-	uint8_t Reserved[2];
-
-	union
-	{
-		int32_t Counts[5];
-
-		struct
-		{
-			int32_t AppItemCount;
-			int32_t KmsItemCount;
-			int32_t SkuItemCount;
-			int32_t HostBuildCount;
-			int32_t reserved2Counts;
-		};
-	};
-
-	union
-	{
-		DataPointer_t Datapointers[5];
-
-		struct
-		{
-			union
-			{
-				uint64_t AppItemOffset;
-				PVlmcsdData_t AppItemList;
-			};
-
-			union
-			{
-				uint64_t KmsItemOffset;
-				PVlmcsdData_t KmsItemList;
-			};
-
-			union
-			{
-				uint64_t SkuItemOffset;
-				PVlmcsdData_t SkuItemList;
-			};
-
-			union
-			{
-				uint64_t HostBuildOffset;
-				PHostBuild_t HostBuildList;
-			};
-
-			union
-			{
-				uint64_t Reserved2Offset;
-				void* Reserved2List;
-			};
-
-			CsvlkData_t CsvlkData[1];
-		};
-	};
-
-} VlmcsdHeader_t, *PVlmcsdHeader_t;
-
-//#define EPID_INDEX_WINDOWS 0
-//#define EPID_INDEX_OFFICE2010 1
-//#define EPID_INDEX_OFFICE2013 2
-//#define EPID_INDEX_OFFICE2016 3
-//#define EPID_INDEX_WINCHINAGOV 4
-
-typedef HRESULT(__stdcall *RequestCallback_t)(REQUEST* baseRequest, RESPONSE *const baseResponse, BYTE *const hwId, const char* const ipstr);
+typedef BOOL(__stdcall *RequestCallback_t)(const REQUEST *const baseRequest, RESPONSE *const baseResponse, BYTE *const hwId, const char* const ipstr);
 
 size_t CreateResponseV4(REQUEST_V4 *const Request, BYTE *const response_data, const char* const ipstr);
 size_t CreateResponseV6(REQUEST_V6 *restrict Request, BYTE *const response_data, const char* const ipstr);
@@ -383,28 +265,23 @@ BYTE *CreateRequestV4(size_t *size, const REQUEST* requestBase);
 BYTE *CreateRequestV6(size_t *size, const REQUEST* requestBase);
 void randomPidInit();
 void get16RandomBytes(void* ptr);
-RESPONSE_RESULT DecryptResponseV6(RESPONSE_V6* response_v6, int responseSize, BYTE* const response, const BYTE* const rawRequest, BYTE* hwid);
-RESPONSE_RESULT DecryptResponseV4(RESPONSE_V4* response_v4, const int responseSize, BYTE* const rawResponse, const BYTE* const rawRequest);
-void getUnixTimeAsFileTime(FILETIME* ts);
-__pure int64_t fileTimeToUnixTime(FILETIME* ts);
+RESPONSE_RESULT DecryptResponseV6(RESPONSE_V6* Response_v6, int responseSize, BYTE* const response, const BYTE* const request, BYTE* hwid);
+RESPONSE_RESULT DecryptResponseV4(RESPONSE_V4* Response_v4, const int responseSize, BYTE* const response, const BYTE* const request);
+void getUnixTimeAsFileTime(FILETIME *const ts);
+__pure int64_t fileTimeToUnixTime(const FILETIME *const ts);
+const char* getProductNameHE(const GUID *const guid, const KmsIdList *const List, ProdListIndex_t *const i);
+const char* getProductNameLE(const GUID *const guid, const KmsIdList *const List, ProdListIndex_t *const i);
+__pure ProdListIndex_t getExtendedProductListSize();
+__pure ProdListIndex_t getAppListSize(void);
 
-#ifndef IS_LIBRARY
-int32_t getProductIndex(const GUID* guid, const PVlmcsdData_t list, const int32_t count, char** name, char** ePid);
-#if !defined(NO_INI_FILE)||!defined(NO_VERBOSE_LOG)
-const char* getNextString(const char* s);
-#endif  // !defined(NO_INI_FILE)||!defined(NO_VERBOSE_LOG)
-#endif // IS_LIBRARY
-
-#ifndef NO_STRICT_MODES
-void InitializeClientLists();
-void CleanUpClientLists();
-#endif // !NO_STRICT_MODES
+extern const KmsIdList ProductList[];
+extern const KmsIdList AppList[];
+extern const KmsIdList ExtendedProductList[];
 
 extern RequestCallback_t CreateResponseBase;
 
 #ifdef _PEDANTIC
-uint16_t IsValidLcid(const uint16_t lcid);
-uint32_t IsValidHostBuild(const int32_t hostBuild);
+uint16_t IsValidLcid(const uint16_t Lcid);
 #endif // _PEDANTIC
 
 #endif // __kms_h

libkms.c

@@ -0,0 +1,169 @@
+/*
+ * libkms.c
+ */
+
+#ifndef CONFIG
+#define CONFIG "config.h"
+#endif // CONFIG
+#include CONFIG
+
+#ifdef EXTERNAL
+#undef EXTERNAL
+#endif
+
+#define EXTERNAL dllexport
+
+#define DLLVERSION 0x30001
+
+#include "libkms.h"
+#include "shared_globals.h"
+#include "network.h"
+#include "helpers.h"
+
+#ifndef _WIN32
+#include <signal.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <netinet/in.h>
+#endif // WIN32
+
+#ifdef IS_LIBRARY
+char ErrorMessage[MESSAGE_BUFFER_SIZE];
+#endif // IS_LIBRARY
+
+static int_fast8_t IsServerStarted = FALSE;
+
+
+EXTERNC __declspec(EXTERNAL) DWORD __cdecl SendActivationRequest
+(
+	const char* const hostname,
+	const int port,
+	RESPONSE* baseResponse,
+	const REQUEST* const baseRequest,
+	RESPONSE_RESULT* result, BYTE *hwid
+)
+{
+	return !0; // not yet implemented
+}
+
+
+EXTERNC __declspec(EXTERNAL) DWORD __cdecl StartKmsServer(const int port, RequestCallback_t requestCallback)
+{
+#ifndef SIMPLE_SOCKETS
+	char listenAddress[64];
+
+	if (IsServerStarted) return !0;
+
+#	ifdef _WIN32
+#	ifndef USE_MSRPC
+	// Windows Sockets must be initialized
+	WSADATA wsadata;
+	int error;
+
+	if ((error = WSAStartup(0x0202, &wsadata)))
+	{
+		return error;
+	}
+#	endif // USE_MSRPC
+#	endif // _WIN32
+
+	CreateResponseBase = requestCallback;
+
+	int maxsockets = 0;
+	int_fast8_t haveIPv4 = FALSE;
+	int_fast8_t haveIPv6 = FALSE;
+
+	if (checkProtocolStack(AF_INET)) { haveIPv4 = TRUE; maxsockets++; }
+	if (checkProtocolStack(AF_INET6)) { haveIPv6 = TRUE; maxsockets++; }
+
+	if(!maxsockets) return !0;
+
+	SocketList = (SOCKET*)vlmcsd_malloc(sizeof(SOCKET) * (size_t)maxsockets);
+	numsockets = 0;
+
+	if (haveIPv4)
+	{
+		snprintf(listenAddress, 64, "0.0.0.0:%u", (unsigned int)port);
+		addListeningSocket(listenAddress);
+	}
+
+	if (haveIPv6)
+	{
+		snprintf(listenAddress, 64, "[::]:%u", (unsigned int)port);
+		addListeningSocket(listenAddress);
+	}
+
+	if (!numsockets)
+	{
+		free(SocketList);
+		return !0;
+	}
+
+	IsServerStarted = TRUE;
+
+	runServer();
+
+	IsServerStarted = FALSE;
+	return 0;
+
+#	else // SIMPLE_SOCKETS
+
+	if (IsServerStarted) return !0;
+	int error;
+
+#	ifdef _WIN32
+#	ifndef USE_MSRPC
+	// Windows Sockets must be initialized
+	WSADATA wsadata;
+
+	if ((error = WSAStartup(0x0202, &wsadata)))
+	{
+		return error;
+	}
+#	endif // USE_MSRPC
+#	endif // _WIN32
+
+	defaultport = vlmcsd_malloc(16);
+	snprintf((char*)defaultport, (size_t)16, "%i", port);
+
+	CreateResponseBase = requestCallback;
+	error = listenOnAllAddresses();
+	if (error) return error;
+
+	IsServerStarted = TRUE;
+	runServer();
+	IsServerStarted = FALSE;
+
+	return 0;
+
+
+#	endif // SIMPLE_SOCKETS
+}
+
+
+EXTERNC __declspec(EXTERNAL) DWORD __cdecl StopKmsServer()
+{
+	if (!IsServerStarted) return !0;
+
+	closeAllListeningSockets();
+
+#	ifndef SIMPLE_SOCKETS
+	if (SocketList) free(SocketList);
+#	endif
+
+	return 0;
+}
+
+
+EXTERNC __declspec(EXTERNAL) int __cdecl GetLibKmsVersion()
+{
+	return DLLVERSION;
+}
+
+
+EXTERNC __declspec(EXTERNAL) const char* const __cdecl GetEmulatorVersion()
+{
+	return VERSION;
+}
+

libkms.h

@@ -0,0 +1,28 @@
+/*
+ * libkms.h
+ */
+
+#ifndef LIBKMS_H_
+#define LIBKMS_H_
+
+#include "types.h"
+#include "kms.h"
+#include "rpc.h"
+
+#ifndef EXTERNC
+#ifdef __cplusplus
+#define EXTERNC EXTERN "C"
+#else
+#define EXTERNC
+#endif
+#endif
+
+EXTERNC __declspec(EXTERNAL) DWORD __cdecl SendActivationRequest(const char* const hostname, const int port, RESPONSE* baseResponse, const REQUEST* const baseRequest, RESPONSE_RESULT* result, BYTE *hwid);
+EXTERNC __declspec(EXTERNAL) DWORD __cdecl StartKmsServer(const int port, RequestCallback_t requestCallback);
+EXTERNC __declspec(EXTERNAL) DWORD __cdecl StopKmsServer();
+EXTERNC __declspec(EXTERNAL) int __cdecl GetLibKmsVersion();
+EXTERNC __declspec(EXTERNAL) const char* const __cdecl GetEmulatorVersion();
+//EXTERN_C __declspec(EXTERNAL) unsigned int __cdecl GetRandom32();
+
+
+#endif /* LIBKMS_H_ */

make_dragonfly

@@ -0,0 +1,30 @@
+#!/usr/local/bin/bash
+
+export VERBOSE=3
+export DNS_PARSER=OS
+
+rm -f vlmcsd-Dragon* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
+rm -f vlmcsdmulti vlmcsd vlmcs 2>/dev/null
+
+MAKEFLAGS="-B -j12"
+REUSEOBJFLAGS="-j12"
+
+CF="-flto=12 -static-libgcc -pipe -fwhole-program -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CF45="-static-libgcc -pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CFCLANG="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+LF="-Wl,-z,norelro -Wl,--hash-style=sysv -Wl,--build-id=none"
+LFCLANG="-Wl,-z,norelro -Wl,--hash-style=sysv"
+export CC=gcc5
+
+gmake $MAKEFLAGS MULTI_NAME=vlmcsdmulti-DragonFly-x64 PROGRAM_NAME=vlmcsd-DragonFly-x64 CLIENT_NAME=vlmcs-DragonFly-x64 CFLAGS="$CF" LDFLAGS="$LF" allmulti
+
+rm *.o
+
+strip -s --strip-unneeded --remove-section=.eh_frame_hdr --remove-section=.eh_frame --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag vlmcs-* vlmcsd-* vlmcsdmulti-*
+sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
+
+cp -af vlmcsd-DragonFly-x64 /usr/local/sbin/vlmcsd
+cp -af vlmcs-DragonFly-x64 /usr/local/bin/vlmcs
+
+# Copy everything to distribution server
+scp -p vlmcsdmulti-* vlmcsd-Dragon* vlmcs-* root@ubuntu64:x/binaries/DragonFly/intel/

make_freebsd

@@ -0,0 +1,37 @@
+#!/usr/local/bin/bash
+
+export VERBOSE=3
+export DNS_PARSER=OS
+
+rm -f vlmcsd-Free* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
+rm -f vlmcsdmulti vlmcsd vlmcs 2>/dev/null
+
+MAKEFLAGS="-B -j12"
+REUSEOBJFLAGS="-j12"
+
+CF="-flto=12 -static-libgcc -pipe -fwhole-program -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CFCLANG="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+LF="-Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none"
+LFCLANG="-Wl,-z,norelro -Wl,--hash-style=gnu"
+
+gmake $MAKEFLAGS allmulti CAT=2 MULTI_NAME=vlmcsdmulti-FreeBSD-10.3-x64-gcc CLIENT_NAME=vlmcs-FreeBSD-10.3-x64-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x64-gcc CC=gcc5 CFLAGS="$CF" LDFLAGS="$LF"
+gmake $MAKEFLAGS MULTI_NAME=vlmcsdmulti-FreeBSD-10.3-x64 CLIENT_NAME=vlmcs-FreeBSD-10.3-x64 PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x64 CC=clang38 CFLAGS="$CFCLANG" LDFLAGS="$LF" allmulti
+gmake $MAKEFLAGS MULTI_NAME=vlmcsdmulti-FreeBSD-10.3-x86 CLIENT_NAME=vlmcs-FreeBSD-10.3-x86 PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x86 CC=clang38 CFLAGS="$CFCLANG -m32" LDFLAGS="$LF"
+gmake $MAKEFLAGS allmulti CAT=2 MULTI_NAME=vlmcsdmulti-FreeBSD-10.3-x86-gcc CLIENT_NAME=vlmcs-FreeBSD-10.3-x86-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x86-gcc CC=gcc5 CFLAGS="$CF -m32 -DCOMPAT_32BIT" LDFLAGS="-L/usr/lib32 -B/usr/lib32 $LF"
+gmake $MAKEFLAGS CAT=2 vlmcsd-FreeBSD-10.3-x64-threads-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x64-threads-gcc THREADS=1 CC=gcc5 CFLAGS="$CF" LDFLAGS="-lpthread $LF"
+gmake $MAKEFLAGS vlmcsd-FreeBSD-10.3-x64-threads PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x64-threads THREADS=1 CC=clang38 CFLAGS="$CFCLANG" LDFLAGS="-lpthread $LF"
+gmake $MAKEFLAGS vlmcsd-FreeBSD-10.3-x86-threads PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x86-threads THREADS=1 CC=clang38 CFLAGS="$CFCLANG -m32" LDFLAGS="-lpthread $LF"
+gmake $MAKEFLAGS CAT=2 vlmcsd-FreeBSD-10.3-x86-threads-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x86-threads-gcc THREADS=1 CC=gcc5 CFLAGS="$CF -m32 -DCOMPAT_32BIT" LDFLAGS="-lpthread -L/usr/lib32 -B/usr/lib32 $LF"
+gmake $MAKEFLAGS CRYPTO=openssl_with_aes CLIENT_NAME=vlmcs-FreeBSD-10.3-x64-openssl1.0.1-EXPERIMENTAL PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x64-openssl1.0.1-EXPERIMENTAL CC=clang38 CFLAGS="$CFCLANG" LDFLAGS="$LF"
+gmake $MAKEFLAGS CRYPTO=openssl_with_aes CLIENT_NAME=vlmcs-FreeBSD-10.3-x86-openssl1.0.1-EXPERIMENTAL PROGRAM_NAME=vlmcsd-FreeBSD-10.3-x86-openssl1.0.1-EXPERIMENTAL CC=clang38 CFLAGS="$CFCLANG -m32" LDFLAGS="$LF"
+
+rm *.o
+
+strip -s --strip-unneeded --remove-section=.eh_frame_hdr --remove-section=.eh_frame --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag vlmcs-* vlmcsd-* vlmcsdmulti-*
+sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
+
+sudo cp -af vlmcsd-FreeBSD-10.3-x64-gcc /usr/local/sbin/vlmcsd
+sudo cp -af vlmcs-FreeBSD-10.3-x64-gcc /usr/local/bin/vlmcs
+
+# Copy everything to distribution server
+scp -p vlmcsdmulti-* vlmcsd-Free* vlmcs-* root@ubuntu64:x/binaries/FreeBSD/intel/

make_hurd

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+export VERBOSE=3
+export DNS_PARSER=OS
+
+rm -f vlmcsd-hurd* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
+rm -f vlmcsdmulti vlmcsd vlmcs 2>/dev/null
+
+MAKEFLAGS="-B -j1"
+
+export CC=gcc
+CF="-flto=jobserver -pipe -fwhole-program -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+LF="-fuse-ld=gold -lresolv -Wl,-z,norelro,--hash-style=gnu,--build-id=none"
+
+make $MAKEFLAGS MULTI_NAME=vlmcsdmulti-hurd-x86-glibc vlmcsdmulti-hurd-x86-glibc PROGRAM_NAME=vlmcsd-hurd-x86-glibc CLIENT_NAME=vlmcs-hurd-x86-glibc CFLAGS="$CF" LDFLAGS="$LF" allmulti
+
+make clean
+
+sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
+
+cp -af vlmcsd-hurd-x86-glibc /usr/local/sbin/vlmcsd
+cp -af vlmcs-hurd-x86-glibc /usr/local/bin/vlmcs
+
+# Copy man pages
+mkdir -p /usr/local/man/man1 2>/dev/null
+mkdir -p /usr/local/man/man5 2>/dev/null
+mkdir -p /usr/local/man/man8 2>/dev/null
+mkdir -p /usr/local/man/man7 2>/dev/null
+cp -af vlmcs.1 vlmcsdmulti.1 /usr/local/man/man1/
+cp -af vlmcsd.7 /usr/local/man/man7/
+cp -af vlmcsd.8 /usr/local/man/man8/
+cp -af vlmcsd.ini.5 /usr/local/man/man5/
+bzip2 -f -9 /usr/local/man/man5/vlmcsd.ini.5 /usr/local/man/man1/vlmcs.1 /usr/local/man/man1/vlmcsdmulti.1 /usr/local/man/man7/vlmcsd.7 /usr/local/man/man8/vlmcsd.8
+
+# Copy everything to distribution server
+scp -p vlmcsdmulti-* vlmcsd-hurd* vlmcs-* root@ubuntu64.internal:x/binaries/Hurd/intel/
+

make_kfreebsd

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+export VERBOSE=3
+export DNS_PARSER=OS
+
+rm -f vlmcsd-Free* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
+rm -f vlmcsdmulti vlmcsd vlmcs 2>/dev/null
+
+MAKEFLAGS="-B -j`nproc`"
+
+export CC=gcc
+CF="-flto=jobserver -pipe -fwhole-program -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+LF="-lresolv -Wl,-z,norelro,--hash-style=gnu,--build-id=none"
+
+export PROGRAM_NAME=vlmcsd-FreeBSD-10.1-x64-glibc
+export CLIENT_NAME=vlmcs-FreeBSD-10.1-x64-glibc
+export MULTI_NAME=vlmcsdmulti-FreeBSD-10.1-x64-glibc
+
+make $MAKEFLAGS CFLAGS="$CF -m64" LDFLAGS="$LF" CAT=2 allmulti
+
+cp -af $PROGRAM_NAME /usr/local/sbin/vlmcsd
+cp -af $CLIENT_NAME /usr/local/bin/vlmcs
+
+export PROGRAM_NAME=vlmcsd-FreeBSD-10.1-x86-glibc
+export CLIENT_NAME=vlmcs-FreeBSD-10.1-x86-glibc
+export MULTI_NAME=vlmcsdmulti-FreeBSD-10.1-x86-glibc
+
+make $MAKEFLAGS CFLAGS="$CF -m32" LDFLAGS="$LF" CAT=2 allmulti
+
+sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
+
+# Copy man pages
+mkdir -p /usr/local/man/man1 2>/dev/null
+mkdir -p /usr/local/man/man5 2>/dev/null
+mkdir -p /usr/local/man/man8 2>/dev/null
+mkdir -p /usr/local/man/man7 2>/dev/null
+cp -af vlmcs.1 vlmcsdmulti.1 /usr/local/man/man1/
+cp -af vlmcsd.7 /usr/local/man/man7/
+cp -af vlmcsd.8 /usr/local/man/man8/
+cp -af vlmcsd.ini.5 /usr/local/man/man5/
+bzip2 -f -9 /usr/local/man/man5/vlmcsd.ini.5 /usr/local/man/man1/vlmcs.1 /usr/local/man/man1/vlmcsdmulti.1 /usr/local/man/man7/vlmcsd.7 /usr/local/man/man8/vlmcsd.8
+
+# Copy everything to distribution server
+scp -p vlmcsdmulti-* vlmcsd-Free* vlmcs-* root@ubuntu64.internal:x/binaries/FreeBSD/intel/
+

make_minix

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+export VLMCSD_VERSION=svn$(ssh root@ubuntu64.internal "cd x; svnversion")
+scp -p make_minix root@ubuntu64.internal:x
+scp -pr root@ubuntu64.internal:x/* .
+
+
+# Compile vlmcsd binaries for Minix 3
+
+SUFFIX=-minix-$(uname -r)-x86
+export CC=clang
+export CFLAGS="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+export LDFLAGS="-Wl,--hash-style=sysv -Wl,-z,norelro -Wl,--build-id=none"
+export PROGRAM_NAME=vlmcsd$SUFFIX
+export CLIENT_NAME=vlmcs$SUFFIX
+export MULTI_NAME=vlmcsdmulti$SUFFIX
+
+gmake clean
+gmake -B allmulti
+
+strip -s --strip-unneeded --remove-section .eh_frame_hdr --remove-section .eh_frame --remove-section .ident --remove-section .note.minix.ident --remove-section .note.netbsd.pax --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag *$SUFFIX
+
+scp -p *$SUFFIX root@ubuntu64.internal:x/binaries/Minix/intel/

make_multilib_linux

@@ -0,0 +1,121 @@
+#!/bin/bash
+
+SMALLCC="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+SMALLLD="-pipe -Wl,--hash-style=sysv -Wl,-z,norelro -Wl,--build-id=none"
+SMALL="$SMALLCC $SMALLLD"
+
+rm -f vlmcsd vlmcs vlmcsdmulti vlmcsd-s390* vlmcsd-sparc64* vlmcsd-mips64* vlmcs-* vlmcsdmulti-*
+
+## IBM S/390
+
+export CFLAGS="$SMALLCC"
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -m31 -mesa -mpacked-stack -msmall-exec"
+export LDFLAGS="$SMALLLD -Wl,--hash-style=gnu"
+export THREADS=0
+export FEATURES=full
+export CC=s390x-linux-gnu-gcc
+export VERBOSE=3
+
+export MULTI_NAME=vlmcsdmulti-s390-glibc
+export CLIENT_NAME=vlmcs-s390-glibc
+export PROGRAM_NAME=vlmcsd-s390-glibc
+
+make -B -j`nproc` allmulti
+
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -m64 -mzarch -mpacked-stack -msmall-exec"
+export MULTI_NAME=vlmcsdmulti-s390x-glibc
+export CLIENT_NAME=vlmcs-s390x-glibc
+export PROGRAM_NAME=vlmcsd-s390x-glibc
+
+make -B -j`nproc` allmulti
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+
+
+## SPARC64
+
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -mcpu=v7"
+export LDFLAGS="$SMALLLD"
+export CC=sparc64-linux-gnu-gcc
+
+export MULTI_NAME=vlmcsdmulti-sparc64v9-glibc
+export CLIENT_NAME=vlmcs-sparc64v9-glibc
+export PROGRAM_NAME=vlmcsd-sparc64v9-glibc
+
+make -B -j`nproc` allmulti
+
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+
+
+## MIPS64 BIG-ENDIAN
+
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -mips64 -mno-mips16"
+export LDFLAGS="$SMALLLD"
+export CC=mips64-linux-gnuabi64-gcc
+
+export MULTI_NAME=vlmcsdmulti-mips64-glibc
+export CLIENT_NAME=vlmcs-mips64-glibc
+export PROGRAM_NAME=vlmcsd-mips64-glibc
+
+make -B -j`nproc` allmulti
+
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -mips64 -mmicromips"
+export MULTI_NAME=vlmcsdmulti-mips64mm-glibc
+export CLIENT_NAME=vlmcs-mips64mm-glibc
+export PROGRAM_NAME=vlmcsd-mips64mm-glibc
+
+make -B -j`nproc` allmulti
+
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+
+## MIPS64 LITTLE-ENDIAN
+
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -mips64 -mno-mips16"
+export LDFLAGS="$SMALLLD"
+export CC=mips64el-linux-gnuabi64-gcc
+
+export MULTI_NAME=vlmcsdmulti-mips64el-glibc
+export CLIENT_NAME=vlmcs-mips64el-glibc
+export PROGRAM_NAME=vlmcsd-mips64el-glibc
+
+make -B -j`nproc` allmulti
+
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+export PLATFORMFLAGS="-flto=jobserver -fwhole-program -mips64 -mmicromips"
+export MULTI_NAME=vlmcsdmulti-mips64elmm-glibc
+export CLIENT_NAME=vlmcs-mips64elmm-glibc
+export PROGRAM_NAME=vlmcsd-mips64elmm-glibc
+
+make -B -j`nproc` allmulti
+
+sstrip -z $CLIENT_NAME $PROGRAM_NAME $MULTI_NAME
+
+
+
+if [ "$1" == "nocopy" ]; then
+  exit 0
+fi
+
+mkdir -p /usr/local/man/man1 2>/dev/null
+mkdir -p /usr/local/man/man5 2>/dev/null
+mkdir -p /usr/local/man/man8 2>/dev/null
+mkdir -p /usr/local/man/man7 2>/dev/null
+cp -a vlmcs.1 vlmcsdmulti.1 /usr/local/man/man1/
+cp -a vlmcsd.7 /usr/local/man/man7/
+cp -a vlmcsd.8 /usr/local/man/man8/
+cp -a vlmcsd.ini.5 /usr/local/man/man5/
+pbzip2 -f -9 /usr/local/man/man5/vlmcsd.ini.5 /usr/local/man/man1/vlmcs.1 /usr/local/man/man1/vlmcsdmulti.1 /usr/local/man/man7/vlmcsd.7 /usr/local/man/man8/vlmcsd.8
+
+scp -p vlmcsdmulti-s390-glibc vlmcs-s390-glibc vlmcsd-s390-glibc vlmcsdmulti-s390x-glibc vlmcs-s390x-glibc vlmcsd-s390x-glibc ubuntu64.internal:x/binaries/Linux/s390/glibc
+scp -p vlmcsdmulti-sparc64v9-glibc vlmcs-sparc64v9-glibc vlmcsd-sparc64v9-glibc ubuntu64.internal:x/binaries/Linux/sparc/glibc
+scp -p vlmcsdmulti-mips64-glibc vlmcs-mips64-glibc vlmcsd-mips64-glibc vlmcsdmulti-mips64mm-glibc vlmcs-mips64mm-glibc vlmcsd-mips64mm-glibc ubuntu64.internal:x/binaries/Linux/mips/big-endian/glibc
+scp -p vlmcsdmulti-mips64el-glibc vlmcs-mips64el-glibc vlmcsd-mips64el-glibc vlmcsdmulti-mips64elmm-glibc vlmcs-mips64elmm-glibc vlmcsd-mips64elmm-glibc ubuntu64.internal:x/binaries/Linux/mips/little-endian/glibc
+scp -p -P 2222 vlmcsdmulti-s390-glibc vlmcs-s390-glibc vlmcsd-s390-glibc vlmcsdmulti-s390x-glibc vlmcs-s390x-glibc vlmcsd-s390x-glibc s390:vlmcsd
+scp -p -P 2222 vlmcsdmulti-s390-glibc vlmcsdmulti-s390x-glibc s390:/usr/local/sbin

make_netbsd

@@ -0,0 +1,33 @@
+#!/usr/pkg/bin/bash
+
+export VERBOSE=3
+export DNS_PARSER=OS
+
+rm -f vlmcsd-NetBSD* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
+gmake clean
+
+MAKEFLAGS="-B -j12"
+REUSEOBJFLAGS="-j12"
+
+CF="-flto=12 -static-libgcc -pipe -fwhole-program -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CF45="-flto=12 -static-libgcc -pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CFCLANG="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+LF="-Wl,-z,norelro -Wl,--hash-style=sysv -Wl,--build-id=none"
+LFCLANG="-Wl,-z,norelro -Wl,--hash-style=sysv"
+
+gmake $MAKEFLAGS CC=/usr/pkg/gcc5/bin/gcc PROGRAM_NAME=vlmcsd-NetBSD-x64 CLIENT_NAME=vlmcs-NetBSD-x64 MULTI_NAME=vlmcsdmulti-NetBSD-x64 allmulti CFLAGS="$CF" LDFLAGS="$LF"
+
+gmake allmulti CC=gcc $MAKEFLAGS CAT=2 MULTI_NAME=vlmcsdmulti-NetBSD-x86 PROGRAM_NAME=vlmcsd-NetBSD-x86 CLIENT_NAME=vlmcs-NetBSD-x86 CFLAGS="$CF45 -m32" LDFLAGS="$LF"
+
+#gmake $MAKEFLAGS CC=clang PROGRAM_NAME=vlmcsd-NetBSD-x64-clang CLIENT_NAME=vlmcs-NetBSD-x64-clang CFLAGS="$CFCLANG" LDFLAGS="$LFCLANG"
+
+rm *.o
+
+strip -s --strip-unneeded -R .ident -R .got -R .note.netbsd.pax -R .gnu.version -R .eh_frame -R .note.gnu.gold-version -R .comment -R .note -R .note.gnu.build-id -R .note.ABI-tag vlmcs-* vlmcsd-* vlmcsdmulti-*
+#sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
+
+cp -af vlmcsd-NetBSD-x86 /usr/local/sbin/vlmcsd
+cp -af vlmcs-NetBSD-x86 /usr/local/bin/vlmcs
+
+# Copy everything to distribution server
+scp -p vlmcsdmulti-* vlmcsd-Net* vlmcs-* root@ubuntu64:x/binaries/NetBSD/intel/

make_openbsd

@@ -0,0 +1,33 @@
+#!/usr/local/bin/bash
+
+export VERBOSE=3
+export DNS_PARSER=OS
+
+rm -f vlmcsd-Open* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
+rm -f vlmcsdmulti vlmcsd vlmcs 2>/dev/null
+
+MAKEFLAGS="-B -j12"
+REUSEOBJFLAGS="-j12"
+
+CF="-static-libgcc -pipe -fwhole-program -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CF45="-static-libgcc -pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CFCLANG="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+LF="-Wl,-z,norelro"
+LFCLANG="-Wl,-z,norelro"
+
+gmake -Bj12 allmulti $MAKEFLAGS CC=egcc MULTI_NAME=vlmcsdmulti-OpenBSD-x64 PROGRAM_NAME=vlmcsd-OpenBSD-x64 CLIENT_NAME=vlmcs-OpenBSD-x64 CFLAGS="$CF" LDFLAGS="$LF"
+
+#gmake allmulti $MAKEFLAGS CAT=2 MULTI_NAME=vlmcsdmulti-OpenBSD-x86 PROGRAM_NAME=vlmcsd-OpenBSD-x86 CLIENT_NAME=vlmcs-OpenBSD-x86 CFLAGS="$CF45 -m32" LDFLAGS="$LF"
+
+#gmake $MAKEFLAGS CC=clang PROGRAM_NAME=vlmcsd-OpenBSD-x64-clang CLIENT_NAME=vlmcs-OpenBSD-x64-clang CFLAGS="$CFCLANG" LDFLAGS="$LFCLANG"
+
+rm *.o
+
+strip -s --strip-unneeded --remove-section=.eh_frame_hdr --remove-section=.eh_frame --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag vlmcs-* vlmcsd-* vlmcsdmulti-*
+#sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
+
+cp -f vlmcsd-OpenBSD-x64 /usr/local/sbin/vlmcsd
+cp -f vlmcs-OpenBSD-x64 /usr/local/bin/vlmcs
+
+# Copy everything to distribution server
+scp -p vlmcsdmulti-* vlmcsd-Open* vlmcs-* root@ubuntu64:x/binaries/OpenBSD/intel/

make_osx

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+export VERBOSE=3
+export DNS_PARSER=OS
+
+rm vlmcsd-Mac* vlmcsd-iOS* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
+rm vlmcsd vlmcs vlmcsdmulti 2>/dev/null
+
+MAKEFLAGS="-Bj"
+REUSEOBJFLAGS="-j"
+CFGCC="-static-libgcc -mdynamic-no-pic -Os -flto=jobserver -fwhole-program -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CFCLANG="-mdynamic-no-pic -Os -flto -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CFGCC42="-static-libgcc -mdynamic-no-pic -Os -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+
+make $MAKEFLAGS allmulti MULTI_NAME=vlmcsdmulti-MacOSX-x86 CLIENT_NAME=vlmcs-MacOSX-x86 PROGRAM_NAME=vlmcsd-MacOSX-x86 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-m32 -march=core2 -mmacosx-version-min=10.0" && \
+make $MAKEFLAGS vlmcsd-MacOSX-x86-threads THREADS=1 PROGRAM_NAME=vlmcsd-MacOSX-x86-threads CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-m32 -march=core2 -mmacosx-version-min=10.0" && \
+make $MAKEFLAGS allmulti MULTI_NAME=vlmcsdmulti-MacOSX-x64 CLIENT_NAME=vlmcs-MacOSX-x64 PROGRAM_NAME=vlmcsd-MacOSX-x64 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-m64 -march=core2 -mmacosx-version-min=10.0" && \
+make $MAKEFLAGS vlmcsd-MacOSX-x64-threads THREADS=1 PROGRAM_NAME=vlmcsd-MacOSX-x64-threads CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-m64 -march=core2 -mmacosx-version-min=10.0" && \
+#make $MAKEFLAGS CLIENT_NAME=vlmcs-MacOSX-x86-openssl-EXPERIMENTAL PROGRAM_NAME=vlmcsd-MacOSX-x86-openssl-EXPERIMENTAL CRYPTO=openssl_with_aes_soft CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-m32 -march=core2 -mmacosx-version-min=10.4" && \
+#make $MAKEFLAGS CLIENT_NAME=vlmcs-MacOSX-x64-openssl-EXPERIMENTAL PROGRAM_NAME=vlmcsd-MacOSX-x64-openssl-EXPERIMENTAL CRYPTO=openssl_with_aes_soft CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-m64 -march=core2 -mmacosx-version-min=10.4" && \
+
+#make $MAKEFLAGS CLIENT_NAME=vlmcs-iOS-7.1-armv7 PROGRAM_NAME=vlmcsd-iOS-7.1-armv7 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-mthumb -m32 -arch armv7 -miphoneos-version-min=1.0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk" && \
+#rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o *_all.* && \
+#make $REUSEOBJFLAGS vlmcsdmulti-iOS-7.1-armv7 MULTI_NAME=vlmcsdmulti-iOS-7.1-armv7 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-mthumb -m32 -arch armv7 -miphoneos-version-min=1.0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk" && \
+
+make $MAKEFLAGS allmulti MULTI_NAME=vlmcsdmulti-iOS-armv7 CLIENT_NAME=vlmcs-iOS-armv7 PROGRAM_NAME=vlmcsd-iOS-armv7 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-mthumb -m32 -arch armv7 -miphoneos-version-min=1.0 -isysroot ~/toolchains/iPhoneOS.sdk" && \
+make $MAKEFLAGS allmulti MULTI_NAME=vlmcsdmulti-iOS-armv8-aarch64 CLIENT_NAME=vlmcs-iOS-armv8-aarch64 PROGRAM_NAME=vlmcsd-iOS-armv8-aarch64 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-m64 -arch arm64 -miphoneos-version-min=7.0 -isysroot ~/toolchains/iPhoneOS.sdk" && \
+
+make $MAKEFLAGS allmulti MULTI_NAME=vlmcsdmulti-iOS-6.1-armv7 CLIENT_NAME=vlmcs-iOS-6.1-armv7 PROGRAM_NAME=vlmcsd-iOS-6.1-armv7 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-mthumb -m32 -arch armv7 -miphoneos-version-min=1.0 --sysroot ~/toolchains/iPhoneOS6.1.sdk -isysroot ~/toolchains/iPhoneOS6.1.sdk" && \
+
+make $MAKEFLAGS allmulti MULTI_NAME=vlmcsdmulti-iOS-5.1-armv7-clang3.4 CLIENT_NAME=vlmcs-iOS-5.1-armv7-clang3.4 PROGRAM_NAME=vlmcsd-iOS-5.1-armv7-clang3.4 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-mthumb -m32 -arch armv7 -miphoneos-version-min=1.0 --sysroot ~/toolchains/iPhoneOS5.1.sdk -isysroot ~/toolchains/iPhoneOS5.1.sdk" && \
+
+#PATH=~/toolchains/iOS5.1-MacOS-Lion/usr/bin:$PATH clang --version
+PATH=~/toolchains/iOS5.1-MacOS-Lion/usr/bin:$PATH make $MAKEFLAGS allmulti MULTI_NAME=vlmcsdmulti-iOS-5.1-armv6-clang3.1 CLIENT_NAME=vlmcs-iOS-5.1-armv6-clang3.1 PROGRAM_NAME=vlmcsd-iOS-5.1-armv6-clang3.1 CC=clang CFLAGS="$CFCLANG" PLATFORMFLAGS="-arch armv6 -miphoneos-version-min=1.0 --sysroot ~/toolchains/iPhoneOS5.1.sdk -isysroot ~/toolchains/iPhoneOS5.1.sdk" && \
+
+#PATH=~/toolchains/gcc4.2/usr/bin/bin:$PATH make $MAKEFLAGS CLIENT_NAME=vlmcs-iOS-4.1-armv6-llvm-gcc4.2 PROGRAM_NAME=vlmcsd-iOS-4.1-armv6-llvm-gcc4.2 CC=llvm-g++-4.2 CFLAGS="$CFGCC42" PLATFORMFLAGS="-arch armv6 -miphoneos-version-min=1.0 --sysroot ~/toolchains/iPhoneOS4.1.sdk -isysroot ~/toolchains/iPhoneOS4.1.sdk" && \
+#rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o *_all.* && \
+#PATH=~/toolchains/gcc4.2/usr/bin/bin:$PATH make $REUSEOBJFLAGS vlmcsdmulti-iOS-4.1-armv6-llvm-gcc4.2 MULTI_NAME=vlmcsdmulti-iOS-4.1-armv6-llvm-gcc4.2 CC=llvm-g++-4.2 CFLAGS="$CFGCC42" PLATFORMFLAGS="-arch armv6 -miphoneos-version-min=1.0 --sysroot ~/toolchains/iPhoneOS4.1.sdk -isysroot ~/toolchains/iPhoneOS4.1.sdk" && \
+
+#PATH=~/toolchains/gcc4.2/usr/bin:$PATH make $MAKEFLAGS CLIENT_NAME=vlmcs-iOS-4.1-armv7-clang PROGRAM_NAME=vlmcsd-iOS-4.1-armv7-llvm-clang CC=~/toolchains/gcc4.2/usr/bin/bin/clang CFLAGS="$CFGCC42" PLATFORMFLAGS="-mthumb -arch armv7 -miphoneos-version-min=4.1 --sysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.1.sdk -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.1.sdk" && \
+#rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o && \
+#PATH=~/toolchains/gcc4.2/usr/bin:$PATH make $REUSEOBJFLAGS vlmcsdmulti-iOS-4.1-armv7-llvm-clang MULTI_NAME=vlmcsdmulti-iOS-4.1-armv7-llvm-clang CC=~/toolchains/gcc4.2/usr/bin/bin/clang CFLAGS="$CFGCC42" PLATFORMFLAGS="-mthumb -arch armv7 -miphoneos-version-min=4.1 --sysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.1.sdk -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.1.sdk" && \
+
+
+PATH=~/toolchains/gcc4.2/usr/bin:$PATH make -Bj allmulti SAFE_MODE=1 MULTI_NAME=vlmcsdmulti-MacOSX-ppc PROGRAM_NAME=vlmcsd-MacOSX-ppc CLIENT_NAME=vlmcs-MacOSX-ppc CC=gcc CFLAGS="$CFGCC42 -isysroot ~/toolchains/MacOSX10.5.sdk -arch ppc -mmacosx-version-min=10.0" && \
+
+
+make $MAKEFLAGS allmulti MULTI_NAME=vlmcsdmulti-MacOSX-x86-gcc CLIENT_NAME=vlmcs-MacOSX-x86-gcc PROGRAM_NAME=vlmcsd-MacOSX-x86-gcc CC=gcc-5 CFLAGS="$CFGCC" PLATFORMFLAGS="-m32 -march=core2 -mmacosx-version-min=10.11" && \
+make $MAKEFLAGS vlmcsd-MacOSX-x86-threads-gcc THREADS=1 PROGRAM_NAME=vlmcsd-MacOSX-x86-threads-gcc CC=gcc-5 CFLAGS="$CFGCC" PLATFORMFLAGS="-m32 -march=core2 -mmacosx-version-min=10.11" && \
+make $MAKEFLAGS allmulti MULTI_NAME=vlmcsdmulti-MacOSX-x64-gcc CLIENT_NAME=vlmcs-MacOSX-x64-gcc PROGRAM_NAME=vlmcsd-MacOSX-x64-gcc CC=gcc-5 CFLAGS="$CFGCC" PLATFORMFLAGS="-m64 -march=core2 -mmacosx-version-min=10.11" && \
+make $MAKEFLAGS vlmcsd-MacOSX-x64-threads-gcc THREADS=1 PROGRAM_NAME=vlmcsd-MacOSX-x64-threads-gcc CC=gcc-5 CFLAGS="$CFGCC" PLATFORMFLAGS="-m64 -march=core2 -mmacosx-version-min=10.11" && \
+
+# Sign the iOS binaries
+#ldid -S *iOS*
+
+#strip vlmcs-* vlmcsd-* vlmcsdmulti-*
+
+rm -f *.o *_all.* 
+rm -fr *.dSYM
+
+sudo cp -p vlmcs-MacOSX-x86-gcc /usr/local/bin/vlmcs
+sudo cp -p vlmcsd-MacOSX-x86-gcc /usr/local/bin/vlmcsd
+
+sudo mkdir -p /usr/local/share/man/man8
+sudo mkdir -p /usr/local/share/man/man1
+sudo mkdir -p /usr/local/share/man/man7
+sudo mkdir -p /usr/local/share/man/man5
+
+sudo cp -p vlmcsd.8 /usr/local/share/man/man8
+sudo cp -p vlmcs.1 vlmcsdmulti.1 /usr/local/share/man/man1
+sudo cp -p vlmcsd-floppy.7 vlmcsd.7 /usr/local/share/man/man7
+sudo cp -p vlmcsd.ini.5 //usr/local/share/man/man5
+
+# Copy the stuff to distribution server
+scp -p vlmcsd-MacOSX-x* vlmcs-MacOSX-x* vlmcsdmulti-MacOSX-x* root@ubuntu64:x/binaries/MacOSX/intel
+scp -p vlmcsd-MacOSX-ppc* vlmcs-MacOSX-ppc* vlmcsdmulti-MacOSX-ppc* root@ubuntu64:x/binaries/MacOSX/ppc
+scp -p vlmcsd-iOS* vlmcs-iOS* vlmcsdmulti-iOS* root@ubuntu64:x/binaries/iOS/arm

make_solaris

@@ -0,0 +1,53 @@
+#!/bin/sh
+
+export VERBOSE=3
+export CAT=2
+
+if [ `uname -s` != "SunOS" ]; then
+  echo "This is no SunOS operating system."
+  exit 3
+fi
+
+SOLARIS_VERSION=`uname -v`
+
+rm -f vlmcsd-Solaris* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
+rm -f vlmcsdmulti vlmcsd vlmcs 2>/dev/null
+
+MAKEFLAGS="-B -j`nproc`"
+REUSEOBJFLAGS="-j`nproc`"
+
+CF="-fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants -Wno-char-subscripts"
+LF="-fwhole-program -Wl,-z,norelro -Wl,--hash-style=sysv -Wl,--build-id=none"
+
+
+# 32 bit
+if [ "$CAT" != "" ]; then
+  gmake $MAKEFLAGS LD_ALTEXEC=/usr/bin/gld vlmcs-Solaris$SOLARIS_VERSION-x86 vlmcsd-Solaris$SOLARIS_VERSION-x86 vlmcsdmulti-Solaris$SOLARIS_VERSION-x86 CLIENT_NAME=vlmcs-Solaris$SOLARIS_VERSION-x86 PROGRAM_NAME=vlmcsd-Solaris$SOLARIS_VERSION-x86 MULTI_NAME=vlmcsdmulti-Solaris$SOLARIS_VERSION-x86 CC=gcc CFLAGS="$CF" LDFLAGS="$LF"
+else
+  gmake $MAKEFLAGS LD_ALTEXEC=/usr/bin/gld MULTI_NAME=vlmcsdmulti-Solaris$SOLARIS_VERSION-x86 CLIENT_NAME=vlmcs-Solaris$SOLARIS_VERSION-x86 PROGRAM_NAME=vlmcsd-Solaris$SOLARIS_VERSION-x86 CC=gcc CFLAGS="$CF" LDFLAGS="$LF" allmulti
+fi
+
+gmake $MAKEFLAGS LD_ALTEXEC=/usr/bin/gld vlmcsd-Solaris$SOLARIS_VERSION-x86-threads PROGRAM_NAME=vlmcsd-Solaris$SOLARIS_VERSION-x86-threads CC=gcc THREADS=1 CFLAGS="$CF" LDFLAGS="-lpthread $LF"
+gmake $MAKEFLAGS LD_ALTEXEC=/usr/bin/gld CLIENT_NAME=vlmcs-Solaris$SOLARIS_VERSION-x86-openssl1.0-EXPERIMENTAL CRYPTO=openssl_with_aes PROGRAM_NAME=vlmcsd-Solaris$SOLARIS_VERSION-x86-openssl1.0-EXPERIMENTAL CC=gcc CFLAGS="$CF" LDFLAGS="$LF"
+
+# 64 bit
+
+LF="$LF -Wl,-melf_x86_64_sol2"
+
+if [ "$CAT" != "" ]; then
+  gmake $MAKEFLAGS LD_ALTEXEC=/usr/bin/gld vlmcsdmulti-Solaris$SOLARIS_VERSION-x64 vlmcs-Solaris$SOLARIS_VERSION-x64 vlmcsd-Solaris$SOLARIS_VERSION-x64 MULTI_NAME=vlmcsdmulti-Solaris$SOLARIS_VERSION-x64 CLIENT_NAME=vlmcs-Solaris$SOLARIS_VERSION-x64 PROGRAM_NAME=vlmcsd-Solaris$SOLARIS_VERSION-x64 CC=gcc CFLAGS="$CF" LDFLAGS="$LF" PLATFORMFLAGS="-m64"
+else
+  gmake $MAKEFLAGS LD_ALTEXEC=/usr/bin/gld MULTI_NAME=vlmcsdmulti-Solaris$SOLARIS_VERSION-x64 CLIENT_NAME=vlmcs-Solaris$SOLARIS_VERSION-x64 PROGRAM_NAME=vlmcsd-Solaris$SOLARIS_VERSION-x64 CC=gcc CFLAGS="$CF" LDFLAGS="$LF" PLATFORMFLAGS="-m64" allmulti
+fi
+
+gmake $MAKEFLAGS LD_ALTEXEC=/usr/bin/gld vlmcsd-Solaris$SOLARIS_VERSION-x64-threads PROGRAM_NAME=vlmcsd-Solaris$SOLARIS_VERSION-x64-threads CC=gcc THREADS=1 CFLAGS="$CF" LDFLAGS="$LF -lpthread" PLATFORMFLAGS="-m64"
+gmake $MAKEFLAGS LD_ALTEXEC=/usr/bin/gld CLIENT_NAME=vlmcs-Solaris$SOLARIS_VERSION-x64-openssl1.0-EXPERIMENTAL CRYPTO=openssl_with_aes PROGRAM_NAME=vlmcsd-Solaris$SOLARIS_VERSION-x64-openssl1.0-EXPERIMENTAL CC=gcc CFLAGS="$CF" LDFLAGS="$LF" PLATFORMFLAGS="-m64"
+
+rm -f *.o *_all.*
+
+gstrip -s --strip-unneeded --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag vlmcs-* vlmcsd-*
+#gstrip -s --strip-unneeded --remove-section=.eh_frame_hdr --remove-section=.eh_frame --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag vlmcs-* vlmcsd-*
+#sstrip -z vlmcs-* vlmcsd-*
+
+# Copy stuff to distribution server
+scp -p vlmcsd-Sola* vlmcs-* vlmcsdmulti-* root@ubuntu64:x/binaries/Solaris/intel

make_windows

@@ -0,0 +1,84 @@
+#!/bin/bash
+
+rm -f cygkms*.dll libkms*.dll vlmcs-* vlmcsd-win* vlmcsd-cyg* vlmcsdmulti-* *_all.* vlmcsd.exe vlmcs.exe vlmcsdmulti.exe 2> /dev/null
+
+export CAT=2
+export VERBOSE=3
+NUMCPU=`cat /proc/cpuinfo | grep "processor" | wc -l`
+
+CF="-Wno-missing-braces -fno-common -fno-exceptions -fno-non-call-exceptions -fno-stack-protector -fmerge-all-constants -fno-unwind-tables -fno-asynchronous-unwind-tables -pipe"
+CFMSRPC="-Wno-missing-braces -Wno-unused-variable $CF" # -fno-common -fno-stack-protector -fmerge-all-constants -pipe"
+PF32=""
+PF64="-mpreferred-stack-boundary=4 -march=nocona -mtune=generic"
+LFCYG32="-fwhole-program -Wl,--nxcompat,--dynamicbase,--tsaware,--large-address-aware,--disable-long-section-names"
+LFWIN32="-fwhole-program -Wl,--nxcompat,--dynamicbase,--tsaware,--large-address-aware,--disable-long-section-names"
+LFCYG64="-fwhole-program -Wl,--nxcompat,--dynamicbase,--tsaware,--disable-long-section-names,--high-entropy-va"
+LFWIN64="-fwhole-program -Wl,--nxcompat,--dynamicbase,--tsaware,--disable-long-section-names,--high-entropy-va"
+
+MAKEFLAGS="-j$NUMCPU -B"
+REUSEFLAGS="-j$NUMCPU"
+
+make $MAKEFLAGS cygkms32.dll FEATURES=minimum THREADS=1 DLL_NAME=cygkms32.dll DNS_PARSER=internal CC=i686-pc-cygwin-gcc.exe CFLAGS="$CF -flto=jobserver -fvisibility=hidden" PLATFORMFLAGS="$PF32" LDFLAGS="$LFCYG32 -Wl,--no-seh"
+make $MAKEFLAGS cygkms64.dll FEATURES=minimum THREADS=1 DLL_NAME=cygkms64.dll DNS_PARSER=internal CC=x86_64-pc-cygwin-gcc.exe CFLAGS="$CF -flto=jobserver -fvisibility=hidden" PLATFORMFLAGS="$PF64" LDFLAGS="$LFCYG64 -Wl,--no-seh"
+make $MAKEFLAGS allmulti THREADS=1 DNS_PARSER=internal CLIENT_NAME=vlmcs-cygwin-x86 PROGRAM_NAME=vlmcsd-cygwin-x86 MULTI_NAME=vlmcsdmulti-cygwin-x86 CC=i686-pc-cygwin-gcc.exe CFLAGS="$CF" PLATFORMFLAGS="$PF32" LDFLAGS="$LFCYG32 -Wl,--no-seh"
+make $MAKEFLAGS allmulti THREADS=1 DNS_PARSER=internal CLIENT_NAME=vlmcs-cygwin-x64 PROGRAM_NAME=vlmcsd-cygwin-x64 MULTI_NAME=vlmcsdmulti-cygwin-x64 CC=x86_64-pc-cygwin-gcc.exe CFLAGS="$CF" PLATFORMFLAGS="$PF64" LDFLAGS="$LFCYG64 -Wl,--no-seh"
+make $MAKEFLAGS MSRPC=1 THREADS=1 DNS_PARSER=internal CLIENT_NAME=vlmcs-cygwin-msrpc-x86 PROGRAM_NAME=vlmcsd-cygwin-msrpc-x86 MULTI_NAME=vlmcsdmulti-cygwin-msrpc-x86 CC=i686-pc-cygwin-gcc.exe CFLAGS="$CF -fasynchronous-unwind-tables" PLATFORMFLAGS="$PF32" LDFLAGS="$LFCYG32"
+make $MAKEFLAGS MSRPC=1 THREADS=1 DNS_PARSER=internal CLIENT_NAME=vlmcs-cygwin-msrpc-x64 PROGRAM_NAME=vlmcsd-cygwin-msrpc-x64 MULTI_NAME=vlmcsdmulti-cygwin-msrpc-x64 CC=x86_64-pc-cygwin-gcc.exe CFLAGS="$CFMSRPC" PLATFORMFLAGS="$PF64" LDFLAGS="$LFCYG64"
+unset CAT
+make $MAKEFLAGS vlmcsdmulti-cygwin-msrpc-x64 MSRPC=1 THREADS=1 DNS_PARSER=internal MULTI_NAME=vlmcsdmulti-cygwin-msrpc-x64 CC=x86_64-pc-cygwin-gcc.exe CFLAGS="$CFMSRPC -flto=jobserver" PLATFORMFLAGS="$PF64" LDFLAGS="$LFCYG64"
+make $MAKEFLAGS vlmcsdmulti-cygwin-msrpc-x86 MSRPC=1 THREADS=1 DNS_PARSER=internal MULTI_NAME=vlmcsdmulti-cygwin-msrpc-x86 CC=i686-pc-cygwin-gcc.exe CFLAGS="$CFMSRPC -flto=jobserver" PLATFORMFLAGS="$PF32" LDFLAGS="$LFCYG32"
+export CAT=2
+
+make $MAKEFLAGS THREADS=1 MSRPC=1 DNS_PARSER=internal CLIENT_NAME=vlmcs-cygwin-msrpc-x86-openssl-EXPERIMENTAL CRYPTO=openssl_with_aes PROGRAM_NAME=vlmcsd-cygwin-x86-openssl-EXPERIMENTAL CC=i686-pc-cygwin-gcc.exe CFLAGS="$CFMSRPC" PLATFORMFLAGS="$PF32" LDFLAGS="$LFCYG32"
+make $MAKEFLAGS THREADS=1 MSRPC=1 DNS_PARSER=internal CLIENT_NAME=vlmcs-cygwin-msrpc-x64-openssl-EXPERIMENTAL CRYPTO=openssl_with_aes PROGRAM_NAME=vlmcsd-cygwin-x64-openssl-EXPERIMENTAL CC=x86_64-pc-cygwin-gcc.exe CFLAGS="$CFMSRPC" PLATFORMFLAGS="$PF64" LDFLAGS="$LFCYG64"
+
+export CAT=2
+
+#make $MAKEFLAGS libkms32.dll CRYPTO=windows FEATURES=minimum THREADS=1 DLL_NAME=libkms32.dll CC=i686-w64-MingW32-gcc.exe CFLAGS="$CF -flto=jobserver -fvisibility=hidden" PLATFORMFLAGS="$PF32" LDFLAGS="-static-libgcc $LFWIN32"
+#make $MAKEFLAGS libkms64.dll CRYPTO=windows FEATURES=minimum THREADS=1 DLL_NAME=libkms64.dll CC=x86_64-w64-MingW32-gcc.exe CFLAGS="$CF -flto=jobserver -fvisibility=hidden" PLATFORMFLAGS="$PF64" LDFLAGS="-static-libgcc $LFWIN64"
+#make $MAKEFLAGS all vlmcsdmulti-Windows-x86 THREADS=1 CRYPTO=windows CLIENT_NAME=vlmcs-Windows-x86 PROGRAM_NAME=vlmcsd-Windows-x86 MULTI_NAME=vlmcsdmulti-Windows-x86 CC=i686-w64-MingW32-gcc.exe CFLAGS="$CF" PLATFORMFLAGS="$PF32" LDFLAGS="$LFWIN32"
+#make $MAKEFLAGS all vlmcsdmulti-Windows-x64 THREADS=1 CRYPTO=windows CLIENT_NAME=vlmcs-Windows-x64 PROGRAM_NAME=vlmcsd-Windows-x64 MULTI_NAME=vlmcsdmulti-Windows-x64 CC=x86_64-w64-MingW32-gcc.exe CFLAGS="$CF" PLATFORMFLAGS="$PF64" LDFLAGS="$LFWIN64"
+#make -Bj MSRPC=1 CRYPTO=windows CLIENT_NAME=vlmcs-Windows-msrpc-x86 PROGRAM_NAME=vlmcsd-Windows-msrpc-x86 MULTI_NAME=vlmcsdmulti-Windows-msrpc-x86 CC=i686-w64-MingW32-gcc.exe CFLAGS="$CFMSRPC"  PLATFORMFLAGS="$PF32" LDFLAGS="-Wl,--nxcompat,--dynamicbase,--tsaware,--large-address-aware"
+#make $MAKEFLAGS THREADS=1 MSRPC=1 CRYPTO=windows CLIENT_NAME=vlmcs-Windows-msrpc-x64 PROGRAM_NAME=vlmcsd-Windows-msrpc-x64 MULTI_NAME=vlmcsdmulti-Windows-msrpc-x64 CC=x86_64-w64-MingW32-gcc.exe CFLAGS="$CFMSRPC" PLATFORMFLAGS="$PF64" LDFLAGS="$LFCYG64"
+#unset CAT
+#make $MAKEFLAGS vlmcsdmulti-Windows-msrpc-x86 THREADS=1 MSRPC=1 CRYPTO=windows MULTI_NAME=vlmcsdmulti-Windows-msrpc-x86 CC=i686-w64-MingW32-gcc.exe CFLAGS="$CFMSRPC" PLATFORMFLAGS="$PF32" LDFLAGS="-Wl,--nxcompat,--dynamicbase,--tsaware,--large-address-aware"
+#make $MAKEFLAGS vlmcsdmulti-Windows-msrpc-x64 THREADS=1 MSRPC=1 CRYPTO=windows MULTI_NAME=vlmcsdmulti-Windows-msrpc-x64 CC=x86_64-w64-MingW32-gcc.exe CFLAGS="$CFMSRPC" PLATFORMFLAGS="$PF64" LDFLAGS="$LFCYG64"
+export CAT=2
+
+rm -f *_all.* *.o 2> /dev/null &
+
+echo ""
+echo "Copying MingW binaries from distribution server"
+
+scp -p root@ubuntu64:x/binaries/Windows/intel/*Windows* root@ubuntu64:x/binaries/Windows/intel/libkms* .
+
+echo ""
+echo "Installing binaries"
+
+cp -p vlmcs-cygwin-x64.exe /usr/local/bin/vlmcs &
+cp -p vlmcsd-cygwin-x64.exe /usr/local/bin/vlmcsd &
+cp -p cygkms64.dll /usr/local/bin/cygkms.dll &
+
+cp -p libkms32.dll /cygdrive/c/nttools/x86 &
+cp -p libkms64.dll /cygdrive/c/nttools/x64 &
+cp -p vlmcsdmulti-Windows-x86.exe /cygdrive/c/nttools/x86/vlmcsdmulti.exe 
+
+cmd /C mklink c:\\nttools\\x86\\vlmcsd.exe vlmcsdmulti.exe 2> /dev/null &
+cmd /C mklink c:\\nttools\\x86\\vlmcs.exe vlmcsdmulti.exe 2> /dev/null &
+
+echo "Installing man pages"
+
+mkdir -p /usr/share/man/man8
+mkdir -p /usr/share/man/man1
+mkdir -p /usr/share/man/man7
+mkdir -p /usr/share/man/man5
+
+cp -p vlmcsd.7 vlmcsd-floppy.7 /usr/share/man/man7
+cp -p vlmcsd.8 /usr/share/man/man8
+cp -p vlmcsd.ini.5 /usr/share/man/man5
+cp -p vlmcs.1 vlmcsdmulti.1 /usr/share/man/man1
+
+bzip2 -f /usr/share/man/man7/vlmcsd-floppy.7 /usr/share/man/man5/vlmcsd.ini.5 /usr/share/man/man7/vlmcsd.7 /usr/share/man/man8/vlmcsd.8 /usr/share/man/man1/vlmcs.1 /usr/share/man/man1/vlmcsdmulti.1 &
+
+# Copy stuff to distribution server
+scp -p vlmcsd-cyg* vlmcsd-Win* vlmcs-* vlmcsdmulti-* *.dll root@ubuntu64:x/binaries/Windows/intel

make_windows_native

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+#
+# To use on x64 hosted native multilib compiler toolchain
+#
+
+rm vlmcsd-*
+rm vlmcsd
+
+MAKEFLAGS="-j -B"
+
+make $MAKEFLAGS PROGRAM_NAME=vlmcsd-mingw64-x86 CC=x86_64-w64-mingw32-gcc.exe CFLAGS="-flto -m32" "PLATFORMFLAGS=-march=i686 -mtune=generic" "LDFLAGS=-lcrypto -lz -lkernel32 -ladvapi32 -lws2_32 -lgdi32"
+make $MAKEFLAGS PROGRAM_NAME=vlmcsd-mingw64-x64 CC=x86_64-w64-mingw32-gcc.exe CFLAGS="-flto" "PLATFORMFLAGS=-mtune=generic" "LDFLAGS=-lcrypto -lz -lkernel32 -ladvapi32 -lws2_32 -lgdi32"
+make $MAKEFLAGS CRYPTO=openssl_with_aes PROGRAM_NAME=vlmcsd-mingw64-x86-openssl CC=x86_64-w64-mingw32-gcc.exe CFLAGS="-flto -m32" "PLATFORMFLAGS=-march=i686 -mtune=generic" "LDFLAGS=-lcrypto -lz -lkernel32 -ladvapi32 -lws2_32 -lgdi32"
+make $MAKEFLAGS CRYPTO=openssl_with_aes PROGRAM_NAME=vlmcsd-mingw64-x64-openssl CC=x86_64-w64-mingw32-gcc.exe CFLAGS="-flto" "PLATFORMFLAGS=-mtune=generic" "LDFLAGS=-lcrypto -lz -lkernel32 -ladvapi32 -lws2_32 -lgdi32"
+
+rm *.o

man/GNUmakefile

@@ -1,44 +0,0 @@
-################################################################################
-
-.PHONY: clean
-
-
-PDFDOCS = vlmcs.1.pdf vlmcsd.7.pdf vlmcsd.8.pdf vlmcsdmulti.1.pdf vlmcsd.ini.5.pdf vlmcsd-floppy.7.pdf
-HTMLDOCS = $(PDFDOCS:.pdf=.html)
-UNIXDOCS = $(PDFDOCS:.pdf=.unix.txt)
-DOSDOCS = $(PDFDOCS:.pdf=.dos.txt)
-
-%.pdf : %
-  ifeq ($(shell uname), Darwin)
-	groff -Tps -mandoc -c $< | pstopdf -i -o $@
-  else
-	groff -Tpdf -mandoc -c $< > $@
-  endif
-
-%.html : %
-	groff -Thtml -mandoc -c $< > $@ 
-
-%.unix.txt : %
-	groff -P -c -Tascii -mandoc -c $< | col -bx > $@
-
-%.dos.txt : %.unix.txt
-#	unix2dos -n $< $@
-#	sed -e 's/$$/\r/' $< > $@
-	awk 'sub("$$", "\r")' $< > $@
-
-alldocs : $(UNIXDOCS) $(HTMLDOCS) $(PDFDOCS) $(DOSDOCS)
-
-pdfdocs : $(PDFDOCS)
-
-dosdocs : $(DOSDOCS)
-
-unixdocs : $(UNIXDOCS)
-
-htmldocs : $(HTMLDOCS)
-
-clean:
-	rm -f $(PDFDOCS) $(DOSDOCS) $(UNIXDOCS) $(HTMLDOCS)
-
-help:
-	@echo "Help is available by typing 'make help' in directory $(shell realpath `pwd`/..). Use 'cd ..' to get there."
-

msrpc-client.c

@@ -72,13 +72,13 @@ RpcCtx connectToAddress(char *const addr, const int AddressFamily_unused, int_fa
 
 	if ((status = createStringBinding(addr, &stringBinding)) != RPC_S_OK)
 	{
-		printerrorf("%s\n", win_strerror(status));
+		errorout("%s\n", win_strerror(status));
 		return !0;
 	}
 
 	if (PreviousRpcCallFailed)
 	{
-		printerrorf("%s\n", win_strerror(PreviousRpcCallFailed));
+		errorout("%s\n", win_strerror(PreviousRpcCallFailed));
 		return !0;
 	}
 
@@ -90,7 +90,7 @@ RpcCtx connectToAddress(char *const addr, const int AddressFamily_unused, int_fa
 /*
  * Does not do RPC binding on the wire. Just initializes the interface
  */
-RpcStatus rpcBindClient(const RpcCtx handle, const int_fast8_t verbose, PRpcDiag_t rpcDiag)
+RpcStatus rpcBindClient(const RpcCtx handle, const int_fast8_t verbose)
 {
 	RPC_STATUS status;
 
@@ -99,7 +99,6 @@ RpcStatus rpcBindClient(const RpcCtx handle, const int_fast8_t verbose, PRpcDiag
 		errorout("\n%s\n", win_strerror(status));
 	}
 
-	rpcDiag->HasRpcDiag = FALSE;
 	return status;
 }
 
@@ -171,7 +170,7 @@ RpcStatus closeRpc(const RpcCtx handle)
 
 #if !MULTI_CALL_BINARY
 // Memory allocation function for RPC.
-void *__RPC_USER midl_user_allocate(size_t len)
+void *__RPC_USER midl_user_allocate(SIZE_T len)
 {
 	return vlmcsd_malloc(len);
 }

msrpc-client.h

@@ -2,25 +2,21 @@
  * msrpc-client.h
  */
 
-#ifdef USE_MSRPC
 #ifndef MSRPC_CLIENT_H_
 #define MSRPC_CLIENT_H_
 
 #include "types.h"
-#include "shared_globals.h"
 #include <setjmp.h>
-#include "output.h"
 
 typedef int_fast8_t RpcCtx;
 typedef RPC_STATUS RpcStatus;
 
 RpcCtx connectToAddress(char *const addr, const int AddressFamily_unused, int_fast8_t showHostName);
 int_fast8_t isDisconnected(const RpcCtx handle);
-RpcStatus rpcBindClient(const RpcCtx handle, const int_fast8_t verbose, PRpcDiag_t rpcDiag);
+RpcStatus rpcBindClient(const RpcCtx handle, const int_fast8_t verbose);
 RpcStatus rpcSendRequest(const RpcCtx handle, BYTE* KmsRequest, size_t requestSize, BYTE **KmsResponse, size_t *responseSize);
 RpcStatus closeRpc(RpcCtx s);
 
 #define INVALID_RPCCTX ((RpcCtx)~0)
-#endif // USE_MSRPC
 
 #endif /* MSRPC_CLIENT_H_ */

msrpc-server.c

@@ -221,7 +221,7 @@ int ProcessActivationRequest(handle_t IDL_handle, int requestSize, unsigned char
 {
 	RPC_CSTR clientIpAddress;
 	RPC_STATUS result;
-	int status = 0;
+	int status = RPC_S_OK;
 
 	result = getClientIp(IDL_handle, &clientIpAddress);
 
@@ -238,7 +238,7 @@ int ProcessActivationRequest(handle_t IDL_handle, int requestSize, unsigned char
 		logger ("Cannot verify that client has a private IP address\n");
 #		endif
 
-		return 0x80070000 | RPC_S_ACCESS_DENIED;
+		return RPC_S_ACCESS_DENIED;
 	}
 
 	if (!result && (PublicIPProtectionLevel & 2) && !IsPrivateIPAddress((char*)clientIpAddress))
@@ -248,7 +248,7 @@ int ProcessActivationRequest(handle_t IDL_handle, int requestSize, unsigned char
 #		endif
 
 		RpcStringFreeA(&clientIpAddress);
-		return 0x80070000 | RPC_S_ACCESS_DENIED;
+		return RPC_S_ACCESS_DENIED;
 	}
 #	endif // NO_PRIVATE_IP_DETECT
 
@@ -256,45 +256,32 @@ int ProcessActivationRequest(handle_t IDL_handle, int requestSize, unsigned char
 	if (requestSize < (int)sizeof(REQUEST_V4))
 	{
 		if (!result) RpcStringFreeA(&clientIpAddress);
-		return 0x8007000D;
+		return RPC_S_CANNOT_SUPPORT;
 	}
 
 	*response = (uint8_t *)midl_user_allocate(MAX_RESPONSE_SIZE);
-	int kmsStatus = 0x8007000D;
-	int version = LE32(((REQUEST*)(request))->Version);
 
-	switch(version)
+	switch(LE16(((REQUEST*)(request))->MajorVer))
 	{
-		case 0x40000:
-			kmsStatus = CreateResponseV4((REQUEST_V4 *)request, *response, (char*)clientIpAddress);
+		case 4:
+			*responseSize = CreateResponseV4((REQUEST_V4 *)request, *response, (char*)clientIpAddress);
 			break;
-		case 0x50000:
-		case 0x60000:
-			kmsStatus = CreateResponseV6((REQUEST_V6 *) request, *response, (char*)clientIpAddress);
+		case 5:
+		case 6:
+			*responseSize = CreateResponseV6((REQUEST_V6 *) request, *response, (char*)clientIpAddress);
 			break;
 		default:
-#			ifndef NO_LOG
-			logger("Fatal: KMSv%u.%u unsupported\n", version >> 16, version & 0xffff);
-#			endif // NO_LOG
+			status = RPC_S_INVALID_ARG;
 			break;
 	}
 
-	if (kmsStatus < 0)
-	{
-		status = kmsStatus;
-	}
-	else
-	{
-		*responseSize = kmsStatus;
-	}
-
 	if (!result) RpcStringFreeA(&clientIpAddress);
 	return status;
 }
 
 
 // Memory allocation function for RPC.
-void *__RPC_USER midl_user_allocate(size_t len)
+void *__RPC_USER midl_user_allocate(SIZE_T len)
 {
 	return vlmcsd_malloc(len);
 }