Consolidation of forks

.gitignore

@@ -1,12 +1,27 @@
 Makefile.in
+Makefile
 aclocal.m4
-autom4te.cache/
+autom4te.cache
 compile
 config.guess
 config.sub
+config.log
+config.h
+config.status
 configure
+stamp-h1
 depcomp
 install-sh
 missing
 *.o
 *~
+.deps
+.dirstamp
+dot_cardpeek.tar.gz
+cardpeek
+cardpeek.exe
+cardpeek_resources.c
+win32/libwinscard.a
+deps
+build
+.vscode

.whitesource

@@ -0,0 +1,8 @@
+##########################################################
+####    WhiteSource Integration configuration file    ####
+##########################################################
+
+# Configuration #
+#---------------#
+ws.repo.scan=true
+vulnerable.check.run.conclusion.level=failure

INSTALL

@@ -1,3 +1,6 @@
+(Note: this is the standard GNU documentation for installs. For more specific
+documentation, please refer to README.md)
+
 Installation Instructions
 *************************
 

Makefile.am

@@ -76,7 +76,7 @@ OSX_EXTRA=osx/cardpeek-launcher.sh osx/cardpeek.bundle osx/generate_bundle.sh os
 
 CLEANFILES=cardpeek_resources.c dot_cardpeek.tar.gz osx/cardpeek.icns
 
-EXTRA_DIST=cardpeek_resources.gresource.xml cardpeek_resources.gresource $(DRIVERS) $(ICONS) dot_cardpeek_dir doc/cardpeek_ref.en.pdf doc/cardpeek_ref.en.odt update_dot_cardpeek_dir.sh script_version.h cardpeek.desktop cardpeek.appdata.xml $(OSX_ICONS) INSTALL.FreeBSD
+EXTRA_DIST=cardpeek_resources.gresource.xml cardpeek_resources.gresource $(DRIVERS) $(ICONS) dot_cardpeek_dir doc/cardpeek_ref.en.pdf doc/cardpeek_ref.en.odt update_dot_cardpeek_dir.sh script_version.h cardpeek.desktop cardpeek.appdata.xml $(OSX_ICONS)
 
 GLIB_COMPILE_RESOURCES=@GLIB_COMPILE_RESOURCES@
 
@@ -97,7 +97,7 @@ dist-hook:
 
 dot_cardpeek.tar.gz:    dot_cardpeek_dir	
 			@echo "  TAR      $<"
-			$(AM_V_at)tar -c -z -f dot_cardpeek.tar.gz --directory $(srcdir)/dot_cardpeek_dir --exclude=.svn --exclude='\._*' .
+			$(AM_V_at)tar --help|grep -q sort= && taropts="--sort=name --clamp-mtime --format=gnu --owner=0 --group=0" ; tar -c $$taropts --directory $(srcdir)/dot_cardpeek_dir --exclude=.svn --exclude='\._*' . | gzip -cn9 > dot_cardpeek.tar.gz
 
 cardpeek_resources.$(OBJEXT):	dot_cardpeek.tar.gz $(ICONS) AUTHORS COPYING cardpeek_resources.gresource.xml
 			@echo "  GLIB_COMPILE_RESOURCES cardpeek_resources.gresource.xml"

Makefile.win32

@@ -1,4 +1,8 @@
-CC = gcc 
+DEPS = /mingw32
+TARGET = /C/Program Files (x86)/Cardpeek
+MPLATFORM = mingw32
+
+CC = $(CCPRE)gcc 
 GLIB_COMPILE_RESOURCES = glib-compile-resources 
 
 OBJECTS = asn1.o bytestring.o ui/gtk/gui_flexi_cell_renderer.o dyntree_model.o \
@@ -18,14 +22,18 @@ ICONS=icons/cardpeek-analyzer.png icons/cardpeek-item.png icons/cardpeek-record.
       icons/cardpeek-application.png icons/cardpeek-file.png icons/cardpeek-block.png \
       icons/cardpeek-atr.png icons/cardpeek-header.png icons/cardpeek-body.png
 
-LIBS = `pkg-config --libs gtk+-3.0` -L/usr/local/lib -lcurl -L/usr/lib -lssl -lcrypto -llua -L./win32/ -lwinscard -liconv -lreadline -lncurses
+export PKG_CONFIG_PATH=$(DEPS)/lib/pkgconfig
+PKG_LIST = gtk+-3.0 lua openssl iconv libcurl
+PKG_CFLAGS = `$(CCPRE)pkg-config --cflags $(PKG_LIST) | sed "s:-I/$(MPLATFORM):-I$(DEPS):g"`
+PKG_LIBS = `$(CCPRE)pkg-config --libs $(PKG_LIST) | sed "s:-L/$(MPLATFORM):-L$(DEPS):g"`
 
-CFLAGS = -Wall -pedantic -Wno-overlength-strings -Wno-long-long -DCURL_STATICLIB -D__USE_MINGW_ANSI_STDIO -I . -I /usr/include -I ./win32/ `pkg-config --cflags gtk+-3.0`
+CFLAGS = -Wall -pedantic -Wno-overlength-strings -Wno-long-long -DCURL_STATICLIB -D__USE_MINGW_ANSI_STDIO -I . -I $(DEPS)/include -I ./win32/ $(PKG_CFLAGS)
+LIBS = $(PKG_LIBS) -L$(DEPS)/bin -L./win32/ -lwinscard -lreadline -lncurses
 
-all:		cardpeek
+build:		cardpeek.exe
 
-cardpeek:	$(OBJECTS) win32/libwinscard.a
-		$(CC) -Wl,-subsystem,windows $(OBJECTS) $(LIBS) -o cardpeek
+cardpeek.exe:	$(OBJECTS) #win32/libwinscard.a
+		$(CC) -Wl,-subsystem,windows $(OBJECTS) $(LIBS) -o cardpeek.exe
 
 dot_cardpeek.tar.gz:    dot_cardpeek_dir	
 			@echo "  TAR      $<"
@@ -37,11 +45,71 @@ cardpeek_resources.o:	dot_cardpeek.tar.gz $(ICONS) AUTHORS COPYING cardpeek_reso
 			@echo "COMPILED RESOURCES"
 
 win32/resource.o:	win32/resource.rc
-			windres win32/resource.rc -O coff -o win32/resource.o
+			$(CCPRE)windres win32/resource.rc -O coff -o win32/resource.o
 
-win32/libwinscard.a:	win32/winscard.def win32/winscard.h
-			dlltool.exe -k -d win32/winscard.def -l win32/libwinscard.a c:/WINDOWS/system32/winscard.dll
+#TODO: shouldn't be needed. To be confirmed. (It seems at least that it's not needed to compile)
+#win32/libwinscard.a:	win32/winscard.def win32/winscard.h
+#			$(CCPRE)dlltool -k -d win32/winscard.def -l win32/libwinscard.a win32/winscard.dll
 
 clean:			
 			rm -f $(OBJECTS) cardpeek.exe win32/libwinscard.a dot_cardpeek.tar.gz *~ cardpeek_resources.c
 
+install: cardpeek.exe
+	mkdir -p "$(TARGET)"
+	cp -u cardpeek.exe "$(TARGET)/"
+ifeq (mingw64, $(MPLATFORM))
+	cp -u $(DEPS)/bin/libgcc_s_seh-1.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libcrypto-1_1-x64.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libssl-1_1-x64.dll "$(TARGET)/"
+else
+  ifneq (/mingw32, $(DEPS))
+	# not needed from msys2 - TODO: eliminate from debian too ()
+	cp -u $(DEPS)/bin/libgcc_s_sjlj-1.dll "$(TARGET)/"
+  endif
+	cp -u $(DEPS)/bin/libgcc_s_dw2-1.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libcrypto-1_1.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libssl-1_1.dll "$(TARGET)/"
+endif
+	cp -u $(DEPS)/bin/libstdc++-6.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libatk-1.0-0.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libbrotlidec.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libbrotlicommon.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libbz2-1.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libcairo-2.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libcairo-gobject-2.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libcurl-4.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libdatrie-1.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libepoxy-0.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libexpat-1.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libffi-6.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libfontconfig-1.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libfreetype-6.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libfribidi-0.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libgdk-3-0.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libgdk_pixbuf-2.0-0.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libgio-2.0-0.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libglib-2.0-0.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libgmodule-2.0-0.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libgobject-2.0-0.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libgraphite2.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libgtk-3-0.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libharfbuzz-0.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libiconv-2.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libidn2-0.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libintl-8.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libnghttp2-14.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libpango-1.0-0.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libpangocairo-1.0-0.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libpangoft2-1.0-0.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libpangowin32-1.0-0.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libpcre-1.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libpixman-1-0.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libpng16-16.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libpsl-5.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libreadline7.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libtermcap-0.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libthai-0.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libunistring-2.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/libwinpthread-1.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/lua53.dll "$(TARGET)/"
+	cp -u $(DEPS)/bin/zlib1.dll "$(TARGET)/"

README.fr.md

@@ -0,0 +1,21 @@
+A propos de Cardpeek
+====================
+
+_([English version](README.md))_
+
+Cardpeek est un outil de lecture de carte à puce avec une interface graphique basée sur GTK, fonctionnant sous GNU Linux/Windows/Mac OS X et extensible par le langage de programmation LUA.
+
+Cardpeek est un outil qui a pour objectif de vous permettre d’accéder aux informations personnelles qui sont stockées dans vos carte à puce. Vous pouvez ainsi être mieux informé des données qui sont collectées sur vous.
+
+Dans cette version, l’application est capable de lire le contenu des cartes suivantes :
+
+* Les cartes à puce bancaires [EMV](doc/emv.fr.md), dont les cartes NFC - _[capture d'écran](doc/sample-emv.jpg)_
+* Les cartes de transport de Paris / Île de France [Navigo](doc/navigo.fr.md), ainsi que MOBIB (Belgique) et RavKav (Israel) -  _[capture d'écran](doc/sample-navigo.jpg)_
+* Les cartes Monéo
+* Les cartes Vitales 2
+* Les passports électroniques/biométriques avec une sécurité BAC.
+* La carte d'identité belge (eID)
+* Les cartes SIM GSM (beta)
+* Les cartes Mifare (beta)
+* Les cartes conducteur tachygraphes
+* Les cartes OpenPGP (beta)

README.md

@@ -1,49 +1,43 @@
-**The cardpeek homepage is located at http://pannetrat.com/Cardpeek/**
+Cardpeek
+========
 
-About Cardpeek
-==============
+## About
 
-Cardpeek is a Linux/Windows/Mac OS X tool to read the contents of ISO7816 smart cards. It features a GTK GUI to represent card data is a tree view, and is extendable with a scripting language (LUA).
+_([Version française](README.fr.md))_
+
+Cardpeek is a Linux/Windows/Mac OS X tool to read the contents of ISO7816 smart cards. It features a GTK GUI to represent card data in a tree view, and is extendable with a scripting language (LUA).
 
 The goal of this project is to allow smart card owners to be better informed about what type of personal information is stored in these devices.
 
 The tool currently reads the contents of :
 
-* EMV Pin and Chip cards, including NFC ones.
-* Navigo public transport cards, MOBIB and RavKav? cards.
+* [EMV](doc/emv.md) Pin and Chip cards, including NFC ones - _[screenshot](doc/sample-emv.jpg)_
+* [Navigo](doc/navigo.md) (Paris), MOBIB (Belgium), RavKav (Israel) and other public transport cards of the Calypso family - _[screenshot](doc/sample-navigo.jpg)_
 * The French health card "Vitale 2"
-* Electronic/Biometric passports in BAC security mode.
+* Electronic/Biometric passports in BAC security mode
 * GSM SIM cards (but not USIM data)
 * The Belgian eID card
-* Driver tachograph cards;
-* OpenPGP cards (beta);
+* Driver tachograph cards
+* OpenPGP cards (beta)
 
 It can also read the following cards with limited interpretation of data:
-* Some Mifare cards (such as the Thalys card);
-* Moneo, the French electronic purse;
-
-More info here: http://pannetrat.com/Cardpeek/
+* Some Mifare cards (such as the Thalys card)
+* Moneo, the French electronic purse
 
-A propos de Cardpeek
-====================
+## Build
 
-Cardpeek est un outil de lecture de carte à puce avec une interface graphique basée sur GTK, fonctionnant sous GNU Linux/Windows/Mac OS X et extensible par le langage de programmation LUA.
+**!!! Produced binaries do not run yet - See [issue #1](https://github.com/ipamo/cardpeek/issues/1) !!!**
 
-Cardpeek est un outil qui a pour objectif de vous permettre d’accéder aux informations personnelles qui sont stockées dans vos carte à puce. Vous pouvez ainsi être mieux informé des données qui sont collectées sur vous.
+- [Build instructions for Debian](doc/build-debian.md), either for the local Debian host, or for cross-compilation to Windows using mingw-w64.
+- [Build instructions for Windows](doc/build-windows.md), using msys2.
+- [Specific instructions for FreeBSD](doc/build-freebsd.md) in case of errors.
 
-Dans cette version, l’application est capable de lire le contenu des cartes suivantes :
+## Usage
 
-* Les cartes à puce bancaires EMV, dont les cartes NFC.
-* Les cartes de transport d'île de France Navigo, ainsi que MOBIB(Belgique) et RavKav?(Israel).
-* Les cartes Monéo
-* Les cartes Vitales 2
-* Les passports électroniques/biométriques avec une sécurité BAC.
-* La carte d'identité belge (eID).
-* Les cartes SIM GSM (beta).
-* Les cartes Mifare (beta).
-* Les cartes conducteur tachygraphes.
-* Les cartes OpenPGP (beta);
+The [Reference Manual](doc/cardpeek_ref.en.pdf) provides detailed usage instructions.
 
-Plus de détails ici : http://pannetrat.com/Cardpeek/
+## Authors
 
+Written initially by Alain Pannetrat under the [GNU General Public License, version 3](COPYING), with the additional exemption that compiling, linking, and/or using OpenSSL is allowed.
 
+More info here: http://pannetrat.com/Cardpeek/

a_string.c

@@ -29,7 +29,7 @@
 
 a_string_t* a_strnnew(unsigned n, const char* str)
 {
-  a_string_t* cs = (a_string_t *)malloc(sizeof(a_string_t));
+  a_string_t* cs = malloc(sizeof(a_string_t)); //(a_string_t *)
 
   if (n)
   {

cardpeek.appdata.xml

@@ -30,7 +30,7 @@
  </description>
  <screenshots>
   <screenshot type="default">
-   <image>http://cardpeek.googlecode.com/files/sample-emv.jpg</image>
+   <image>http://4.bp.blogspot.com/-iu2fS_ovwj8/UIqPFKy31lI/AAAAAAAAHx0/WM1qPUbUzxo/s1600/cardpeek+record.png</image>
    <caption>Reading the content of a bank card.</caption>
   </screenshot>
  </screenshots>

cardpeek_update.c

@@ -540,7 +540,7 @@ int cardpeek_update_check(void)
     }
 
     switch (ui_question("Cardpeek is configured to check for script updates periodically.\n"
-                        "Do you whish to perform this check now?",
+                        "Do you wish to perform this check now?",
                         "Yes","No, ask me again later","No, always use the local copy",NULL))
     {
         case 0:

clean.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+[ -f Makefile ] && make clean
+make -f Makefile.win32 clean
+for p in $(find -type f -name "*.o"); do
+    rm "$p"
+done
+for p in $(find -type f -name "*.dirstamp"); do
+    rm "$p"
+done
+for p in $(find -type d -name "*.deps"); do
+    rm -r "$p"
+done
+rm -f Makefile
+rm -f Makefile.in
+rm -f aclocal.m4
+rm -f cardpeek
+rm -f cardpeek.exe
+rm -f cardpeek_resources.c
+rm -f compile
+rm -f config.guess
+rm -f config.h
+rm -f config.log
+rm -f config.status
+rm -f config.sub
+rm -f configure
+rm -f depcomp
+rm -f install-sh
+rm -f missing
+rm -f stamp-h1
+rm -f dot_cardpeek.tar.gz
+rm -f win32/libwinscard.a
+rm -rf autom4te.cache

compile-cardpeek.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+# Created @ 13.01.2015 by Christian Mayer <http://fox21.at>
+
+
+# You also need to install DBus:
+#   https://gist.github.com/TheFox/dc3f1b88757ba0a8a7a9
+#1. Xcode 4.6.2 Command Line Tools.
+#2. Homebrew (http://mxcl.github.io/homebrew/), used to install libgtk+, liblua and libssl.
+#3. XQuartz (http://xquartz.macosforge.org/).
+
+# Install 'gnome-icon-theme' for GTK+ 3.
+brew install gnome-icon-theme
+brew install openssl
+brew link openssl --force
+brew install glib
+brew install gtk+3
+brew install curl
+brew install lua
+
+# Check out the source.
+pwd
+
+# Create files for compiling.
+autoreconf -fi
+
+# './configure' may fail with
+#   Package 'xyz', required by 'abc', not found
+# So we need to set the path for PkgConfig.
+export PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig
+./configure
+
+# Compile.
+make
+
+# Alternatively you can install
+# cardpeek into your system.
+#make install

configure.ac

@@ -239,7 +239,7 @@ if test "$HOST_TYPE" = "freebsd" -a ! "$ICONV_LIBS"; then
     AC_MSG_WARN([
 ********
 
-On FreeBSD, you may need to specify the environement variable ICONV_LIBS='-l iconv' before running 'configure', as detailed in INSTALL.FreeBSD. Otherwise 'make' may fail.
+On FreeBSD, you may need to specify the environement variable ICONV_LIBS='-l iconv' before running 'configure', as detailed in doc/build-freebsd.md. Otherwise 'make' may fail.
 
 ********])
 fi