Import effective orig tree for upstream version 0.1.6

This includes the contents of the .orig(s), minus any debian/ directory.

[git-debrebase import-from-dgit-view upstream-import-convert: 0.1.6]

21 files changed, 2622 insertions, 0 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..a8a0b7a
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,36 @@
+cmake_minimum_required (VERSION 2.6)
+
+SET(CMAKE_BUILD_TYPE Release CACHE STRING "If build type is not specified on command line, build Release")
+
+project (mrtdreader)
+
+find_package(PkgConfig)
+INCLUDE(CheckIncludeFiles)
+
+pkg_check_modules(NFC libnfc)
+CHECK_INCLUDE_FILES(gcrypt.h HAVE_GCRYPT)
+
+if(NOT NFC_FOUND)
+    MESSAGE(FATAL_ERROR "The development files for libnfc are needed")
+endif()
+
+if(NOT HAVE_GCRYPT)
+    MESSAGE(FATAL_ERROR "The development files for libgcrypt are needed")
+endif()
+
+set(MRTD_VERSION 0.1.6)
+
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mrtd.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mrtd.pc)
+
+if(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mrtd.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig)
+else()
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mrtd.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+endif()
+
+add_subdirectory(src)
+add_subdirectory(test)
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..34e18c5
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,22 @@
+0.1.6
+    Search for start of jpg and jpeg2000 images. This makes it
+    work with some english and american passports
+0.1.5
+    Saving JPEG2000 images to .jp2 files
+    Fixed ugly regression
+0.1.4
+    Fixed memory allocation problem in mrtdreader
+0.1.3
+    Input arguments now set to const
+0.1.2
+    Now also working with german passport - found two mistakes:
+        - Not polling for NFC-A
+        - Not long enough timeout
+    Installing .pc file for multi-arch
+0.1.1:
+    rnd_ifd and kifd can be set or randomized
+    mrtdreader also reading EF.SOD
+    Some cleanup
+    More in README.md
+0.1.0:
+    First version to be released. BAC supported, but no support for EAC.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..16b4408
--- /dev/null
+++ b/README.md
@@ -0,0 +1,60 @@
+mrtdreader
+==========
+
+Machine-readable travel documents such as passports nowadays usually contain
+an RFID chip for storing various data. This library provides useful
+functions for reading out the data from these documents. This version of the
+library supports the Basic Access Control (BAC). It uses several cryptographic
+functions from either libgcrypt or libtomcrypt (depending on compile-time
+options) in order to do the necessary decryption of the content of the MRTDs.
+The key for the BAC-scheme is derived from the Machine-readable zone (MRZ)
+which is printed on the MRTD.
+ 
+The library depends on libnfc for the hardware interaction and only devices
+supported by libnfc will therefore work.
+
+
+Build instruction
+-----------------
+- cmake .
+- make
+- sudo make install
+- sudo ldconfig
+
+
+Usage
+------------
+There is a tool called *mrtdreader* using the library which can be run like
+this:
+
+- mrtdreader &lt;MRZ&gt;
+
+MRZ is the bottom line on the machine-readable travel document.
+
+Content of MRTDs
+----------------
+
+The following files may be present in the MRTD:
+
+* EF.DG1  - 0101 - MRZ
+* EF.DG2  - 0102 - Face
+* EF.DG3  - 0103 - Fingerprint
+* EF.DG4  - 0104 - Iris
+* EF.DG5  - 0105 - Portrait
+* EF.DG6  - 0106 - RFU
+* EF.DG7  - 0107 - Displayed signature
+* EF.DG8  - 0108 - Data features
+* EF.DG9  - 0109 - Structure features
+* EF.DG10 - 010A - Substance features
+* EF.DG11 - 010B - Additional personal details
+* EF.DG12 - 010C - Additional document features
+* EF.DG13 - 010D - Optional details
+* EF.DG14 - 010E - EAC
+* EF.DG15 - 010F - AA Public key
+* EF.DG16 - 0110 - Persons to notify
+* EF.CA   - 011C - 
+* EF.SOD  - 011D - Security object data - hash values
+* EF.COM  - 011E - EF.COM
+
+The example program *mrtdreader* reads out the MRZ, the facial image, the EF.COM
+file and the EF.SOD file.
diff --git a/config.h.in b/config.h.in
new file mode 100644
index 0000000..d5b305e
--- /dev/null
+++ b/config.h.in
@@ -0,0 +1,2 @@
+
+#define MRTD_VERSION ${MRTD_VERSION}
diff --git a/mrtd.pc.in b/mrtd.pc.in
new file mode 100644
index 0000000..7752204
--- /dev/null
+++ b/mrtd.pc.in
@@ -0,0 +1,11 @@
+prefix=${CMAKE_INSTALL_PREFIX}
+exec_prefix=${CMAKE_INSTALL_PREFIX}/bin
+libdir=${CMAKE_INSTALL_PREFIX}/lib
+includedir=${CMAKE_INSTALL_PREFIX}/include
+
+Name: mrtd
+Description: MRTD - machine-readable travel document reader
+Version: ${MRTD_VERSION}
+Requires:
+Libs: -lmrtd -lnfc
+Cflags: -I${CMAKE_INSTALL_PREFIX}/include/mrtd
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..d88d3e7
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,22 @@
+add_library(mrtd SHARED bac.c bachelper.c fileread.c hardware.c crypto-gcrypt.c)
+target_link_libraries(mrtd nfc)
+target_link_libraries(mrtd usb)
+target_link_libraries(mrtd gcrypt)
+
+add_executable(mrtdreader mrtdreader.c)
+target_link_libraries(mrtdreader mrtd)
+
+set_target_properties(mrtd PROPERTIES VERSION 0.0.1 SOVERSION 0)
+
+install(TARGETS mrtdreader DESTINATION bin)
+if(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+ install(TARGETS mrtd DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE})
+else()
+ install(TARGETS mrtd DESTINATION lib)
+endif()
+
+install(FILES mrtd.h DESTINATION include/mrtd)
+install(FILES bac.h DESTINATION include/mrtd)
+install(FILES bachelper.h DESTINATION include/mrtd)
+install(FILES crypto.h DESTINATION include/mrtd)
+install(FILES fileread.h DESTINATION include/mrtd)
diff --git a/src/bac.c b/src/bac.c
new file mode 100644
index 0000000..588de54
--- /dev/null
+++ b/src/bac.c
@@ -0,0 +1,146 @@
+/*
+ *   bac.c - Basic Access Control 
+ *
+ *   Copyright (C) 2014 Ruben Undheim <ruben.undheim@gmail.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <nfc/nfc.h>
+#include "bachelper.h"
+#include "bac.h"
+
+static uint8_t rnd_ifd_int[8] = {0x78,0x17,0x23,0x86,0x0c,0x06,0xc2,0x26};
+static uint8_t kifd_int[16] = {0x0b,0x79,0x52,0x40,0xcb,0x70,0x49,0xb0,0x1c,0x19,0xb3,0x3e,0x32,0x80,0x4f,0x0b};
+
+int mrtd_bac_keyhandshake(nfc_device *pnd, const uint8_t *kmrz, uint8_t *ksenc, uint8_t *ksmac, uint64_t *ssc_long)
+{
+	int i;
+	int res;
+	uint8_t txbuffer[300];
+	int txlen;
+	uint8_t rxbuffer[300];
+	int rxlen;
+
+	txlen = 12;
+	memcpy(txbuffer, "\x00\xa4\x04\x0c\x07\xa0\x00\x00\x02\x47\x10\x01", txlen);
+	rxlen = sizeof(rxbuffer);
+	if((res = nfc_initiator_transceive_bytes(pnd,txbuffer,txlen,rxbuffer,rxlen,500)) < 0){
+		fprintf(stderr,"Unable to send");
+		goto failed;
+	}
+	else{
+		rxlen = res;
+	}
+
+	txlen = 5;
+	memcpy(txbuffer, "\x00\x84\x00\x00\x08", txlen);
+	rxlen = sizeof(rxbuffer);
+	if((res = nfc_initiator_transceive_bytes(pnd,txbuffer,txlen,rxbuffer,rxlen,500)) < 0){
+		fprintf(stderr,"Unable to send");
+		goto failed;
+	}
+	else{
+		rxlen = res;
+	}
+
+	uint8_t remotechallenge[8];
+	memcpy(remotechallenge,rxbuffer,8);
+
+
+	uint8_t kenc[16];
+	uint8_t kmac[16];
+
+	mrtd_bac_kmrz_to_kenc_kmac(kmrz,kenc,kmac);
+
+	uint8_t cmd_data[40];
+
+	mrtd_bac_cmd_data(rnd_ifd_int,kifd_int,remotechallenge,kenc,kmac,cmd_data);
+
+	txlen = 46;
+	memcpy(txbuffer, "\x00\x82\x00\x00\x28", 5);
+	memcpy(txbuffer+5,cmd_data,40);
+	txbuffer[45] = 0x28;
+	rxlen = sizeof(rxbuffer);
+	if((res = nfc_initiator_transceive_bytes(pnd,txbuffer,txlen,rxbuffer,rxlen,100000)) < 0){
+		fprintf(stderr,"Unable to send");
+		goto failed;
+	}
+	else{
+		rxlen = res;
+	}
+
+	uint8_t rnd_icc[8];
+	uint8_t kicc[16];
+
+	if(mrtd_bac_challenge_ok(rxbuffer,kenc,rnd_ifd_int,rnd_icc,kicc)){
+	}
+	else {
+		goto challengefailed;
+	}
+	uint8_t xored[16];
+
+	for(i=0;i<16;i++){
+		xored[i] = kifd_int[i] ^ kicc[i];
+	}
+
+
+	mrtd_bac_kenc_kmac(xored,ksenc,ksmac);
+
+	//printhex("ksenc",ksenc,16);
+	//printhex("ksmac",ksmac,16);
+
+	(*ssc_long) = mrtd_bac_get_ssc(remotechallenge,rnd_ifd_int);
+
+	//printf("ssc: %lx\n",ssc_long);
+
+	return 0;
+
+	failed:
+		return -1;
+	challengefailed:
+		return RET_CHALLENGE_FAILED;
+}
+
+void mrtd_bac_set_rndifd_kifd(const uint8_t *rnd_ifd, const uint8_t *kifd)
+{
+	int i;
+	int r = rand();
+	for(i=0;i<8;i++){
+		rnd_ifd_int[i] = rnd_ifd[i];
+	}
+	for(i=0;i<16;i++){
+		kifd_int[i] = kifd[i];
+	}
+}
+
+void mrtd_bac_randomize_rndifd_kifd()
+{
+	int i,r;
+	for(i=0;i<8;i++){
+		r = rand();
+		rnd_ifd_int[i] = (uint8_t)(r & 0xff);
+	}
+	for(i=0;i<16;i++){
+		r = rand();
+		kifd_int[i] = (uint8_t)(r & 0xff);
+	}
+}
+
+
diff --git a/src/bac.h b/src/bac.h
new file mode 100644
index 0000000..1f928a2
--- /dev/null
+++ b/src/bac.h
@@ -0,0 +1,36 @@
+/*
+ *   header for bac.c
+ *
+ *   Copyright (C) 2014 Ruben Undheim <ruben.undheim@gmail.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+#ifndef INC_BAC_H
+#define INC_BAC_H
+
+#include <stdint.h>
+
+#define RET_CHALLENGE_FAILED -2
+
+int mrtd_bac_keyhandshake(nfc_device *pnd, const uint8_t *kmrz, uint8_t *ksenc, uint8_t *ksmac, uint64_t *ssc_long);
+
+void mrtd_bac_set_rndifd_kifd(const uint8_t *rnd_ifd, const uint8_t *kifd);
+
+void mrtd_bac_randomize_rndifd_kifd();
+
+#endif /* INC_BAC_H */
+
diff --git a/src/bachelper.c b/src/bachelper.c
new file mode 100644
index 0000000..c06925f
--- /dev/null
+++ b/src/bachelper.c
@@ -0,0 +1,355 @@
+/*
+ *   bachelper.c - functions that implement basic algorithms that are
+ *     part of the BAC procedure
+ *
+ *   Copyright (C) 2014 Ruben Undheim <ruben.undheim@gmail.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include "crypto.h"
+
+
+static int endianness()
+{
+	int i = 1;
+	char *p = (char *)&i;
+	if(p[0] == 1)
+		return 0;
+	else
+		return 1;
+}
+
+void mrtd_bac_kenc_kmac(const uint8_t *input, uint8_t *kenc, uint8_t *kmac)
+{
+	uint8_t hash[20];
+	uint8_t k[20];
+	uint8_t kenc_tmp[20];
+	uint8_t kmac_tmp[20];
+	int tmp;
+	memcpy(hash,input,16);
+	memcpy(hash+16,"\x00\x00\x00\x01",4);
+	mrtd_crypto_sha1(hash,20,k);
+	mrtd_crypto_fix_parity(k,kenc_tmp,20,&tmp);
+	memcpy(kenc,kenc_tmp,16);
+
+	hash[19] = 0x02;
+	mrtd_crypto_sha1(hash,20,k);
+	mrtd_crypto_fix_parity(k,kmac_tmp,20,&tmp);
+	memcpy(kmac,kmac_tmp,16);
+}
+
+void mrtd_bac_kmrz_to_kenc_kmac(const uint8_t *kmrz, uint8_t *kenc, uint8_t *kmac)
+{
+	uint8_t hash[20];
+	mrtd_crypto_sha1(kmrz,24,hash);
+	mrtd_bac_kenc_kmac(hash,kenc,kmac);
+}
+
+void mrtd_bac_eifd_mifd(const uint8_t *rnd_ifd, const uint8_t *kifd, const uint8_t *remote_challenge, const uint8_t *kenc, const uint8_t *kmac, uint8_t *eifd, uint8_t *mifd)
+{
+	uint8_t S[32];
+	memcpy(S,rnd_ifd,8);
+	memcpy(S+8,remote_challenge,8);
+	memcpy(S+16,kifd,16);
+
+	mrtd_crypto_encrypt_3des(S,eifd,32,kenc);
+	mrtd_crypto_mac_padding(eifd,mifd,32,kmac);
+}
+
+void mrtd_bac_cmd_data(const uint8_t *rnd_ifd, const uint8_t *kifd, const uint8_t *remote_challenge, const uint8_t *kenc, const uint8_t *kmac, uint8_t *cmd_data)
+{
+	mrtd_bac_eifd_mifd(rnd_ifd,kifd,remote_challenge,kenc,kmac,cmd_data,cmd_data+32);
+}
+
+
+char mrtd_bac_challenge_ok(const uint8_t *rx_data, const uint8_t *kenc, const uint8_t *rnd_ifd, uint8_t *rnd_icc, uint8_t *kicc)
+{
+	int i;
+	uint8_t decryptedresp[32];
+	const uint8_t *resp;
+	const uint8_t *mac_received;
+	uint8_t *rec_ifd;
+
+	resp = rx_data;
+	mac_received = rx_data+32;
+
+	mrtd_crypto_decrypt_3des(resp,decryptedresp,32,kenc);
+
+	if(rnd_icc != NULL)
+		memcpy(rnd_icc,decryptedresp,8);
+	if(kicc != NULL)
+		memcpy(kicc,decryptedresp+16,16);
+	rec_ifd = decryptedresp+8;
+	for(i=0;i<8;i++){
+		if(rec_ifd[i] != rnd_ifd[i]){
+			return 0;
+		}
+	}
+	return 1;
+}
+
+uint64_t mrtd_bac_get_ssc(const uint8_t *remote_challenge, const uint8_t *rnd_ifd)
+{
+	char ssc[8];
+	uint64_t ssc_long;
+
+	memcpy(ssc,remote_challenge+4,4);
+	memcpy(ssc+4,rnd_ifd+4,4);
+
+	if(endianness()){
+		*(((uint8_t*)(&ssc_long))+0) = ssc[0];
+		*(((uint8_t*)(&ssc_long))+1) = ssc[1];
+		*(((uint8_t*)(&ssc_long))+2) = ssc[2];
+		*(((uint8_t*)(&ssc_long))+3) = ssc[3];
+		*(((uint8_t*)(&ssc_long))+4) = ssc[4];
+		*(((uint8_t*)(&ssc_long))+5) = ssc[5];
+		*(((uint8_t*)(&ssc_long))+6) = ssc[6];
+		*(((uint8_t*)(&ssc_long))+7) = ssc[7];
+	}
+	else {
+		*(((uint8_t*)(&ssc_long))+7) = ssc[0];
+		*(((uint8_t*)(&ssc_long))+6) = ssc[1];
+		*(((uint8_t*)(&ssc_long))+5) = ssc[2];
+		*(((uint8_t*)(&ssc_long))+4) = ssc[3];
+		*(((uint8_t*)(&ssc_long))+3) = ssc[4];
+		*(((uint8_t*)(&ssc_long))+2) = ssc[5];
+		*(((uint8_t*)(&ssc_long))+1) = ssc[6];
+		*(((uint8_t*)(&ssc_long))+0) = ssc[7];
+	}
+
+	return ssc_long;
+}
+
+
+void mrtd_bac_protected_apdu(const uint8_t *input, uint8_t *output, const int length, int *outputlength, const uint8_t *ksenc, const uint8_t *ksmac, const uint64_t ssc_long)
+{
+	int datalength;
+	char has_le;
+	uint8_t *do87 = NULL;
+	uint8_t do8e[10];
+	uint8_t padded_command[8];
+	uint8_t *A;
+	int padded_data_length;
+	int do87_length;
+	uint8_t *do97 = NULL;
+	int do97_length;
+	uint8_t le;
+
+	if(length > 5){
+		datalength = (int)input[4];
+	}
+	else{
+		datalength = 0;
+	}
+	if(datalength != 0 ? length > (5+datalength) : length == 5){
+		le = input[length-1];
+		has_le = 1;
+	}
+	else{
+		le = 0;
+		has_le = 0;
+	}
+
+	//printf("datalength: %d\n",datalength);
+	//printf("hasle: %d\n",has_le);
+	int i;
+
+	if(datalength != 0){
+		uint8_t *padded_data;
+		padded_data = malloc(((datalength+8)/8)*8);
+		mrtd_crypto_padding(input+5,padded_data,datalength,&padded_data_length);
+		do87 = malloc(padded_data_length+3);
+		mrtd_crypto_encrypt_3des(padded_data,do87+3,padded_data_length,ksenc);
+		do87[0] = 0x87;
+		do87[1] = 0x09;
+		do87[2] = 0x01;
+		do87_length = padded_data_length+3;
+
+		free(padded_data);
+	}
+	else{
+		do87_length = 0;
+		padded_data_length = 0;
+	}
+
+	if(has_le){
+		do97_length = 3;
+		do97 = malloc(do97_length);
+		do97[0] = 0x97;
+		do97[1] = 0x01;
+		do97[2] = le;
+	}
+	else{
+		do97_length = 0;
+	}
+
+	int padded_command_length;
+	mrtd_crypto_padding(input,padded_command,4,&padded_command_length);
+	padded_command[0] = 0x0c;
+
+
+	A = malloc(16+do87_length+do97_length);
+	if(endianness()){
+		A[0] = *(((uint8_t*)(&ssc_long))+0);
+		A[1] = *(((uint8_t*)(&ssc_long))+1);
+		A[2] = *(((uint8_t*)(&ssc_long))+2);
+		A[3] = *(((uint8_t*)(&ssc_long))+3);
+		A[4] = *(((uint8_t*)(&ssc_long))+4);
+		A[5] = *(((uint8_t*)(&ssc_long))+5);
+		A[6] = *(((uint8_t*)(&ssc_long))+6);
+		A[7] = *(((uint8_t*)(&ssc_long))+7);
+	}
+	else {
+		A[0] = *(((uint8_t*)(&ssc_long))+7);
+		A[1] = *(((uint8_t*)(&ssc_long))+6);
+		A[2] = *(((uint8_t*)(&ssc_long))+5);
+		A[3] = *(((uint8_t*)(&ssc_long))+4);
+		A[4] = *(((uint8_t*)(&ssc_long))+3);
+		A[5] = *(((uint8_t*)(&ssc_long))+2);
+		A[6] = *(((uint8_t*)(&ssc_long))+1);
+		A[7] = *(((uint8_t*)(&ssc_long))+0);
+	}
+	memcpy(A+8,padded_command,8);
+	if(do87 != NULL)
+		memcpy(A+16,do87,do87_length);
+	if(do97 != NULL)
+		memcpy(A+16+do87_length,do97,do97_length);
+
+
+	do8e[0] = 0x8e;
+	do8e[1] = 0x08;
+
+	mrtd_crypto_mac_padding(A,do8e+2,16+do87_length+do97_length,ksmac);
+
+	(*outputlength) = 5+do87_length+do97_length+10+1;
+	memcpy(output,padded_command,4);
+	output[4] = (*outputlength)-6;
+	if(do87 != NULL)
+		memcpy(output+5,do87,do87_length);
+	if(do97 != NULL)
+		memcpy(output+5+do87_length,do97,do97_length);
+	memcpy(output+5+do87_length+do97_length,do8e,10);
+	output[(*outputlength)-1] = 0x00;
+
+	//printf("tot_length: %d\n",*outputlength);
+
+	free(A);
+	if(do87 != NULL)
+		free(do87);
+	if(do97 != NULL)
+		free(do97);
+
+	return ;
+}
+
+void mrtd_bac_decrypt_response(const uint8_t *input, uint8_t *output, const int length, int *outputlength, uint8_t *ksenc)
+{
+	uint8_t *tmp;
+	int tmplength;
+	const uint8_t *tobedecrypted = input+3;
+	tmplength = length-16-3;
+	if(tmplength > 0){
+		tmp = malloc(tmplength);
+
+		mrtd_crypto_decrypt_3des(tobedecrypted,tmp,tmplength,ksenc);
+
+		mrtd_crypto_padding_remove(tmp,output,tmplength,outputlength);
+
+		free(tmp);
+	}
+	else {
+		(*outputlength) = 0;
+	}
+}
+
+static int mrtd_get_mrz_weight(int i)
+{
+	switch(i){
+	case(0): return 7;
+	case(1): return 3;
+	case(2): return 1;
+	}
+}
+
+int mrtd_bac_check_digit(const uint8_t *input, const int length)
+{
+	int i;
+	int tmp;
+	int out_value;
+	int check_digit;
+	check_digit = 0;
+	for(i=0;i<length;i++){
+		if (input[i] >= 'A' && input[i] <= 'Z')
+			tmp = input[i] - 55;
+		else if (input[i] == '<')
+			tmp = 0;
+		else
+			tmp = input[i] - 0x30;
+		check_digit += tmp * mrtd_get_mrz_weight(i % 3);
+	}
+	return (check_digit % 10);
+}
+
+void mrtd_bac_get_kmrz(const uint8_t *pn, const uint8_t *dob, const uint8_t *eov, uint8_t *output)
+{
+	uint8_t tmp[20];
+	int cd;
+	int len;
+
+	len = strlen(pn);
+	if (len < 9){
+		memcpy(output,pn,len);
+		memset(output+len,'<',9-len);
+	}
+	else {
+		memcpy(output,pn,9);
+	}
+	
+	cd = mrtd_bac_check_digit(output,9);
+	output[9] = (uint8_t)(cd+0x30);
+
+	memcpy(output+10,dob,6);
+	cd = mrtd_bac_check_digit(dob,6);
+	output[16] = (uint8_t)(cd+0x30);
+
+	memcpy(output+17,eov,6);
+	cd = mrtd_bac_check_digit(eov,6);
+	output[23] = (uint8_t)(cd+0x30);
+	output[24] = 0;
+	
+}
+
+void mrtd_bac_get_kmrz_from_mrz(const uint8_t *mrz, uint8_t *kmrz)
+{
+	uint8_t pn[9];
+	uint8_t dob[6];
+	uint8_t eov[6];
+
+	memcpy(pn,mrz,9);
+	memcpy(dob,mrz+13,6);
+	memcpy(eov,mrz+21,6);
+	
+	mrtd_bac_get_kmrz(pn,dob,eov,kmrz);
+
+}
+
+
diff --git a/src/bachelper.h b/src/bachelper.h
new file mode 100644
index 0000000..e428723
--- /dev/null
+++ b/src/bachelper.h
@@ -0,0 +1,48 @@
+/*
+ *   header for bachelper.c 
+ *
+ *   Copyright (C) 2014 Ruben Undheim <ruben.undheim@gmail.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef INC_BAC_HELPER_H
+#define INC_BAC_HELPER_H
+
+#include <stdint.h>
+
+void mrtd_bac_kmrz_to_kenc_kmac(const uint8_t *kmrz, uint8_t *kenc, uint8_t *kmac);
+
+void mrtd_bac_kenc_kmac(const uint8_t *input, uint8_t *kenc, uint8_t *kmac);
+
+void mrtd_bac_eifd_mifd(const uint8_t *rnd_ifd, const uint8_t *kifd, const uint8_t *remote_challenge, const uint8_t *kenc, const uint8_t *kmac, uint8_t *eifd, uint8_t *mifd);
+
+void mrtd_bac_cmd_data(const uint8_t *rnd_ifd, const uint8_t *kifd, const uint8_t *remote_challenge, const uint8_t *kenc, const uint8_t *kmac, uint8_t *cmd_data);
+
+char mrtd_bac_challenge_ok(const uint8_t *rx_data, const uint8_t *kenc, const uint8_t *rnd_ifd, uint8_t *rnd_icc, uint8_t *kicc);
+
+uint64_t mrtd_bac_get_ssc(const uint8_t *remote_challenge, const uint8_t *rnd_ifd);
+
+void mrtd_bac_protected_apdu(const uint8_t *input, uint8_t *output, const int length, int *outputlength, const uint8_t *ksenc, const uint8_t *ksmac, const uint64_t ssc_long);
+
+void mrtd_bac_decrypt_response(const uint8_t *input, uint8_t *output, const int length, int *outputlength, const uint8_t *ksenc);
+
+int mrtd_bac_check_digit(const uint8_t *input, const int length);
+
+void mrtd_bac_get_kmrz(const uint8_t *pn, const uint8_t *dob, const uint8_t *eov, uint8_t *output);
+
+void mrtd_bac_get_kmrz_from_mrz(const uint8_t *mrz, uint8_t *kmrz);
+
+#endif /* INC_BAC_HELPER_H */
diff --git a/src/crypto-gcrypt.c b/src/crypto-gcrypt.c
new file mode 100644
index 0000000..5973704
--- /dev/null
+++ b/src/crypto-gcrypt.c
@@ -0,0 +1,182 @@
+/*
+ *   crypto-gcrypt.c - Cryptography routines needed by mrtreader using
+ *     libgcrypt.
+ *
+ *   Copyright (C) 2014 Ruben Undheim <ruben.undheim@gmail.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <gcrypt.h>
+
+
+void mrtd_crypto_sha1(const uint8_t *input, const int length, uint8_t *output)
+{
+	gcry_md_hash_buffer(GCRY_MD_SHA1, output, input, length);
+}
+
+void mrtd_crypto_crypt_des(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key, const char encrypt)
+{
+	int err;
+	uint8_t iv[8];
+	memset(iv,0,8);
+	gcry_cipher_hd_t handle;
+	err = gcry_cipher_open(&handle, GCRY_CIPHER_DES,GCRY_CIPHER_MODE_CBC,0);
+	err = gcry_cipher_setkey(handle, key,8);
+	err = gcry_cipher_setiv(handle, iv, 8);
+	if(encrypt)
+		err = gcry_cipher_encrypt(handle,output,length,input,length);
+	else
+		err = gcry_cipher_decrypt(handle,output,length,input,length);
+	gcry_cipher_close(handle);
+
+}
+
+void mrtd_crypto_encrypt_des(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key)
+{
+	mrtd_crypto_crypt_des(input,output,length,key,1);
+}
+
+void mrtd_crypto_decrypt_des(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key)
+{
+	mrtd_crypto_crypt_des(input,output,length,key,0);
+}
+
+void mrtd_crypto_crypt_3des(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key, const char encrypt)
+{
+	int err;
+	uint8_t longkey[24];
+	uint8_t iv[8];
+	memset(iv,0,8);
+	memcpy(longkey,key,16);
+	memcpy(longkey+16,key,8);
+	gcry_cipher_hd_t handle;
+	err = gcry_cipher_open(&handle, GCRY_CIPHER_3DES,GCRY_CIPHER_MODE_CBC,0);
+	err = gcry_cipher_setkey(handle, longkey,24);
+	err = gcry_cipher_setiv(handle, iv, 8);
+	if(encrypt)
+		err = gcry_cipher_encrypt(handle,output,length,input,length);
+	else
+		err = gcry_cipher_decrypt(handle,output,length,input,length);
+	gcry_cipher_close(handle);
+}
+
+void mrtd_crypto_encrypt_3des(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key)
+{
+	mrtd_crypto_crypt_3des(input,output,length,key,1);
+}
+
+void mrtd_crypto_decrypt_3des(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key)
+{
+	mrtd_crypto_crypt_3des(input,output,length,key,0);
+}
+
+void mrtd_crypto_fix_parity(const uint8_t *input, uint8_t *output, const int length, int *newlength)
+{
+	int i,j;
+	unsigned char y;
+	int parity;
+	*newlength = length+(length/8);
+	for(i=0;i<length;i++){
+		y = input[i] & 0xfe;	
+		parity = 0;
+		for(j=0;j<8;j++){
+			parity += y >> j & 1;
+		}
+		if(parity % 2 == 0){
+			output[i] = (char)(y + 1);
+		}
+		else{
+			output[i] = y;
+		}
+	}
+
+}
+void mrtd_crypto_padding(const uint8_t *input, uint8_t *output, const int length, int *newlength)
+{
+	*newlength = ((length+8)/8)*8;
+	memset(output,0,*newlength);
+	memcpy(output,input,length);
+	output[length] = 0x80;
+}
+void mrtd_crypto_padding_remove(const uint8_t *input, uint8_t *output, const int length, int *newlength)
+{
+	int i;
+	int pos;
+	char found = 0;
+	for(i=length-1;i>=0;i--){
+		if(input[i] == 0x00) {
+			continue;
+		}
+		else if(input[i] == 0x80) {
+			pos = i;
+			found = 1;
+			break;
+		}
+		else {
+			goto failed;
+		}
+	}
+	if(found){
+		*newlength = pos;
+		memcpy(output,input,*newlength);
+	}
+	else{
+		goto failed;
+	}
+
+	return;
+
+	failed:
+		*newlength = 0;
+		return;
+}
+
+void mrtd_crypto_mac(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key)
+{
+	int i,j;
+	uint8_t current[8];
+	uint8_t mac[8];
+	uint8_t xormac[8];
+	uint8_t tmp[8];
+	memset(mac,0,8);
+	for(i=0;i<(length/8);i++){
+		for(j=0;j<8;j++){
+			current[j] = input[i*8+j];
+		}
+		for(j=0;j<8;j++){
+			xormac[j] = mac[j] ^ current[j];
+		}
+		mrtd_crypto_encrypt_des(xormac,mac,8,key);
+	}
+	mrtd_crypto_decrypt_des(mac,tmp,8,key+8);
+	mrtd_crypto_encrypt_des(tmp,output,8,key);
+}
+
+void mrtd_crypto_mac_padding(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key)
+{
+	int newlength;
+	uint8_t *tmp;
+	tmp = malloc(((length+8)/8)*8);
+	mrtd_crypto_padding(input,tmp,length,&newlength);
+	mrtd_crypto_mac(tmp,output,newlength,key);
+
+	free(tmp);
+}
diff --git a/src/crypto-tomcrypt.c b/src/crypto-tomcrypt.c
new file mode 100644
index 0000000..b19c724
--- /dev/null
+++ b/src/crypto-tomcrypt.c
@@ -0,0 +1,211 @@
+/*
+ *   crypto-tomgrypt.c - Cryptography routines needed by mrtreader using
+ *     libtomcrypt.
+ *
+ *   Copyright (C) 2014 Ruben Undheim <ruben.undheim@gmail.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <tomcrypt.h>
+
+
+void mrtd_crypto_sha1(const uint8_t *input, const int length, uint8_t *output)
+{
+	hash_state md;
+	sha1_init(&md);
+	sha1_process(&md, (const unsigned char*) input, length);
+	sha1_done(&md, output);
+}
+
+void mrtd_crypto_crypt_des(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key, const char encrypt)
+{
+	int err;
+	symmetric_CBC cbc_state;
+	char IV[8];
+
+	memset(IV,0,8);
+
+	if(register_cipher(&des_desc) == -1){
+		printf("Error registering cipher\n");
+	}
+	if((err = cbc_start(find_cipher("des"),IV,key,8,0,&cbc_state)) != CRYPT_OK){
+		printf("cbc_start error: %s\n", error_to_string(err));
+	}
+	if(encrypt){
+		if((err = cbc_encrypt(input,output,length,&cbc_state)) != CRYPT_OK){
+			printf("cbc_encrypt error: %s\n", error_to_string(err));
+		}
+	}
+	else{
+		if((err = cbc_decrypt(input,output,length,&cbc_state)) != CRYPT_OK){
+			printf("cbc_encrypt error: %s\n", error_to_string(err));
+		}
+	}
+	if((err = cbc_done(&cbc_state)) != CRYPT_OK){
+		printf("cbc_done error: %s\n", error_to_string(err));
+	}
+}
+
+void mrtd_crypto_encrypt_des(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key)
+{
+	mrtd_crypto_crypt_des(input,output,length,key,1);
+}
+
+void mrtd_crypto_decrypt_des(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key)
+{
+	mrtd_crypto_crypt_des(input,output,length,key,0);
+}
+
+void mrtd_crypto_crypt_3des(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key, const char encrypt)
+{
+	int err;
+	symmetric_CBC cbc_state;
+	char longkey[24];
+	char IV[8];
+
+	memcpy(longkey,key,16);
+	memcpy(longkey+16,key,8);
+	memset(IV,0,8);
+
+	if(register_cipher(&des3_desc) == -1){
+		printf("Error registering cipher\n");
+		exit(-1);
+	}
+	if((err = cbc_start(find_cipher("3des"),IV,longkey,24,0,&cbc_state)) != CRYPT_OK){
+		printf("cbc_start error: %s\n", error_to_string(err));
+		exit(-1);
+	}
+	if(encrypt){
+		if((err = cbc_encrypt(input,output,length,&cbc_state)) != CRYPT_OK){
+			printf("cbc_encrypt error: %s\n", error_to_string(err));
+			exit(-1);
+		}
+	}
+	else{
+		if((err = cbc_decrypt(input,output,length,&cbc_state)) != CRYPT_OK){
+			printf("cbc_encrypt error: %s\n", error_to_string(err));
+			exit(-1);
+		}
+	}
+}
+
+void mrtd_crypto_encrypt_3des(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key)
+{
+	mrtd_crypto_crypt_3des(input,output,length,key,1);
+}
+
+void mrtd_crypto_decrypt_3des(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key)
+{
+	mrtd_crypto_crypt_3des(input,output,length,key,0);
+}
+
+void mrtd_crypto_fix_parity(const uint8_t *input, uint8_t *output, const int length, int *newlength)
+{
+	int i,j;
+	unsigned char y;
+	int parity;
+	*newlength = length+(length/8);
+	for(i=0;i<length;i++){
+		y = input[i] & 0xfe;	
+		parity = 0;
+		for(j=0;j<8;j++){
+			parity += y >> j & 1;
+		}
+		if(parity % 2 == 0){
+			output[i] = (char)(y + 1);
+		}
+		else{
+			output[i] = y;
+		}
+	}
+
+}
+void mrtd_crypto_padding(const uint8_t *input, uint8_t *output, const int length, int *newlength)
+{
+	*newlength = ((length+8)/8)*8;
+	memset(output,0,*newlength);
+	memcpy(output,input,length);
+	output[length] = 0x80;
+}
+void mrtd_crypto_padding_remove(const uint8_t *input, uint8_t *output, const int length, int *newlength)
+{
+	int i;
+	int pos;
+	char found = 0;
+	for(i=length-1;i>=0;i--){
+		if(input[i] == 0x00) {
+			continue;
+		}
+		else if(input[i] == 0x80) {
+			pos = i;
+			found = 1;
+			break;
+		}
+		else {
+			goto failed;
+		}
+	}
+	if(found){
+		*newlength = pos;
+		memcpy(output,input,*newlength);
+	}
+	else{
+		goto failed;
+	}
+
+	return;
+
+	failed:
+		*newlength = 0;
+		return;
+}
+
+void mrtd_crypto_mac(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key)
+{
+	int i,j;
+	uint8_t current[8];
+	uint8_t mac[8];
+	uint8_t xormac[8];
+	uint8_t tmp[8];
+	memset(mac,0,8);
+	for(i=0;i<(length/8);i++){
+		for(j=0;j<8;j++){
+			current[j] = input[i*8+j];
+		}
+		for(j=0;j<8;j++){
+			xormac[j] = mac[j] ^ current[j];
+		}
+		mrtd_crypto_encrypt_des(xormac,mac,8,key);
+	}
+	mrtd_crypto_decrypt_des(mac,tmp,8,key+8);
+	mrtd_crypto_encrypt_des(tmp,output,8,key);
+}
+
+void mrtd_crypto_mac_padding(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key)
+{
+	int newlength;
+	uint8_t *tmp;
+	tmp = malloc(((length+8)/8)*8);
+	mrtd_crypto_padding(input,tmp,length,&newlength);
+	mrtd_crypto_mac(tmp,output,newlength,key);
+
+	free(tmp);
+}
diff --git a/src/crypto.h b/src/crypto.h
new file mode 100644
index 0000000..764dab9
--- /dev/null
+++ b/src/crypto.h
@@ -0,0 +1,47 @@
+/*
+ *   header for crypto_*.c - this header makes the higher-level code
+ *     independent of which crypto-library that is used.
+ *
+ *   Copyright (C) 2014 Ruben Undheim <ruben.undheim@gmail.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef INC_BAC_CRYPTO_H
+#define INC_BAC_CRYPTO_H
+
+#include <stdint.h>
+
+void mrtd_crypto_sha1(const uint8_t *input, const int length, uint8_t *output);
+
+void mrtd_crypto_encrypt_3des(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key);
+
+void mrtd_crypto_decrypt_3des(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key);
+
+void mrtd_crypto_encrypt_des(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key);
+
+void mrtd_crypto_decrypt_des(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key);
+
+void mrtd_crypto_fix_parity(const uint8_t *input, uint8_t *output, const int length, int *newlength);
+
+void mrtd_crypto_mac_padding(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key);
+
+void mrtd_crypto_mac(const uint8_t *input, uint8_t *output, const int length, const uint8_t *key);
+
+void mrtd_crypto_padding(const uint8_t *input, uint8_t *output, const int length, int *newlength);
+
+void mrtd_crypto_padding_remove(const uint8_t *input, uint8_t *output, const int length, int *newlength);
+
+#endif /* INC_BAC_CRYPTO_H */
diff --git a/src/fileread.c b/src/fileread.c
new file mode 100644
index 0000000..beb9931
--- /dev/null
+++ b/src/fileread.c
@@ -0,0 +1,307 @@
+/*
+ *   fileread.c - Functions for reading secure files from MRTD
+ *
+ *   Copyright (C) 2014 Ruben Undheim <ruben.undheim@gmail.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <nfc/nfc.h>
+#include "crypto.h"
+#include "bac.h"
+#include "bachelper.h"
+
+
+#define MAXREAD 100
+
+static int endianness()
+{
+	int i = 1;
+	char *p = (char *)&i;
+	if(p[0] == 1)
+		return 0;
+	else
+		return 1;
+}
+
+int mrtd_fileread_read(nfc_device *pnd, const uint8_t *file_index, uint8_t *output, int *outputlength, const uint8_t *ksenc, const uint8_t *ksmac, uint64_t *ssc_long)
+{
+	int res;
+	uint8_t txbuffer[300];
+	int txlen;
+	uint8_t rxbuffer[300];
+	int rxlen;
+	int already_received;
+
+	uint8_t unprotected[300];
+	int unprotectedlength;
+	unprotectedlength = 7;
+	memcpy(unprotected,"\x00\xa4\x02\x0c\x02\x01\x1e",5);
+	memcpy(unprotected+5,file_index,2);
+	(*ssc_long)++;
+	mrtd_bac_protected_apdu(unprotected,txbuffer,unprotectedlength,&txlen,ksenc,ksmac,*ssc_long);
+
+	//printhex("Transmit",txbuffer,txlen);
+	rxlen = sizeof(rxbuffer);
+	if((res = nfc_initiator_transceive_bytes(pnd,txbuffer,txlen,rxbuffer,rxlen,500)) < 0){
+		fprintf(stderr,"Unable to send");
+		goto failed;
+	}
+	else{
+		rxlen = res;
+	}
+	//printhex("Received (encrypted)",rxbuffer,rxlen);
+	(*ssc_long)++;
+	mrtd_bac_decrypt_response(rxbuffer,unprotected,rxlen,&unprotectedlength,ksenc);
+	//printhex("Received (decrypted)",unprotected,unprotectedlength);
+
+	already_received=0;
+
+	unprotectedlength = 5;
+	memcpy(unprotected,"\x00\xb0\x00\x00\x04",unprotectedlength);
+	(*ssc_long)++;
+	mrtd_bac_protected_apdu(unprotected,txbuffer,unprotectedlength,&txlen,ksenc,ksmac,*ssc_long);
+	//printhex("Transmit",txbuffer,txlen);
+	rxlen = sizeof(rxbuffer);
+	if((res = nfc_initiator_transceive_bytes(pnd,txbuffer,txlen,rxbuffer,rxlen,500)) < 0){
+		fprintf(stderr,"Unable to send");
+		goto failed;
+	}
+	else{
+		rxlen = res;
+	}
+	//printhex("Received (encrypted)",rxbuffer,rxlen);
+	(*ssc_long)++;
+	mrtd_bac_decrypt_response(rxbuffer,unprotected,rxlen,&unprotectedlength,ksenc);
+	//printhex("Received (decrypted)",unprotected,unprotectedlength);
+	memcpy(output+already_received,unprotected,unprotectedlength);
+	already_received += unprotectedlength;
+
+	uint16_t numberbytes;
+	int field_length;
+	if(unprotected[1] <= 0x7f){
+		numberbytes = (uint16_t)unprotected[1];
+		field_length = 1;
+	}
+	else if(unprotected[1] == 0x81){
+		numberbytes = (uint16_t)unprotected[2];
+		field_length = 2;
+	}
+	else if(unprotected[1] == 0x82){
+		if(endianness()){
+			*(((uint8_t*)(&numberbytes))+0) = unprotected[2];
+			*(((uint8_t*)(&numberbytes))+1) = unprotected[3];
+		}
+		else {
+			*(((uint8_t*)(&numberbytes))+1) = unprotected[2];
+			*(((uint8_t*)(&numberbytes))+0) = unprotected[3];
+		}
+		field_length = 3;
+	}
+	else {
+		fprintf(stderr,"Not correct field length");
+		goto failed;
+	}
+	//printf("numberbytes: %d\n",numberbytes);
+	
+	int left_to_read;
+	int readnow;
+	left_to_read = numberbytes - (3-field_length);
+
+	while (left_to_read > 0){
+		if(left_to_read > MAXREAD)
+			readnow = MAXREAD;
+		else
+			readnow = left_to_read;
+		unprotectedlength = 5;
+		memcpy(unprotected,"\x00\xb0\x00\x00\x00",unprotectedlength);
+		if(endianness()){
+			unprotected[2] = *(((uint8_t*)&already_received)+0);
+			unprotected[3] = *(((uint8_t*)&already_received)+1);
+		}
+		else {
+			unprotected[2] = *(((uint8_t*)&already_received)+1);
+			unprotected[3] = *(((uint8_t*)&already_received)+0);
+		}
+		unprotected[4] = readnow;
+		(*ssc_long)++;
+		mrtd_bac_protected_apdu(unprotected,txbuffer,unprotectedlength,&txlen,ksenc,ksmac,*ssc_long);
+		//printhex("Transmit",txbuffer,txlen);
+		rxlen = sizeof(rxbuffer);
+		if((res = nfc_initiator_transceive_bytes(pnd,txbuffer,txlen,rxbuffer,rxlen,500)) < 0){
+			fprintf(stderr,"Unable to send");
+			goto failed;
+		}
+		else{
+			rxlen = res;
+		}
+		//printhex("Received (encrypted)",rxbuffer,rxlen);
+		(*ssc_long)++;
+		mrtd_bac_decrypt_response(rxbuffer,unprotected,rxlen,&unprotectedlength,ksenc);
+		//printhex("Received (decrypted)",unprotected,unprotectedlength);
+		memcpy(output+already_received,unprotected,unprotectedlength);
+		already_received += unprotectedlength;
+		left_to_read -= unprotectedlength;
+	}
+	(*outputlength) = already_received;
+
+	return 0;
+
+	failed:
+		return -1;
+}
+
+void mrtd_fileread_write_image_to_file(const uint8_t *file_content, const int file_size, const char *filename)
+{
+	FILE *out;
+	char filetype;
+	char filenamebuf[256];
+	int baselength=0;
+	unsigned char start_sequence_jpeg[10] = {0xff,0xd8,0xff,0xe0,0x00,0x10,0x4a,0x46,0x49,0x46};
+	unsigned char start_sequence_jpeg2000[10] = {0x00,0x00,0x00,0x0c,0x6a,0x50,0x20,0x20,0x0d,0x0a};
+	unsigned char *start_sequence;
+	int comparelen = 0;
+	if(file_size > 84){
+		filetype = file_content[73];  // 0x00: JPG, 0x01: JPEG2000
+		if(strlen(filename) > 3 && filename[strlen(filename)-4] == '.')
+			baselength = strlen(filename)-4;
+		else
+			baselength = strlen(filename);
+		memcpy(filenamebuf, filename, baselength);
+		if(filetype == 0x00) {
+			memcpy(filenamebuf+baselength,".jpg",4);
+			start_sequence = start_sequence_jpeg;
+			comparelen = 2;
+		}
+		else {
+			memcpy(filenamebuf+baselength,".jp2",4);
+			start_sequence = start_sequence_jpeg2000;
+			comparelen = 10;
+		}
+		filenamebuf[baselength+4] = 0;
+
+		int i,j;
+		int offset = 0;
+		char equal = 0;
+		for(i=0;i<120;i++) {
+			j = 0;
+			if(file_content[i] == start_sequence[j]){
+				equal = 1;
+				for(j=1;j<comparelen;j++) {
+					if(file_content[i+j] != start_sequence[j]){
+						equal = 0;
+						break;
+					}
+				}
+			}
+			if(equal) {
+				offset = i;
+				break;
+			}
+		}
+		if(!equal){
+			printf("Couldn't find start of image\n");
+			return;
+		}
+
+		out = fopen(filenamebuf,"w");
+		printf("Saving image to %s...",filenamebuf);
+		fwrite(file_content+offset,1,file_size-offset,out);
+		fclose(out);
+		printf(" done\n");
+		if(filetype == 0x01)
+			printf("\n(Note: .jp2 files are JPEG2000 images which can be opened\n with many different image viewers. If you are unable to\n open it, it can be converted to JPEG with GraphicsMagick:\n   gm convert image.jp2 image.jpg )\n\n");
+	}
+
+}
+
+void mrtd_fileread_get_datagroup_name(const uint8_t dg, char *name)
+{
+	switch(dg){
+		case(0x60): sprintf(name,"EF_COM");   break;
+		case(0x61): sprintf(name,"EF_DG1");   break;
+		case(0x75): sprintf(name,"EF_DG2");   break;
+		case(0x63): sprintf(name,"EF_DG3");   break;
+		case(0x76): sprintf(name,"EF_DG4");   break;
+		case(0x65): sprintf(name,"EF_DG5");   break;
+		case(0x66): sprintf(name,"EF_DG6");   break;
+		case(0x67): sprintf(name,"EF_DG7");   break;
+		case(0x68): sprintf(name,"EF_DG8");   break;
+		case(0x69): sprintf(name,"EF_DG9");   break;
+		case(0x6a): sprintf(name,"EF_DG10");  break;
+		case(0x6b): sprintf(name,"EF_DG11");  break;
+		case(0x6c): sprintf(name,"EF_DG12");  break;
+		case(0x6d): sprintf(name,"EF_DG13");  break;
+		case(0x6e): sprintf(name,"EF_DG14");  break;
+		case(0x6f): sprintf(name,"EF_DG15");  break;
+		case(0x70): sprintf(name,"EF_DG16");  break;
+		case(0x77): sprintf(name,"EF_SOD");   break;
+		default: sprintf(name,"not defined"); break;
+	}
+	return;
+}
+
+void mrtd_fileread_decode_ef_com(const uint8_t *file_content, const int file_size, uint8_t *datagroups, int *numdatagroups)
+{
+	int i;
+	int currentlength;
+	int interncounter;
+	int totallength;
+	char longer = 0;
+	char currentkeys = 0;
+	currentlength = 0;
+	*numdatagroups=0;
+	for(i=0;i<file_size;i++){
+		if(i==1){
+			totallength = file_content[i];
+			interncounter=0;
+		}
+		else if(longer == 1){
+			longer = 2;
+		}
+		else if(longer == 2){
+			longer = 0;
+			currentlength = file_content[i];
+			interncounter=0;
+		}
+		else if(interncounter == currentlength && file_content[i] == 0x5f){
+			currentkeys = 0;
+			longer = 1;
+		}
+		else if(interncounter == currentlength){
+			longer = 2;
+			if(file_content[i] == 0x5c)
+				currentkeys = 1;
+			else
+				currentkeys = 0;
+		}
+		else {
+			if(currentkeys) {
+				datagroups[interncounter] = file_content[i];
+				char buffer[30];
+				mrtd_fileread_get_datagroup_name(datagroups[interncounter],buffer);
+				printf("Found: %s\n",buffer);
+				(*numdatagroups)++;
+			}
+			interncounter++;
+		}
+	}
+	printf("\n");
+}
+
diff --git a/src/fileread.h b/src/fileread.h
new file mode 100644
index 0000000..e8a8c7a
--- /dev/null
+++ b/src/fileread.h
@@ -0,0 +1,32 @@
+/*
+ *   header for fileread.c
+ *
+ *   Copyright (C) 2014 Ruben Undheim <ruben.undheim@gmail.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef INC_FILEREAD_H
+#define INC_FILEREAD_H
+
+int mrtd_fileread_read(nfc_device *pnd, const uint8_t *file_index, uint8_t *output, int *outputlength, const uint8_t *ksenc, const uint8_t *ksmac, uint64_t *ssc_long);
+
+void mrtd_fileread_write_image_to_file(const uint8_t *file_content, const int file_size, const char *filename);
+
+void mrtd_fileread_decode_ef_com(const uint8_t *file_content, const int file_size, uint8_t *datagroups, int *numdatagroups);
+
+void mrtd_fileread_get_datagroup_name(const uint8_t dg, char *name);
+
+#endif /* INC_FILEREAD_H */
diff --git a/src/hardware.c b/src/hardware.c
new file mode 100644
index 0000000..06f6f1b
--- /dev/null
+++ b/src/hardware.c
@@ -0,0 +1,21 @@
+/*
+ *   hardware.c - sort of a hardware abstraction layer around libnfc
+ *
+ *   Copyright (C) 2014 Ruben Undheim <ruben.undheim@gmail.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
diff --git a/src/mrtd.h b/src/mrtd.h
new file mode 100644
index 0000000..24d080d
--- /dev/null
+++ b/src/mrtd.h
@@ -0,0 +1,30 @@
+/*
+ *   mrtd.h - Header file for libmrtd.so
+ *
+ *   Copyright (C) 2014 Ruben Undheim <ruben.undheim@gmail.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef INC_MRTD_H
+#define INC_MRTD_H
+
+#include "bac.h"
+#include "bachelper.h"
+#include "crypto.h"
+#include "fileread.h"
+
+#endif /* INC_MRTD_H */
+
diff --git a/src/mrtdreader.c b/src/mrtdreader.c
new file mode 100644
index 0000000..d19944f
--- /dev/null
+++ b/src/mrtdreader.c
@@ -0,0 +1,298 @@
+/*
+ *   mrtdreader.c - Main program 
+ *
+ *   Copyright (C) 2014 Ruben Undheim <ruben.undheim@gmail.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <time.h>
+#include <nfc/nfc.h>
+#include <signal.h>
+#include "mrtd.h"
+
+#define MAX_DEVICE_COUNT 5
+
+static nfc_context *context = NULL;
+static nfc_device *pnd = NULL;
+
+static char *pn = NULL;
+static char *dob = NULL;
+static char *eov = NULL;
+static char *extra_argument = NULL;
+
+static char done = 0;
+
+static void closedown(int sig)
+{
+	done = 1;
+	printf("Stopping...\n");
+}
+static void forcestop(int sig)
+{
+	done = 1;
+	printf("Stopping...\n");
+	if(pnd != NULL)
+		nfc_close(pnd);
+	if(context != NULL)
+		nfc_exit(context);
+	exit(-1);
+}
+
+void printhex(char *description, uint8_t *input, int length)
+{
+	int i;
+	printf("%s: ",description);
+	for(i=0;i<length;i++){
+		printf("%02x",input[i]);
+	}
+	printf("\n");
+}
+
+int parse_cmdline(int argc, char **argv)
+{
+	int s;
+	opterr = 0;
+	while((s = getopt(argc, argv, "p:b:e:")) != -1) {
+		switch (s) {
+			case 'p':
+				pn = malloc(strlen(optarg)+1);
+				memcpy(pn,optarg,strlen(optarg));
+				break;
+			case 'b':
+				dob = malloc(strlen(optarg)+1);
+				memcpy(dob,optarg,strlen(optarg));
+				break;
+			case 'e':
+				eov = malloc(strlen(optarg)+1);
+				memcpy(eov,optarg,strlen(optarg));
+				break;
+			case '?':
+				if(optopt == 'p')
+					fprintf(stderr, "Option -%c requires an argument.\n",optopt);
+				else if(optopt == 'b')
+					fprintf(stderr, "Option -%c requires an argument.\n",optopt);
+				else if(optopt == 'e')
+					fprintf(stderr, "Option -%c requires an argument.\n",optopt);
+				else if(isprint(optopt)) 
+					fprintf(stderr, "Unknown option '-%c'.\n",optopt);
+				return -1;
+			default:
+				abort();
+		}
+	}
+
+	if(argc == (optind + 1)){
+		extra_argument = argv[optind];
+	}
+	if((extra_argument == NULL) && ((pn == NULL) || (dob == NULL) || (eov == NULL))){
+		return -1;
+	}
+
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	int i,ret,res;
+	if(parse_cmdline(argc,argv) == -1){
+		fprintf(stderr,"Usage: %s [options] <MRZ>\n",argv[0]);
+		goto failed;
+	}
+	uint8_t *kmrz;
+	uint8_t buffer[25];
+	int inlength;
+	if(extra_argument != NULL){
+		inlength = strlen(extra_argument);
+		if(inlength == 24){
+			kmrz = extra_argument;
+		}
+		else if(inlength == 44){
+			mrtd_bac_get_kmrz_from_mrz(extra_argument, buffer);
+			kmrz = buffer;
+		}
+		else{
+			fprintf(stderr,"Did not recognize <MRZ>\n");
+			goto failed;
+		}
+	}
+	else {
+		mrtd_bac_get_kmrz(pn, dob, eov, buffer);
+		kmrz = buffer;
+	}
+	if(pn != NULL) {
+		free(pn);
+		pn = NULL;
+	}
+	if(dob != NULL){
+		free(dob);
+		dob = NULL;
+	}
+	if(eov != NULL){
+		free(eov);
+		eov = NULL;
+	}
+
+
+	signal(SIGINT, forcestop);
+	srand(time(NULL));
+
+	nfc_init(&context);
+	nfc_target ant;
+
+	if(context == NULL){
+		fprintf(stderr,"Unable to init libnfc (malloc)\n");
+		goto failed;
+	}
+	nfc_connstring connstrings[MAX_DEVICE_COUNT];
+	size_t szDeviceFound = nfc_list_devices(context,connstrings,MAX_DEVICE_COUNT);
+
+	if(szDeviceFound == 0){
+		fprintf(stderr,"No NFC device found.\n");
+		goto failed;
+	}
+
+	pnd = nfc_open(context, connstrings[0]);
+	if(pnd == NULL){
+		fprintf(stderr,"Unable to open NFC device: %s\n",connstrings[0]);
+		goto failed;
+	}
+	if(nfc_initiator_init(pnd) < 0){
+		nfc_perror(pnd,"nfc_initiator_init");
+		goto failed;
+	}
+
+	printf("NFC device: %s opened\n",nfc_device_get_name(pnd));
+
+	if (nfc_device_set_property_bool(pnd, NP_INFINITE_SELECT, false) < 0){
+		fprintf(stderr, "error setting property\n");
+		goto failed;
+	}
+
+	nfc_modulation nmA,nmB;
+	nmA.nmt = NMT_ISO14443A;
+	nmA.nbr = NBR_106;
+	nmB.nmt = NMT_ISO14443B;
+	nmB.nbr = NBR_106;
+
+	signal(SIGINT, closedown);
+	while(1){
+		ret = nfc_initiator_select_passive_target(pnd,nmA,NULL,0,&ant);
+		if(ret > 0 || done) break;
+		ret = nfc_initiator_select_passive_target(pnd,nmB,NULL,0,&ant);
+		if(ret > 0 || done) break;
+	}
+	if(done)
+		goto failed;
+	printf("Target found!\n");
+	signal(SIGINT, forcestop);
+
+	uint8_t txbuffer[300];
+	int txlen;
+	uint8_t rxbuffer[300];
+	int rxlen;
+
+	uint64_t ssc_long;
+	uint8_t ksenc[16];
+	uint8_t ksmac[16];
+
+	mrtd_bac_randomize_rndifd_kifd();
+	ret = mrtd_bac_keyhandshake(pnd,kmrz,ksenc,ksmac,&ssc_long);
+
+	if(ret == RET_CHALLENGE_FAILED){
+		fprintf(stderr,"======================\nChallenge failed...\n======================\n");
+		goto failed;
+	}
+	else if(ret < 0){
+		goto failed;
+	}
+	printf("======================\nChallenge successful!\n======================\n");
+
+	printf("\n");
+	uint8_t *filecontent = NULL;
+	filecontent = malloc(50000);
+	int filecontentlength;
+
+
+	printf("Getting EF.COM...");
+	fflush(stdout);
+	mrtd_fileread_read(pnd,"\x01\x1e",filecontent,&filecontentlength,ksenc,ksmac,&ssc_long);
+	printf(" done\n");
+
+	printhex("File content",filecontent,filecontentlength);
+	printf("File size: %d\n",filecontentlength);
+
+	uint8_t datagroups[20];
+	int ndatagroups;
+	mrtd_fileread_decode_ef_com(filecontent,filecontentlength,datagroups,&ndatagroups);
+
+	printf("\n");
+
+	printf("Getting EF.SOD...");
+	fflush(stdout);
+	mrtd_fileread_read(pnd,"\x01\x1d",filecontent,&filecontentlength,ksenc,ksmac,&ssc_long);
+	printf(" done\n");
+
+	printhex("File content",filecontent,filecontentlength);
+	printf("File size: %d\n",filecontentlength);
+
+	printf("\n");
+
+	printf("Getting EF.DG1...");
+	fflush(stdout);
+	mrtd_fileread_read(pnd,"\x01\x01",filecontent,&filecontentlength,ksenc,ksmac,&ssc_long);
+	printf(" done\n");
+
+	filecontent[filecontentlength] = 0;
+	printf("%s\n\n",filecontent);
+	printf("File size: %d\n",filecontentlength);
+
+	printf("\n");
+	printf("Getting EF.DG2 which contains the image...");
+	fflush(stdout);
+	mrtd_fileread_read(pnd,"\x01\x02",filecontent,&filecontentlength,ksenc,ksmac,&ssc_long);
+	printf(" done\n");
+
+
+	mrtd_fileread_write_image_to_file(filecontent, filecontentlength, "image");
+
+	nfc_close(pnd);
+	nfc_exit(context);
+	if(filecontent != NULL)
+		free(filecontent);
+	return 0;
+
+	failed:
+		if(pnd != NULL)
+			nfc_close(pnd);
+		if(context != NULL)
+			nfc_exit(context);
+		if(pn != NULL)
+			free(pn);
+		if(dob != NULL)
+			free(dob);
+		if(eov != NULL)
+			free(eov);
+		if(filecontent != NULL)
+			free(filecontent);
+		return -1;
+}
+
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
new file mode 100644
index 0000000..0bc7b30
--- /dev/null
+++ b/test/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_executable(test1 test1.c ../src/bachelper.c ../src/crypto-gcrypt.c)
+target_link_libraries(test1 gcrypt)
+
diff --git a/test/test1.c b/test/test1.c
new file mode 100644
index 0000000..d1518fd
--- /dev/null
+++ b/test/test1.c
@@ -0,0 +1,79 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include "../src/crypto.h"
+#include "../src/bachelper.h"
+
+void printhex(char *description, uint8_t *input, int length)
+{
+	int i;
+	printf("%s: ",description);
+	for(i=0;i<length;i++){
+		printf("%02x",input[i]);
+	}
+	printf("\n");
+}
+
+int main()
+{
+	int i;
+	char *mrp_number = "L898902C<";
+	char *mrp_numbercd = "3";
+	char *mrp_dob = "690806";
+	char *mrp_dobcd = "1";
+	char *mrp_expiry = "940623";
+	char *mrp_expirycd = "6";
+
+	char remotechallenge[8] = {0x46,0x08,0xf9,0x19,0x88,0x70,0x22,0x12};
+	char rnd_ifd[8] = {0x78,0x17,0x23,0x86,0x0c,0x06,0xc2,0x26};
+	char kifd[16] = {0x0b,0x79,0x52,0x40,0xcb,0x70,0x49,0xb0,0x1c,0x19,0xb3,0x3e,0x32,0x80,0x4f,0x0b};
+	char rx_data[40] = {0x46,0xB9,0x34,0x2A,0x41,0x39,0x6C,0xD7,0x38,0x6B,0xF5,0x80,0x31,0x04,0xD7,0xCE,0xDC,0x12,0x2B,0x91,0x32,0x13,0x9B,0xAF,0x2E,0xED,0xC9,0x4E,0xE1,0x78,0x53,0x4F,0x2f,0x2D,0x23,0x5D,0x07,0x4D,0x74,0x49};
+
+	char kmrz[25];
+	char kenc[16];
+	char kmac[16];
+	char cmd_data[40];
+	char rnd_icc[8];
+	char kicc[16];
+	char xored[16];
+	char ksenc[16];
+	char ksmac[16];
+	uint64_t ssc_long;
+
+	strncpy(kmrz,mrp_number,9);
+	strncpy(kmrz+9,mrp_numbercd,1);
+	strncpy(kmrz+10,mrp_dob,6);
+	strncpy(kmrz+16,mrp_dobcd,1);
+	strncpy(kmrz+17,mrp_expiry,6);
+	strncpy(kmrz+23,mrp_expirycd,1);
+
+	mrtd_bac_kmrz_to_kenc_kmac(kmrz,kenc,kmac);
+	printhex("kenc",kenc,16);
+	printhex("kmac",kmac,16);
+
+	mrtd_bac_cmd_data(rnd_ifd,kifd,remotechallenge,kenc,kmac,cmd_data);
+	printhex("cmd_data",cmd_data,40);
+
+	if(mrtd_bac_challenge_ok(rx_data,kenc,rnd_ifd,rnd_icc,kicc)){
+		printf("======================\nChallenge successful!\n======================\n");
+	}
+	else {
+		printf("======================\nChallenge failed...\n======================\n");
+	}
+	printhex("rnd_ifd",rnd_ifd,8);
+	printhex("kicc",kicc,16);
+
+	for(i=0;i<16;i++){
+		xored[i] = kifd[i] ^ kicc[i];
+	}
+	mrtd_bac_kenc_kmac(xored,ksenc,ksmac);
+	printhex("ksenc",ksenc,16);
+	printhex("ksmac",ksmac,16);
+
+	ssc_long = mrtd_bac_get_ssc(remotechallenge,rnd_ifd);
+	printf("ssc: %lx\n",ssc_long);
+
+	return 0;
+}
+