Use newer mifare.c and mifare.h
Correct trailer block computation