# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1491840783 -7200
# Node ID e7715725d95be5c55d6a3b1d7baa787a9fba9cae
# Parent  2bd6324d64bfc825172288fdd1e337835a7b373d
Add crypthook

diff -r 2bd6324d64bf -r e7715725d95b crypthook/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/crypthook/receipt	Mon Apr 10 18:13:03 2017 +0200
@@ -0,0 +1,30 @@
+# SliTaz package receipt.
+
+PACKAGE="crypthook"
+GITHASH="0728cd191f0638f52f8d6af8a9482a4996322ffc"
+VERSION=${GITHASH:0:7}
+CATEGORY="security"
+SHORT_DESC="TCP/UDP symmetric encryption tunnel wrapper."
+MAINTAINER="pascal.bellard@slitaz.org"
+LICENSE="MIT"
+TARBALL="$PACKAGE-$VERSION.zip"
+WEB_SITE="https://github.com/chokepoint/CryptHook"
+WGET_URL="$WEB_SITE/archive/$GITHASH.zip"
+
+DEPENDS="libcrypto"
+BUILD_DEPENDS="openssl-dev"
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	make
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr/lib $install/usr/share/doc
+	cp -a $src/README.md $install/usr/share/doc
+	cp -a $src/crypthook.so $fs/usr/lib
+}
+
diff -r 2bd6324d64bf -r e7715725d95b linld/stuff/src/VCPI.ASM
--- a/linld/stuff/src/VCPI.ASM	Mon Apr 10 16:50:02 2017 +0200
+++ b/linld/stuff/src/VCPI.ASM	Mon Apr 10 18:13:03 2017 +0200
@@ -376,6 +376,7 @@
                 mov     ecx,cr3         ; reload TLB cache
                 mov     cr3,ecx         ;
 ; Return
+vcpi_ret:
                 ret
 
         endp    call_pm_routine
@@ -393,14 +394,13 @@
                 p8086
 		extrn	_vcpi:byte
 		test	[_vcpi],-1
-		jz	@@ret
+		jz	vcpi_ret
                 p386
+                pop	ax
+                push    cs      ;*
+                push	ax
                 push	si
-              ;;pushf
-              ;;pushad
-                push    cs      ;*
                 push    ds
-                ;push    es
                 mov     [saved_ss],ss
                 mov     [saved_sp],sp
 
@@ -418,23 +418,13 @@
                 mov     eax,cr0
                 and     eax,7ffffffeh   ; clear PG,P bits
                 mov     cr0,eax         ; look mommy, we're in rm now!
-              ;;jmp     short $+2
-              ;;xor     eax,eax
                 mov     cr3,eax         ; flush TLB cache
 
 ; Now we are in rm, but not yet: have to restore sregs:
                 lss     sp,[saved_ss_sp]; SS
-                ;pop     es              ; ES
                 pop     ds              ; DS
-               ;push    cs      ;* done earlier
-                push    offset @@next
+                pop	si
                 retf                    ; CS
-@@next:
-              ;;popad
-              ;;popf
-                pop	si
-@@ret:
-                ret             ; We don't care much about rest (FS/GS)
 
         endp    _vm2rm