update demo

Makefile.simple

@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-default help debug release clean distclean:
+default help debug release clean distclean mingw mingw-release mingw-debug:
 	$(MAKE) -C src -f Makefile.simple $@
 
-# End
+# End

README.md

@@ -43,9 +43,14 @@ decryption and further processing.
  Download/clone *nim-crypto* and enter the root directory. Then type
 
        make -f Makefile.simple
-	   
- This will produce a binary command file *src/cwrap* which can
- be run as
+
+ or
+
+       make -f Makefile.simple mingw
+
+where the latter one might be needed on a Windows/MinGW set up.
+This will produce a binary command file *src/cwrap* which can
+be run as
 
        ./src/cwrap
 	   
@@ -100,21 +105,21 @@ be available by default.
 
 ## Bootstrapping
 
-Download/clone the *nim-crypto* repository from GitHUB and enter its root
+Download/clone the *nim-crypto* project from GitHUB and enter its root
 directory. All bootstrapping commands are bundled into a single *make*
-command script called *Build*. It is accessible in the root
+command script called *Build*. It is accessible in the project root
 directory. A help page is printed if called without arguments as in
 
       ./Build
 
-This command script expects the *make* command installed as
-*/usr/bin/make*. You need to edit the first line of this script
-accordingly if this is not the case.
+This command script expects the *make* command installed as */usr/bin/make*.
+You need to edit the first line of this script accordingly if this is not
+the case (or run it as *"make -f Build <args..>"* instead).
 
 #### Optional: Local NIM Installation
 
 Unless a *NIM* compiler is installed, it can be done locally within
-the *nim-crypto* repository with the command:
+the *nim-crypto* progect tree with the command:
 
      ./Build nim
 	 

src/Makefile.simple

@@ -5,24 +5,26 @@
 # Simple Makefile example, works on Linux
 #
 
-MAKEFILE = Makefile.simple
-ROOTDIR  = lib
-TARGET   = cwrap
-LIBS     = -ldl -lm
+MAKEFILE    = Makefile.simple
+ROOTDIR     = lib
+TARGET      = cwrap
+LIBS        = -ldl
 
-NIMLIB    = `nim dump 2>&1 >/dev/null|sed '$$!d'`
-INCLUDES  = -Inimcache -I$(NIMLIB)
-CFLAGS    = $(INCLUDES) $(CDEBUG)
-NIMFLAGS  = -p:$(ROOTDIR) --app:staticLib --noMain --header
-NIMFLAGS += -d:ignNimPaths $(NIMDBG)
+NIMLIB      = `nim dump 2>&1 >/dev/null|sed '$$!d'`
+INCLUDES    = -Inimcache -I$(NIMLIB)
+NIMFLAGS    = -p:$(ROOTDIR) --app:staticLib --noMain --header
+NIMFLAGS   += -d:ignNimPaths $(NIMDBG)
+
+MAIN_CFLAGS = $(CFLAGS) $(INCLUDES) $(CDEBUG)
+MAIN_LIBS   = -L. -lsession $(LIBS) -lm
 
 # Settings for optimised code
-REL_CDEBUG = -O2 -s
-REL_NIMDBG = -d:release --gc:none
+REL_CDEBUG  = -O2 -s
+REL_NIMDBG  = -d:release --gc:none
 
 # Settings for GDB debugging session
-DBG_CDEBUG = -g
-DBG_NIMDBG = --debuginfo --lineDir:on --embedsrc --debugger=native
+DBG_CDEBUG  = -g
+DBG_NIMDBG  = --debuginfo --lineDir:on --embedsrc --debugger=native
 
 # ---------------------------------------------------------------------------
 # Convenience targets
@@ -32,18 +34,32 @@ DBG_NIMDBG = --debuginfo --lineDir:on --embedsrc --debugger=native
 CDEBUG = $(REL_CDEBUG)
 NIMDBG = $(REL_NIMDBG)
 
-.PHONY: default debug release help
+
+.PHONY: default help
 default: $(TARGET)
 
 help:
 	@echo
 	@echo '$(MAKE) -f $(MAKEFILE) [target]'
 	@echo
-	@echo 'target: default       -- release (unless done already)'
-	@echo '      | debug         -- force rebuild'
-	@echo '      | release       -- force rebuild'
+	@echo 'target: default    -- release (unless done already)'
+	@echo "      | mingw      -- like 'default' on Windiws/MinGW"
+	@echo '      | debug      -- force rebuild'
+	@echo '      | release    -- force rebuild'
 	@echo '      | [dist]clean'
 	@echo
+	@echo "Note: The debug/release targets might be prefixed by 'mingw-'."
+	@echo
+
+.PHONY: mingw mingw-release mingw-debug debug release
+mingw:
+	$(MAKE) -f $(MAKEFILE) CC=gcc LIBS= default
+
+mingw-release:
+	$(MAKE) -f $(MAKEFILE) CC=gcc LIBS= release
+
+mingw-debug:
+	$(MAKE) -f $(MAKEFILE) CC=gcc LIBS= debug
 
 debug:
 	@rm -f $(TARGET)
@@ -57,12 +73,13 @@ release:
 # BUILD recipe
 # ---------------------------------------------------------------------------
 
-$(TARGET): main.o libsession.a
-	$(CC) -o $@ $(CFLAGS) main.c libsession.a $(LIBS)
+$(TARGET): main.o
+	$(CC) -o $@ $(MAIN_CFLAGS) main.o $(MAIN_LIBS)
 
 main.o: main.c nimcache/session.h
+	$(CC) -c -o $@ $(MAIN_CFLAGS) main.c
 
-libsession.a nimcache/session.h: session.nim
+nimcache/session.h: session.nim
 	nim cc $(NIMFLAGS) session.nim
 
 # ---------------------------------------------------------------------------

src/lib/xcrypt.nim

@@ -246,11 +246,9 @@ proc startXDecrypt(ctx: var XCryptCtx;
     for n in 0..<xdt.key.len:
       if xdt.key[n] == zero:                          # ignore zero key slot
         continue
-      var
-        kPtr = cast[ptr ChaChaKey](addr xdt.key[n])
-        line = hdr[(4 * InLinelen) .. <(5 * InLinelen)]
 
       # decrypt challenge with current key
+      var kPtr = cast[ptr ChaChaKey](addr xdt.key[n])
       getChaCha(ctx.ccc, kPtr, nPtr)                  # try key for decryption
       chachaAnyCrypt(ctx.ccc, addr xdt.oLine,         # decrypt line
                      unsafeAddr hdr[4 * InLinelen], InLinelen)