diff --git a/Borepin/Borepin.GTK/Borepin.GTK.csproj b/Borepin/Borepin.GTK/Borepin.GTK.csproj
index 56ab842..c2e3526 100644
--- a/Borepin/Borepin.GTK/Borepin.GTK.csproj
+++ b/Borepin/Borepin.GTK/Borepin.GTK.csproj
@@ -10,11 +10,12 @@
Properties
Borepin.GTK
Borepin.GTK
- v4.8
+ v4.7.2
512
true
+
true
@@ -76,18 +77,21 @@
-
+
..\..\packages\Xamarin.Forms.4.8.0.1364\lib\netstandard2.0\Xamarin.Forms.Core.dll
-
+
..\..\packages\Xamarin.Forms.4.8.0.1364\lib\netstandard2.0\Xamarin.Forms.Platform.dll
-
- ..\..\packages\Xamarin.Forms.Platform.GTK.4.8.0.1364\lib\net45\Xamarin.Forms.Platform.GTK.dll
-
-
+
..\..\packages\Xamarin.Forms.4.8.0.1364\lib\netstandard2.0\Xamarin.Forms.Xaml.dll
+
+ ..\..\packages\Xamarin.Forms.Platform.GTK.4.8.0.1364\lib\net45\webkit-sharp.dll
+
+
+ ..\..\packages\Xamarin.Forms.Platform.GTK.4.8.0.1364\lib\net45\Xamarin.Forms.Platform.GTK.dll
+
@@ -106,12 +110,5 @@
-
-
- Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".
-
-
-
-
\ No newline at end of file
diff --git a/Borepin/Borepin.GTK/app.config b/Borepin/Borepin.GTK/app.config
index 3c31098..5c893eb 100644
--- a/Borepin/Borepin.GTK/app.config
+++ b/Borepin/Borepin.GTK/app.config
@@ -8,4 +8,4 @@
-
\ No newline at end of file
+
diff --git a/Borepin/Borepin.GTK/packages.config b/Borepin/Borepin.GTK/packages.config
index 6088e1e..3ec538e 100644
--- a/Borepin/Borepin.GTK/packages.config
+++ b/Borepin/Borepin.GTK/packages.config
@@ -1,6 +1,6 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/Borepin/Borepin.GTK/webkit-sharp.dll.config b/Borepin/Borepin.GTK/webkit-sharp.dll.config
index 4384801..2c002a5 100644
--- a/Borepin/Borepin.GTK/webkit-sharp.dll.config
+++ b/Borepin/Borepin.GTK/webkit-sharp.dll.config
@@ -1,5 +1,5 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/Borepin/Borepin.UWP/Borepin.UWP.csproj b/Borepin/Borepin.UWP/Borepin.UWP.csproj
index cff9dad..d9a65ed 100644
--- a/Borepin/Borepin.UWP/Borepin.UWP.csproj
+++ b/Borepin/Borepin.UWP/Borepin.UWP.csproj
@@ -143,7 +143,7 @@
-
+
diff --git a/Borepin/Borepin.iOS/Borepin.iOS.csproj b/Borepin/Borepin.iOS/Borepin.iOS.csproj
index 83951c5..755d762 100644
--- a/Borepin/Borepin.iOS/Borepin.iOS.csproj
+++ b/Borepin/Borepin.iOS/Borepin.iOS.csproj
@@ -26,7 +26,7 @@
prompt
4
x86_64
- None
+ Full
true
iPhone Developer
@@ -83,78 +83,30 @@
false
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Borepin/Borepin.iOS/Entitlements.plist b/Borepin/Borepin.iOS/Entitlements.plist
index e9a3005..91c9872 100644
--- a/Borepin/Borepin.iOS/Entitlements.plist
+++ b/Borepin/Borepin.iOS/Entitlements.plist
@@ -1,7 +1,11 @@
-
+
+ com.apple.developer.nfc.readersession.formats
+
+ NDEF
+ TAG
+
-
diff --git a/Borepin/Borepin.iOS/Info.plist b/Borepin/Borepin.iOS/Info.plist
index 9fcb7e2..b464cc1 100644
--- a/Borepin/Borepin.iOS/Info.plist
+++ b/Borepin/Borepin.iOS/Info.plist
@@ -38,5 +38,7 @@
0.2
ITSAppUsesNonExemptEncryption
+ NFCReaderUsageDescription
+ FabAccess needs to be able to read your card for authentication with the server.
diff --git a/Borepin/Borepin.macOS/Borepin.macOS.csproj b/Borepin/Borepin.macOS/Borepin.macOS.csproj
index 21177a9..144ef00 100644
--- a/Borepin/Borepin.macOS/Borepin.macOS.csproj
+++ b/Borepin/Borepin.macOS/Borepin.macOS.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,6 +12,8 @@
v2.0
Xamarin.Mac
Resources
+
+
true
@@ -28,15 +30,19 @@
false
true
true
-
-
-
+
+
+
+
+
+
pdbonly
true
bin\Release
-
+
+
prompt
4
false
@@ -47,8 +53,10 @@
true
Entitlements.plist
SdkOnly
-
-
+
+
+
+
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..4a0e062
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ 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.
+
+ Borepin
+ Copyright (C) 2020 FabInfra / FabAccess
+
+ 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 .
+
+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:
+
+ Borepin Copyright (C) 2020 FabInfra / FabAccess
+ 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
+.
+
+ 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
+.
diff --git a/NFC/Crypto/CipherKey.cs b/NFC/Crypto/CipherKey.cs
index 519ab2a..3280381 100644
--- a/NFC/Crypto/CipherKey.cs
+++ b/NFC/Crypto/CipherKey.cs
@@ -39,6 +39,17 @@ namespace NFC.Crypto
}
}
+ ///
+ /// Creates Key from String
+ ///
+ /// Key
+ /// Cipher for Key
+ /// Version of Key
+ public CipherKey(string key, CipherType cipher, byte keyVersion) : this(HexConverter.ConvertFromHexString(key), cipher, keyVersion)
+ {
+
+ }
+
///
/// Generates Empty Key
///
@@ -122,7 +133,7 @@ namespace NFC.Crypto
switch (cipher)
{
case CipherType.TDES:
- return 8;
+ return 16;
case CipherType.TDES_2K:
return 16;
case CipherType.TDES_3K:
diff --git a/NFC/ISO7816-4/APDUCommand.cs b/NFC/ISO7816-4/APDUCommand.cs
index ef6a5e3..a0ffaa4 100644
--- a/NFC/ISO7816-4/APDUCommand.cs
+++ b/NFC/ISO7816-4/APDUCommand.cs
@@ -71,10 +71,10 @@ namespace NFC.ISO7816_4
return string.Format(pattern_case2, CLA, INS, P1, P2, Le);
case IsoCase.Case3Short:
case IsoCase.Case3Extended:
- return string.Format(pattern_case3, CLA, INS, P1, P2, Lc, BitConverter.ToString(Data).Replace("-", " "));
+ return string.Format(pattern_case3, CLA, INS, P1, P2, Lc, BitConverter.ToString(Data).Replace("-", "").ToLower());
case IsoCase.Case4Short:
case IsoCase.Case4Extended:
- return string.Format(pattern_case4, CLA, INS, P1, P2, Lc, BitConverter.ToString(Data).Replace("-", " "), Le);
+ return string.Format(pattern_case4, CLA, INS, P1, P2, Lc, BitConverter.ToString(Data).Replace("-", "").ToLower(), Le);
default:
throw new Exception("Unknown IsoCase");
}
diff --git a/NFC/ISO7816-4/APDUResponse.cs b/NFC/ISO7816-4/APDUResponse.cs
index a52d62b..d5ef0e3 100644
--- a/NFC/ISO7816-4/APDUResponse.cs
+++ b/NFC/ISO7816-4/APDUResponse.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using System.Linq;
using NFC.Mifare_DESFire;
@@ -129,6 +130,32 @@ namespace NFC.ISO7816_4
return array;
}
+
+ public override bool Equals(object obj)
+ {
+ return obj is APDUResponse response &&
+ EqualityComparer.Default.Equals(Body, response.Body) &&
+ SW1 == response.SW1 &&
+ SW2 == response.SW2;
+ }
+
+ public override int GetHashCode()
+ {
+ return HashCode.Combine(Body, SW1, SW2);
+ }
+
+ public override string ToString()
+ {
+ if(Body == null)
+ {
+ return string.Format("SW1: 0x{0:x} | SW2: 0x{1:x}", SW1, SW2);
+ }
+ else
+ {
+ return string.Format("SW1: 0x{0:x} | SW2: 0x{1:x} | Body: {2:x}", SW1, SW2, BitConverter.ToString(Body).Replace("-", "").ToLower());
+ }
+
+ }
#endregion
}
}
diff --git a/NFC/NFC.csproj b/NFC/NFC.csproj
index fdcc319..d823efa 100644
--- a/NFC/NFC.csproj
+++ b/NFC/NFC.csproj
@@ -5,9 +5,9 @@
-
+
-
+
diff --git a/NFC/NXP MIFARE DESFire/APDUStatusCodes.cs b/NFC/NXP MIFARE DESFire/APDUStatusCodes.cs
index a06327b..06fa336 100644
--- a/NFC/NXP MIFARE DESFire/APDUStatusCodes.cs
+++ b/NFC/NXP MIFARE DESFire/APDUStatusCodes.cs
@@ -1,6 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Text;
namespace NFC.Mifare_DESFire
{
diff --git a/NFC/NXP MIFARE DESFire/CMAC.cs b/NFC/NXP MIFARE DESFire/CMAC.cs
deleted file mode 100644
index 532aa23..0000000
--- a/NFC/NXP MIFARE DESFire/CMAC.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using NFC.Crypto;
-using System;
-
-namespace NFC.NXP_MIFARE_DESFire
-{
- public class CMAC
- {
- #region Contructors
- public CMAC(CipherType cipher)
- {
- switch(cipher)
- {
- case(CipherType.TDES):
- _Cipher = new TDES();
- break;
- case(CipherType.TDES_2K):
- _Cipher = new TDES_2K();
- break;
- case(CipherType.TDES_3K):
- _Cipher = new TDES_3K();
- break;
- case (CipherType.AES):
- _Cipher = new AES();
- break;
- default:
- throw new ArgumentException("Unkown Cipher Type.");
- }
- }
-
- public CMAC(ICipher cipher)
- {
- _Cipher = cipher ?? throw new ArgumentNullException();
- }
- #endregion
-
- #region Properties
- private ICipher _Cipher;
- #endregion
-
- #region Methods
- ///
- /// Generate Key with all Zeros, in KeySize
- ///
- public byte[] GenerateEmpytKey()
- {
- byte[] key = new byte[_Cipher.KeySize];
- for (int i = 0; i < _Cipher.KeySize; i++)
- {
- key[i] = 0;
- }
-
- return key;
- }
-
- ///
- /// Generate IV with all Zeros, in KeySize
- ///
- public byte[] GenerateEmpytIV()
- {
- byte[] key = new byte[_Cipher.BlockSize];
- for (int i = 0; i < _Cipher.BlockSize; i++)
- {
- key[i] = 0;
- }
-
- return key;
- }
-
- ///
- /// Encrypt Data
- ///
- public byte[] Encrypt(byte[] data)
- {
- throw new NotImplementedException();
- }
-
- ///
- /// Decrypt Data
- ///
- public byte[] Decrypt(byte[] data)
- {
- throw new NotImplementedException();
- }
-
- ///
- ///
- ///
- /// Two Keys
- public byte[][] GenerateSubKey()
- {
- throw new NotImplementedException();
- }
-
- ///
- ///
- ///
- ///
- ///
- public byte[] Digest(byte[] data)
- {
- throw new NotImplementedException();
- }
-
- #endregion
- }
-}
diff --git a/NFC/NXP MIFARE DESFire/CryptoOperations.cs b/NFC/NXP MIFARE DESFire/CryptoOperations.cs
deleted file mode 100644
index 0ae77af..0000000
--- a/NFC/NXP MIFARE DESFire/CryptoOperations.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace NFC.Mifare_DESFire
-{
- enum CryptoOperations : byte
- {
- TDES = 0x00,
- TKTDES = 0x40,
- AES = 0x80,
- }
-}
diff --git a/NFC/NXP MIFARE DESFire/MIFARE_DESFire.cs b/NFC/NXP MIFARE DESFire/MIFARE_DESFire.cs
index 149d04e..9dd39d7 100644
--- a/NFC/NXP MIFARE DESFire/MIFARE_DESFire.cs
+++ b/NFC/NXP MIFARE DESFire/MIFARE_DESFire.cs
@@ -1,5 +1,4 @@
-using log4net.Repository.Hierarchy;
-using NFC.Crypto;
+using NFC.Crypto;
using NFC.ISO7816_4;
using NFC.Mifare_DESFire.Enums;
using NFC.NXP_MIFARE_DESFire.Exceptions;
@@ -53,7 +52,7 @@ namespace NFC.Mifare_DESFire
/// Generate Byte Array filled with 0
///
/// Size of Array
- public byte[] GenerateEmptyKey(uint size)
+ public byte[] GenerateEmptyArray(uint size)
{
byte[] key = new byte[size];
for (int i = 0; i < size; i++)
@@ -65,44 +64,20 @@ namespace NFC.Mifare_DESFire
}
///
- /// Converts byte[] to string with HEX Code
- /// No 0x is created
+ /// Get Range of Array Elements
///
- /// Data
- public string ConvertToHexString(byte[] data)
+ /// Array
+ /// Offset in Byte
+ /// Lenght to read in Byte
+ /// new Array with Range of Array Elements
+ public byte[] GetSubArray(byte[] array, long offset, long length)
{
- return BitConverter.ToString(data).Replace("-", "").ToLower();
- }
-
- ///
- /// Converts string with HEX Code to byte[]
- /// No 0x is requiered
- ///
- /// Data
- public byte[] ConvertFromHexString(string data)
- {
- if (data.Length % 2 == 1)
- throw new Exception("Data Length is uneven.");
-
- byte[] arr = new byte[data.Length >> 1];
-
- for (int i = 0; i < data.Length >> 1; ++i)
+ byte[] subarray = new byte[length];
+ for (long i = offset; i < offset + length; i++)
{
- arr[i] = (byte)((GetHexVal(data[i << 1]) << 4) + (GetHexVal(data[(i << 1) + 1])));
+ subarray[i - offset] = array[i];
}
-
- return arr;
- }
-
- private int GetHexVal(char hex)
- {
- int val = (int)hex;
- //For uppercase A-F letters:
- //return val - (val < 58 ? 48 : 55);
- //For lowercase a-f letters:
- //return val - (val < 58 ? 48 : 87);
- //Or the two combined, but a bit slower:
- return val - (val < 58 ? 48 : (val < 97 ? 55 : 87));
+ return subarray;
}
///
@@ -188,6 +163,35 @@ namespace NFC.Mifare_DESFire
return lastblock;
}
+ ///
+ /// Expand Array to Block Size, fill with 0x00
+ ///
+ ///
+ public byte[] ExpandToBlockSize(byte[] data, uint bocksize)
+ {
+ if (data == null)
+ {
+ throw new ArgumentNullException("Data cannot be null.");
+ }
+
+ int diff = data.Length % (int)bocksize;
+ if (diff == 0)
+ {
+ return data;
+ }
+
+ byte[] expand = new byte[data.Length + bocksize - diff];
+
+ data.CopyTo(expand, 0);
+
+ for (int i = expand.Length - 1; i > data.Length - 1; i--)
+ {
+ expand[i] = 0x00;
+ }
+
+ return expand;
+ }
+
///
/// Rotates Array to the left
///
@@ -292,6 +296,7 @@ namespace NFC.Mifare_DESFire
return c;
}
+
///
/// Generates SessionKey for DES Authentification
///
@@ -346,74 +351,115 @@ namespace NFC.Mifare_DESFire
return sesssionkey;
}
+ #endregion
+ #region Configuration Generator
///
- /// Set KeyVersion in DES Key
- /// KeyVersion is stored in LSB of the first 8 Bytes of the DES Key
+ /// Genearte KeySetting1 for Application Settings or PICC Setting
///
- public byte[] SetKeyVersion(byte[] key, byte keyversion)
+ public byte GenerateKeySetting1(ChangeApplicationKey changeKey, ChangeMasterKeySettings changeMasterKeySettings, CreateDeleteFile createDeleteFile, FileDirectoryAccess fileDirectoryAccess, ChangeMasterKey changeMasterKey)
{
- byte[] pow2 = new byte[]
- {
- 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
- };
-
- byte[] new_key = new byte[key.Length];
- key.CopyTo(new_key, 0);
-
- for (int i = 0; i < 8; i++)
- {
- if ((keyversion & pow2[i]) > 0)
- {
- new_key[i] = (byte)(new_key[5] | 0x01);
- }
- else
- {
- new_key[i] = (byte)(new_key[5] & 0x7F);
- }
- }
-
- return new_key;
+ return (byte)(((byte)changeKey << 4) | (byte)changeMasterKeySettings | (byte)createDeleteFile | (byte)fileDirectoryAccess | (byte)changeMasterKey);
}
///
- /// Expand Array to Block Size, fill with 0x00
+ /// Genearte KeySetting1 for Application Settings or PICC Setting
///
- ///
- public byte[] ExpandToBlockSize(byte[] data, uint bocksize)
+ /// ID of Key for changing Application Keys
+ ///
+ public byte GenerateKeySetting1(byte changeKey, ChangeMasterKeySettings changeMasterKeySettings, CreateDeleteFile createDeleteFile, FileDirectoryAccess fileDirectoryAccess, ChangeMasterKey changeMasterKey)
{
- int diff = data.Length % (int)bocksize;
- if (diff == 0)
+ if (changeKey < 0x01 || changeKey >= 0x0E)
{
- return data;
+ throw new ArgumentOutOfRangeException();
+ }
+ return GenerateKeySetting1((ChangeApplicationKey)changeKey, changeMasterKeySettings, createDeleteFile, fileDirectoryAccess, changeMasterKey);
+ }
+
+ ///
+ /// Genearte KeySetting2 for Application Creation
+ ///
+ /// Number of keys that can be stored within the application (0x01-0x0D)
+ ///
+ public byte GenerateKeySetting2(CryptoOperationsType cryptoOperations, FileIdentifies fileIdentifies, byte numberOfKeys)
+ {
+ if (numberOfKeys < 0x01 || numberOfKeys >= 0x0D)
+ {
+ throw new ArgumentOutOfRangeException();
}
- byte[] expand = new byte[data.Length + bocksize - diff];
+ return (byte)((byte)cryptoOperations | (byte)fileIdentifies | numberOfKeys);
+ }
- data.CopyTo(expand, 0);
-
- for (int i = expand.Length - 1; i > data.Length - 1; i--)
+ ///
+ /// Generate FileAccess Rights for File Settings
+ /// Use enum AccesRights for Free or Never Option
+ ///
+ /// KeyID for Read Access
+ /// KeyID for Write Access
+ /// KeyID for Read and Write Access
+ /// KeyID for Configuration Access
+ public UInt16 GenerateFileAccessRights(byte read, byte write, byte read_write, byte configure)
+ {
+ if (read > 0x0F || write > 0x0F || read_write > 0x0F || configure > 0x0F)
{
- expand[i] = 0x00;
+ throw new ArgumentOutOfRangeException("One KeyID is not valid");
}
- return expand;
+ return (UInt16)((read << 12) | (write << 8) | (read_write << 4) | configure);
}
#endregion
#region DESFire Commands
///
- /// Authenticate to PICC, with ISO Authenticate
+ /// Select Application by ApplicationID (AID)
+ ///
+ /// 3 Byte AID
+ public void SelectApplication(UInt32 aid)
+ {
+ if(aid > 0xFFFFFF)
+ {
+ throw new ArgumentOutOfRangeException("AID is too large");
+ }
+
+ byte[] id_byte = BitConverter.GetBytes(aid);
+ _Log.InfoFormat("Select Application: {0}", HexConverter.ConvertToHexString(id_byte.ToArray()));
+
+ APDUCommand cmd_SelectApplication = new APDUCommand(IsoCase.Case4Short)
+ {
+ CLA = 0x90,
+ INS = (byte)APDUInstructions.SELECT_APPLICATION,
+ Data = new byte[]
+ {
+ id_byte[0],
+ id_byte[1],
+ id_byte[2]
+ }
+ };
+ _Log.Debug(cmd_SelectApplication.ToString());
+ HexConverter.ConvertToHexString(cmd_SelectApplication.ToArray());
+ APDUResponse response = _Card.Transmit(cmd_SelectApplication);
+ _Log.DebugFormat(response.ToString());
+
+ CheckAPDUResponse(response);
+ }
+
+ ///
+ /// Authenticate to PICC, with ISO Authenticate for DES Key
///
/// 0x01 - 0x0D
- ///
+ /// Array of 8/16 Bytes
/// !!! WARNING For Testing only !!!
- /// Retry after short Time
public void AuthenticateISO_DES(byte key_id, byte[] key, byte[] rndA = null)
{
- _Log.Debug("Start AuthenticateISO_DES");
+ if(key_id >= 0x0E)
+ {
+ throw new ArgumentOutOfRangeException("KeyID is invalid");
+ }
- // Sepearte InitialisationVector for Authentication
+ _Log.InfoFormat("Authenticate with DES Key No: 0x{0:x}", key_id);
+
+ // Sepearte Initialisation Vector for Authentication Process
byte[] iv = new byte[8];
APDUCommand cmd_challange_request = new APDUCommand(IsoCase.Case4Short)
@@ -425,38 +471,38 @@ namespace NFC.Mifare_DESFire
key_id
}
};
- _Log.DebugFormat("APDU_CMD(cmd_challange_request): {0}", ConvertToHexString(cmd_challange_request.ToArray()));
+ _Log.Debug(cmd_challange_request.ToString());
APDUResponse response = _Card.Transmit(cmd_challange_request);
- _Log.DebugFormat("APDU_RES(cmd_challange_request): {0}", ConvertToHexString(response.ToArray()));
+ _Log.Debug(response.ToString());
CheckAPDUResponse(response);
byte[] rndB_enc = response.Body;
- _Log.DebugFormat("rndB_enc: {0}", ConvertToHexString(rndB_enc));
+ _Log.DebugFormat("rndB_enc: {0}", HexConverter.ConvertToHexString(rndB_enc));
TDES des = new TDES();
- byte[] rndB = des.Decrypt(rndB_enc, key, GenerateEmptyKey(8));
- _Log.DebugFormat("rndB: {0}", ConvertToHexString(rndB));
+ byte[] rndB = des.Decrypt(rndB_enc, key, GenerateEmptyArray(8));
+ _Log.DebugFormat("rndB: {0}", HexConverter.ConvertToHexString(rndB));
rndB.CopyTo(iv, 0);
byte[] rndB_rl = RotateLeft(rndB);
- _Log.DebugFormat("rndB_enc: {0}", ConvertToHexString(rndB_rl));
+ _Log.DebugFormat("rndB_enc: {0}", HexConverter.ConvertToHexString(rndB_rl));
- if(rndA == null)
+ if (rndA == null)
{
Random rnd = new Random();
rndA = new byte[8];
rnd.NextBytes(rndA);
}
- _Log.DebugFormat("rndA: {0}", ConvertToHexString(rndA));
+ _Log.DebugFormat("rndA: {0}", HexConverter.ConvertToHexString(rndA));
byte[] rndAB = Concatenate(rndA, rndB_rl);
- _Log.DebugFormat("rndAB: {0}", ConvertToHexString(rndAB));
+ _Log.DebugFormat("rndAB: {0}", HexConverter.ConvertToHexString(rndAB));
byte[] rndAB_enc = des.Encrypt(rndAB, key, rndB_enc);
- _Log.DebugFormat("rndA_rndB_enc: {0}", ConvertToHexString(rndAB_enc));
+ _Log.DebugFormat("rndAB_enc: {0}", HexConverter.ConvertToHexString(rndAB_enc));
iv = ExtractLastBlock(rndAB_enc, 8);
APDUCommand cmd_challange_response = new APDUCommand(IsoCase.Case4Short)
@@ -465,68 +511,70 @@ namespace NFC.Mifare_DESFire
INS = 0xAF,
Data = rndAB_enc
};
- _Log.DebugFormat("APDU_CMD(cmd_challange_response): {0}", ConvertToHexString(cmd_challange_response.ToArray()));
+ _Log.Debug(cmd_challange_response.ToString());
response = _Card.Transmit(cmd_challange_response);
- _Log.DebugFormat("APDU_RES(cmd_challange_response): {0}", ConvertToHexString(cmd_challange_response.ToArray()));
+ _Log.Debug(response.ToString());
CheckAPDUResponse(response);
byte[] encryptedRndAFromCard = response.Body;
- _Log.DebugFormat("encryptedRndAFromCard: {0}", ConvertToHexString(encryptedRndAFromCard));
+ _Log.DebugFormat("encryptedRndAFromCard: {0}", HexConverter.ConvertToHexString(encryptedRndAFromCard));
byte[] rotatedRndAFromCard = des.Decrypt(encryptedRndAFromCard, key, iv);
- _Log.DebugFormat("rotatedRndAFromCard: {0}", ConvertToHexString(rotatedRndAFromCard));
+ _Log.DebugFormat("rotatedRndAFromCard: {0}", HexConverter.ConvertToHexString(rotatedRndAFromCard));
byte[] rndAFromCard = RotateRight(rotatedRndAFromCard);
- _Log.DebugFormat("rndAFromCard: {0}", ConvertToHexString(rndAFromCard));
+ _Log.DebugFormat("rndAFromCard: {0}", HexConverter.ConvertToHexString(rndAFromCard));
if (!rndA.SequenceEqual(rndAFromCard))
{
- throw new Exception("Authentication failed, PICC Challenge is not corret");
+ throw new Exception("Authentication failed, PICC Challenge is invalid.");
}
+ _Log.Info("Authenticated");
+
_SessionKey = GenerateSesionKey_DES(rndA, rndB);
- _Log.DebugFormat("_SessionKey: {0}", ConvertToHexString(_SessionKey));
+ _Log.DebugFormat("SessionKey: {0}", HexConverter.ConvertToHexString(_SessionKey));
- _IV = GenerateEmptyKey(8);
- _Log.DebugFormat("_IV: {0}", ConvertToHexString(_IV));
-
- _Log.Debug("End AuthenticateISO_DES");
+ _IV = GenerateEmptyArray(8);
+ _Log.DebugFormat("IV: {0}", HexConverter.ConvertToHexString(_IV));
}
///
/// Format PICC
+ /// Need Authentication for PICC / Application 0x000000
///
public void Format()
{
- _Log.Debug("Start Format");
+ _Log.Info("Format PICC");
APDUCommand cmd_format = new APDUCommand(IsoCase.Case2Short)
{
CLA = 0x90,
INS = 0xFC,
};
- _Log.DebugFormat("APDU_CMD(cmd_format): {0}", ConvertToHexString(cmd_format.ToArray()));
+ _Log.Debug(cmd_format.ToString());
APDUResponse response = _Card.Transmit(cmd_format);
- _Log.DebugFormat("APDU_RES(cmd_format): {0}", ConvertToHexString(response.ToArray()));
+ _Log.Debug(response.ToString());
CheckAPDUResponse(response);
-
- _Log.Debug("End Format");
}
///
- /// Create Application for ID
+ /// Create Application for ApplicationID
///
/// 3 Byte ID
public void CreateApplication(UInt32 aid, byte keysetting1, byte keysetting2)
{
- _Log.Debug("Start CreateApplication");
+ if (aid > 0xFFFFFF)
+ {
+ throw new ArgumentOutOfRangeException("AID is too large");
+ }
byte[] id_byte = BitConverter.GetBytes(aid);
- _Log.DebugFormat("AID: {0}", ConvertToHexString(id_byte.ToArray()));
+ _Log.InfoFormat("Create Application: {0}", HexConverter.ConvertToHexString(id_byte.ToArray()));
APDUCommand cmd_CreateApplication = new APDUCommand(IsoCase.Case4Short)
{
@@ -541,58 +589,28 @@ namespace NFC.Mifare_DESFire
keysetting2
}
};
- _Log.DebugFormat("APDU_CMD(cmd_CreateApplication): {0}", ConvertToHexString(cmd_CreateApplication.ToArray()));
+ _Log.Debug(cmd_CreateApplication.ToString());
APDUResponse response = _Card.Transmit(cmd_CreateApplication);
- _Log.DebugFormat("APDU_RES(cmd_CreateApplication): {0}", ConvertToHexString(response.ToArray()));
+ _Log.Debug(response.ToString());
CheckAPDUResponse(response);
-
- _Log.Debug("End CreateApplication");
- }
-
- ///
- /// Select Application by AID
- ///
- /// 3 Byte AID
- public void SelectApplication(UInt32 aid)
- {
- _Log.Debug("Start SelectApplication");
-
- byte[] id_byte = BitConverter.GetBytes(aid);
- _Log.DebugFormat("AID: {0}", ConvertToHexString(id_byte.ToArray()));
-
- APDUCommand cmd_SelectApplication = new APDUCommand(IsoCase.Case4Short)
- {
- CLA = 0x90,
- INS = (byte)APDUInstructions.SELECT_APPLICATION,
- Data = new byte[]
- {
- id_byte[0],
- id_byte[1],
- id_byte[2]
- }
- };
- _Log.DebugFormat("APDU_CMD(cmd_SelectApplication): {0}", ConvertToHexString(cmd_SelectApplication.ToArray()));
-
- APDUResponse response = _Card.Transmit(cmd_SelectApplication);
- _Log.DebugFormat("APDU_RES(cmd_SelectApplication): {0}", ConvertToHexString(response.ToArray()));
-
- CheckAPDUResponse(response);
-
- _Log.Debug("End SelectApplication");
}
///
/// Authenticate to PICC, with ISO Authenticate
///
/// 0x01 - 0x0D
- ///
+ /// Array of 16 Bytes
/// !!! WARNING For Testing only !!!
- /// Retry after short Time
public void AuthenticateISO_AES(byte key_id, byte[] key, byte[] rndA = null)
{
- _Log.Debug("Start AuthenticateISO_AES");
+ if (key_id >= 0x0E)
+ {
+ throw new ArgumentOutOfRangeException("KeyID is invalid");
+ }
+
+ _Log.InfoFormat("Authenticate with AES Key No: 0x{0:x}", key_id);
// Sepearte InitialisationVector for Authentication
byte[] iv = new byte[16];
@@ -606,24 +624,24 @@ namespace NFC.Mifare_DESFire
key_id
}
};
- _Log.DebugFormat("APDU_CMD(cmd_challange_request): {0}", ConvertToHexString(cmd_challange_request.ToArray()));
+ _Log.Debug(cmd_challange_request.ToString());
APDUResponse response = _Card.Transmit(cmd_challange_request);
- _Log.DebugFormat("APDU_RES(cmd_challange_request): {0}", ConvertToHexString(response.ToArray()));
+ _Log.Debug(response.ToString());
CheckAPDUResponse(response);
byte[] rndB_enc = response.Body;
- _Log.DebugFormat("rndB_enc: {0}", ConvertToHexString(rndB_enc));
+ _Log.DebugFormat("rndB_enc: {0}", HexConverter.ConvertToHexString(rndB_enc));
AES aes = new AES();
- byte[] rndB = aes.Decrypt(rndB_enc, key, GenerateEmptyKey(16));
- _Log.DebugFormat("rndB: {0}", ConvertToHexString(rndB));
+ byte[] rndB = aes.Decrypt(rndB_enc, key, GenerateEmptyArray(16));
+ _Log.DebugFormat("rndB: {0}", HexConverter.ConvertToHexString(rndB));
rndB.CopyTo(iv, 0);
byte[] rndB_rl = RotateLeft(rndB);
- _Log.DebugFormat("rndB_enc: {0}", ConvertToHexString(rndB_rl));
+ _Log.DebugFormat("rndB_enc: {0}", HexConverter.ConvertToHexString(rndB_rl));
if (rndA == null)
{
@@ -631,13 +649,13 @@ namespace NFC.Mifare_DESFire
rndA = new byte[16];
rnd.NextBytes(rndA);
}
- _Log.DebugFormat("rndA: {0}", ConvertToHexString(rndA));
+ _Log.DebugFormat("rndA: {0}", HexConverter.ConvertToHexString(rndA));
byte[] rndAB = Concatenate(rndA, rndB_rl);
- _Log.DebugFormat("rndAB: {0}", ConvertToHexString(rndAB));
+ _Log.DebugFormat("rndAB: {0}", HexConverter.ConvertToHexString(rndAB));
byte[] rndAB_enc = aes.Encrypt(rndAB, key, rndB_enc);
- _Log.DebugFormat("rndA_rndB_enc: {0}", ConvertToHexString(rndAB_enc));
+ _Log.DebugFormat("rndAB_enc: {0}", HexConverter.ConvertToHexString(rndAB_enc));
iv = ExtractLastBlock(rndAB_enc, 16);
APDUCommand cmd_challange_response = new APDUCommand(IsoCase.Case4Short)
@@ -646,76 +664,79 @@ namespace NFC.Mifare_DESFire
INS = 0xAF,
Data = rndAB_enc
};
- _Log.DebugFormat("APDU_CMD(cmd_challange_response): {0}", ConvertToHexString(cmd_challange_response.ToArray()));
+ _Log.Debug(cmd_challange_response.ToString());
response = _Card.Transmit(cmd_challange_response);
- _Log.DebugFormat("APDU_RES(cmd_challange_response): {0}", ConvertToHexString(cmd_challange_response.ToArray()));
+ _Log.Debug(response.ToString());
CheckAPDUResponse(response);
byte[] encryptedRndAFromCard = response.Body;
- _Log.DebugFormat("encryptedRndAFromCard: {0}", ConvertToHexString(encryptedRndAFromCard));
+ _Log.DebugFormat("encryptedRndAFromCard: {0}", HexConverter.ConvertToHexString(encryptedRndAFromCard));
byte[] rotatedRndAFromCard = aes.Decrypt(encryptedRndAFromCard, key, iv);
- _Log.DebugFormat("rotatedRndAFromCard: {0}", ConvertToHexString(rotatedRndAFromCard));
+ _Log.DebugFormat("rotatedRndAFromCard: {0}", HexConverter.ConvertToHexString(rotatedRndAFromCard));
byte[] rndAFromCard = RotateRight(rotatedRndAFromCard);
- _Log.DebugFormat("rndAFromCard: {0}", ConvertToHexString(rndAFromCard));
+ _Log.DebugFormat("rndAFromCard: {0}", HexConverter.ConvertToHexString(rndAFromCard));
if (!rndA.SequenceEqual(rndAFromCard))
{
- throw new Exception("Authentication failed, PICC Challenge is not corret");
+ throw new Exception("Authentication failed, PICC Challenge is invalid.");
}
_SessionKey = GenerateSesionKey_AES(rndA, rndB);
- _Log.DebugFormat("_SessionKey: {0}", ConvertToHexString(_SessionKey));
+ _Log.DebugFormat("SessionKey: {0}", HexConverter.ConvertToHexString(_SessionKey));
- _IV = GenerateEmptyKey(16);
- _Log.DebugFormat("_IV: {0}", ConvertToHexString(_IV));
-
- _Log.Debug("End AuthenticateISO_DES");
+ _IV = GenerateEmptyArray(16);
+ _Log.DebugFormat("IV: {0}", HexConverter.ConvertToHexString(_IV));
}
///
- /// Change Same AES key as Authenticated
+ /// Change AES key, the same as Authenticated
///
- ///
- ///
- ///
+ /// 0x01 - 0x0D
+ /// Array of 16 Bytes
+ /// Version of Key(min. 0x10)
public void ChangeKey_AES(byte key_id, byte[] new_key, byte key_version)
{
- _Log.Debug("Start ChangeKey_AES");
+ if (key_id >= 0x0E)
+ {
+ throw new ArgumentOutOfRangeException("KeyID is invalid");
+ }
+
+ _Log.InfoFormat("Change AES Key No: 0x{0:x}", key_id);
byte[] header = new byte[]
{
0xC4, key_id
};
- _Log.DebugFormat("header: {0}", ConvertToHexString(header));
+ _Log.DebugFormat("header: {0}", HexConverter.ConvertToHexString(header));
// AES Key Version is Append to Key
byte[] key_and_version = Concatenate(new_key, new byte[] { key_version });
byte[] command = Concatenate(header, key_and_version);
- _Log.DebugFormat("command: {0}", ConvertToHexString(command));
+ _Log.DebugFormat("command: {0}", HexConverter.ConvertToHexString(command));
CRC32 crc32 = new CRC32();
byte[] crc = crc32.Calculate(command);
- _Log.DebugFormat("crc: {0}", ConvertToHexString(crc));
+ _Log.DebugFormat("crc: {0}", HexConverter.ConvertToHexString(crc));
byte[] cryptogram = Concatenate(key_and_version, crc);
- _Log.DebugFormat("cryptogram: {0}", ConvertToHexString(cryptogram));
+ _Log.DebugFormat("cryptogram: {0}", HexConverter.ConvertToHexString(cryptogram));
byte[] cryptogram_block = ExpandToBlockSize(cryptogram, 16);
- _Log.DebugFormat("cryptogram_block: {0}", ConvertToHexString(cryptogram_block));
+ _Log.DebugFormat("cryptogram_block: {0}", HexConverter.ConvertToHexString(cryptogram_block));
AES aes = new AES();
byte[] cryptogram_enc = aes.Encrypt(cryptogram_block, _SessionKey, _IV);
- _Log.DebugFormat("cryptogram_enc: {0}", ConvertToHexString(cryptogram_enc));
+ _Log.DebugFormat("cryptogram_enc: {0}", HexConverter.ConvertToHexString(cryptogram_enc));
_IV = ExtractLastBlock(cryptogram_enc, 16);
- _Log.DebugFormat("_IV: {0}", ConvertToHexString(_IV));
+ _Log.DebugFormat("_IV: {0}", HexConverter.ConvertToHexString(_IV));
byte[] data = Concatenate(new byte[] { key_id }, cryptogram_enc);
- _Log.DebugFormat("data: {0}", ConvertToHexString(data));
+ _Log.DebugFormat("data: {0}", HexConverter.ConvertToHexString(data));
APDUCommand cmd_ChangeKey = new APDUCommand(IsoCase.Case4Short)
{
@@ -723,61 +744,64 @@ namespace NFC.Mifare_DESFire
INS = 0xC4,
Data = data
};
- _Log.DebugFormat("APDU_CMD(cmd_ChangeKey): {0}", ConvertToHexString(cmd_ChangeKey.ToArray()));
+ _Log.Debug(cmd_ChangeKey.ToString());
APDUResponse response = _Card.Transmit(cmd_ChangeKey);
- _Log.DebugFormat("APDU_RES(cmd_ChangeKey): {0}", ConvertToHexString(response.ToArray()));
+ _Log.Debug(response.ToString());
CheckAPDUResponse(response);
-
- _Log.Debug("End ChangeKey_AES");
}
///
- /// Change other AES key as Authenticated
+ /// Change AES key, other than Authenticated
///
- ///
- ///
- ///
+ /// 0x01 - 0x0D
+ /// Array of 16 Bytes
+ /// Version of Key(min. 0x10)
public void ChangeOtherKey_AES(byte key_id, byte[] new_key, byte[] old_key, byte key_version)
{
- _Log.Debug("Start ChangeOtherKey_AES");
+ if (key_id >= 0x0E)
+ {
+ throw new ArgumentOutOfRangeException("KeyID is invalid");
+ }
+
+ _Log.InfoFormat("Change AES Key No: 0x{0:x}", key_id);
byte[] header = new byte[]
{
0xC4, key_id
};
- _Log.DebugFormat("header: {0}", ConvertToHexString(header));
+ _Log.DebugFormat("header: {0}", HexConverter.ConvertToHexString(header));
byte[] key_xor = XOR(new_key, old_key);
// AES Key Version is Append to Key
byte[] key_and_version = Concatenate(key_xor, new byte[] { key_version });
byte[] command = Concatenate(header, key_and_version);
- _Log.DebugFormat("command: {0}", ConvertToHexString(command));
+ _Log.DebugFormat("command: {0}", HexConverter.ConvertToHexString(command));
CRC32 crc32 = new CRC32();
byte[] crc_cmd = crc32.Calculate(command);
- _Log.DebugFormat("crc_cmd: {0}", ConvertToHexString(crc_cmd));
+ _Log.DebugFormat("crc_cmd: {0}", HexConverter.ConvertToHexString(crc_cmd));
byte[] crc_key = crc32.Calculate(new_key);
- _Log.DebugFormat("crc_key: {0}", ConvertToHexString(crc_key));
+ _Log.DebugFormat("crc_key: {0}", HexConverter.ConvertToHexString(crc_key));
byte[] cryptogram = Concatenate(key_and_version, crc_cmd);
cryptogram = Concatenate(cryptogram, crc_key);
- _Log.DebugFormat("cryptogram: {0}", ConvertToHexString(cryptogram));
+ _Log.DebugFormat("cryptogram: {0}", HexConverter.ConvertToHexString(cryptogram));
byte[] cryptogram_block = ExpandToBlockSize(cryptogram, 16);
- _Log.DebugFormat("cryptogram_block: {0}", ConvertToHexString(cryptogram_block));
+ _Log.DebugFormat("cryptogram_block: {0}", HexConverter.ConvertToHexString(cryptogram_block));
AES aes = new AES();
byte[] cryptogram_enc = aes.Encrypt(cryptogram_block, _SessionKey, _IV);
- _Log.DebugFormat("cryptogram_enc: {0}", ConvertToHexString(cryptogram_enc));
+ _Log.DebugFormat("cryptogram_enc: {0}", HexConverter.ConvertToHexString(cryptogram_enc));
_IV = ExtractLastBlock(cryptogram_enc, 16);
- _Log.DebugFormat("_IV: {0}", ConvertToHexString(_IV));
+ _Log.DebugFormat("_IV: {0}", HexConverter.ConvertToHexString(_IV));
byte[] data = Concatenate(new byte[] { key_id }, cryptogram_enc);
- _Log.DebugFormat("data: {0}", ConvertToHexString(data));
+ _Log.DebugFormat("data: {0}", HexConverter.ConvertToHexString(data));
APDUCommand cmd_ChangeKey = new APDUCommand(IsoCase.Case4Short)
{
@@ -785,28 +809,28 @@ namespace NFC.Mifare_DESFire
INS = 0xC4,
Data = data
};
- _Log.DebugFormat("APDU_CMD(cmd_ChangeKey): {0}", ConvertToHexString(cmd_ChangeKey.ToArray()));
+ _Log.Debug(cmd_ChangeKey.ToString());
APDUResponse response = _Card.Transmit(cmd_ChangeKey);
- _Log.DebugFormat("APDU_RES(cmd_ChangeKey): {0}", ConvertToHexString(response.ToArray()));
+ _Log.Debug(response.ToString());
CheckAPDUResponse(response);
-
- _Log.Debug("End ChangeOtherKey_AES");
}
///
/// Create Standard Data File
///
- /// ID of File (0x01 - 0x10)
+ /// ID of File (0x00 - 0x20)
/// Type of File Communicaton
/// Access Rights for File
/// Size of File in Bytes
public void CreateFile_Standard(byte file_id, FileCommunication communication, UInt16 accessRights, UInt32 size)
{
- _Log.Debug("Start CreateFile_Standard");
-
- _Log.DebugFormat("FID: {0}", file_id);
+ if (file_id >= 0x20)
+ {
+ throw new ArgumentOutOfRangeException("FileID is to large");
+ }
+ _Log.DebugFormat("Create STD File: {0}", file_id);
byte[] accessRights_byte = BitConverter.GetBytes(accessRights);
byte[] size_byte_tolong = BitConverter.GetBytes(size);
@@ -830,114 +854,165 @@ namespace NFC.Mifare_DESFire
INS = (byte)APDUInstructions.CREATE_STDDATAFILE,
Data = Concatenate(data, accessRights_byte, size_byte)
};
- _Log.DebugFormat("APDU_CMD(cmd_CreateFile_Standard): {0}", ConvertToHexString(cmd_CreateFile_Standard.ToArray()));
+ _Log.Debug(cmd_CreateFile_Standard.ToString());
APDUResponse response = _Card.Transmit(cmd_CreateFile_Standard);
- _Log.DebugFormat("APDU_RES(cmd_CreateFile_Standard): {0}", ConvertToHexString(response.ToArray()));
+ _Log.DebugFormat(response.ToString());
CheckAPDUResponse(response);
-
- _Log.Debug("End CreateFile_Standard");
- }
-
- ///
- /// Read Data from File
- ///
- /// ID of File (0x01 - 0x10)
- /// Offset for File
- /// Lenght of Data
- public byte[] ReadData(byte file_id, UInt32 offset, UInt32 length)
- {
- _Log.Debug("Start ReadData");
-
- byte[] data = new byte[]
- {
- file_id
- };
-
- byte[] offset_byte_tolong = BitConverter.GetBytes(offset);
- // Use only 3 Bytes
- byte[] offset_byte = new byte[]
- {
- offset_byte_tolong[0],
- offset_byte_tolong[1],
- offset_byte_tolong[2],
- };
-
- byte[] length_byte_tolong = BitConverter.GetBytes(length);
- // Use only 3 Bytes
- byte[] length_byte = new byte[]
- {
- length_byte_tolong[0],
- length_byte_tolong[1],
- length_byte_tolong[2],
- };
-
- APDUCommand cmd_ReadData = new APDUCommand(IsoCase.Case4Short)
- {
- CLA = 0x90,
- INS = (byte)APDUInstructions.READ_DATA,
- Data = Concatenate(data, offset_byte, length_byte)
- };
- _Log.DebugFormat("APDU_CMD(cmd_ReadData): {0}", ConvertToHexString(cmd_ReadData.ToArray()));
-
- APDUResponse response = _Card.Transmit(cmd_ReadData);
- _Log.DebugFormat("APDU_RES(cmd_ReadData): {0}", ConvertToHexString(response.ToArray()));
-
- CheckAPDUResponse(response);
-
- _Log.Debug("End ReadData");
-
- return response.Body;
}
///
/// Write Data to File
///
- /// ID of File (0x01 - 0x10)
+ /// ID of File (0x00 - 0x20)
/// Offset for File
/// Data to write
public void WriteData(byte file_id, UInt32 offset, byte[] data)
{
- _Log.Debug("Start WriteData");
-
- byte[] file_id_array = new byte[]
+ if (file_id >= 0x20)
{
- file_id
- };
+ throw new ArgumentOutOfRangeException("FileID is to large");
+ }
+ _Log.DebugFormat("Write Data to File: {0}", file_id);
- byte[] offset_byte_tolong = BitConverter.GetBytes(offset);
- // Use only 3 Bytes
- byte[] offset_byte = new byte[]
+ int max_write_bytes_pre_transaction = 47;
+ byte[] write_buffer;
+
+ long bytes_writed = 0;
+ long length = data.Length;
+
+ while (bytes_writed != data.Length)
{
+ byte[] file_id_array = new byte[]
+ {
+ file_id
+ };
+
+ byte[] offset_byte_tolong = BitConverter.GetBytes(offset + bytes_writed);
+ // Use only 3 Bytes
+ byte[] offset_byte = new byte[]
+ {
offset_byte_tolong[0],
offset_byte_tolong[1],
offset_byte_tolong[2],
- };
+ };
- byte[] lenght_byte_tolong = BitConverter.GetBytes(data.Length);
- // Use only 3 Bytes
- byte[] lenght_byte = new byte[]
+ long bytes_towrite = 0;
+
+ if (length - bytes_writed < max_write_bytes_pre_transaction)
+ {
+ bytes_towrite = length - bytes_writed;
+ }
+ else
+ {
+ bytes_towrite = max_write_bytes_pre_transaction;
+ }
+
+ byte[] length_byte_tolong = BitConverter.GetBytes(bytes_towrite);
+
+ write_buffer = GetSubArray(data, bytes_writed, bytes_towrite);
+ bytes_writed += bytes_towrite;
+
+ // Use only 3 Bytes
+ byte[] length_byte = new byte[]
+ {
+ length_byte_tolong[0],
+ length_byte_tolong[1],
+ length_byte_tolong[2],
+ };
+
+ APDUCommand cmd_WriteData = new APDUCommand(IsoCase.Case4Short)
+ {
+ CLA = 0x90,
+ INS = (byte)APDUInstructions.WRITE_DATA,
+ Data = Concatenate(file_id_array, offset_byte, length_byte, write_buffer)
+ };
+ _Log.Debug(cmd_WriteData.ToString());
+
+ APDUResponse response = _Card.Transmit(cmd_WriteData);
+ _Log.Debug(response.ToString());
+
+ CheckAPDUResponse(response);
+ }
+ }
+
+ ///
+ /// Read Data from File
+ ///
+ /// ID of File (0x00 - 0x20)
+ /// Offset for File
+ /// Lenght of Data
+ public byte[] ReadData(byte file_id, UInt32 offset, UInt32 length)
+ {
+ if (file_id >= 0x20)
{
- lenght_byte_tolong[0],
- lenght_byte_tolong[1],
- lenght_byte_tolong[2],
- };
+ throw new ArgumentOutOfRangeException("FileID is to large");
+ }
+ _Log.DebugFormat("Read Data from File: {0}", file_id);
- APDUCommand cmd_WriteData = new APDUCommand(IsoCase.Case4Short)
+ int max_read_bytes_pre_transaction = 47;
+ long bytes_readed = 0;
+ byte[] readbuffer = new byte[47];
+
+ List read_data = new List();
+
+ while (bytes_readed != length)
{
- CLA = 0x90,
- INS = (byte)APDUInstructions.WRITE_DATA,
- Data = Concatenate(file_id_array, offset_byte, lenght_byte, data)
- };
- _Log.DebugFormat("APDU_CMD(cmd_WriteData): {0}", ConvertToHexString(cmd_WriteData.ToArray()));
+ byte[] data = new byte[]
+ {
+ file_id
+ };
- APDUResponse response = _Card.Transmit(cmd_WriteData);
- _Log.DebugFormat("APDU_RES(cmd_WriteData): {0}", ConvertToHexString(response.ToArray()));
+ byte[] offset_byte_tolong = BitConverter.GetBytes(offset + bytes_readed);
+ // Use only 3 Bytes
+ byte[] offset_byte = new byte[]
+ {
+ offset_byte_tolong[0],
+ offset_byte_tolong[1],
+ offset_byte_tolong[2],
+ };
- CheckAPDUResponse(response);
+ long bytes_toread = 0;
- _Log.Debug("End WriteData");
+ if (length - bytes_readed < max_read_bytes_pre_transaction)
+ {
+ bytes_toread = length - bytes_readed;
+ }
+ else
+ {
+ bytes_toread = max_read_bytes_pre_transaction;
+ }
+
+ byte[] length_byte_tolong = BitConverter.GetBytes(bytes_toread);
+ bytes_readed += bytes_toread;
+
+ // Use only 3 Bytes
+ byte[] length_byte = new byte[]
+ {
+ length_byte_tolong[0],
+ length_byte_tolong[1],
+ length_byte_tolong[2],
+ };
+
+ APDUCommand cmd_ReadData = new APDUCommand(IsoCase.Case4Short)
+ {
+ CLA = 0x90,
+ INS = (byte)APDUInstructions.READ_DATA,
+ Data = Concatenate(data, offset_byte, length_byte)
+ };
+ _Log.Debug(cmd_ReadData.ToString());
+
+ APDUResponse response = _Card.Transmit(cmd_ReadData);
+ _Log.Debug(response.ToString());
+
+ CheckAPDUResponse(response);
+
+ // Remove CMAC from Body
+ read_data.AddRange(GetSubArray(response.Body, 0, bytes_toread));
+ }
+
+ return read_data.ToArray();
}
///
@@ -1007,63 +1082,6 @@ namespace NFC.Mifare_DESFire
// CheckAPDUResponse(response);
//}
#endregion
-
- #region Configuration Generator
- ///
- /// Genearte KeySetting1 for Application Settings or PICC Setting
- ///
- public byte GenerateKeySetting1(ChangeApplicationKey changeKey, ChangeMasterKeySettings changeMasterKeySettings, CreateDeleteFile createDeleteFile, FileDirectoryAccess fileDirectoryAccess, ChangeMasterKey changeMasterKey)
- {
- return (byte)(((byte)changeKey << 4) | (byte)changeMasterKeySettings | (byte)createDeleteFile | (byte)fileDirectoryAccess | (byte)changeMasterKey);
- }
-
- ///
- /// Genearte KeySetting1 for Application Settings or PICC Setting
- ///
- /// ID of Key for changing Application Keys
- ///
- public byte GenerateKeySetting1(byte changeKey, ChangeMasterKeySettings changeMasterKeySettings, CreateDeleteFile createDeleteFile, FileDirectoryAccess fileDirectoryAccess, ChangeMasterKey changeMasterKey)
- {
- if (changeKey < 0x01 || changeKey >= 0x0E)
- {
- throw new ArgumentOutOfRangeException();
- }
- return GenerateKeySetting1(changeKey, changeMasterKeySettings, createDeleteFile, fileDirectoryAccess, changeMasterKey);
- }
-
- ///
- /// Genearte KeySetting2 for Application Creation
- ///
- /// Number of keys that can be stored within the application (0x01-0x0D)
- ///
- public byte GenerateKeySetting2(CryptoOperationsType cryptoOperations, FileIdentifies fileIdentifies, byte numberOfKeys)
- {
- if (numberOfKeys < 0x01 || numberOfKeys >= 0x0D)
- {
- throw new ArgumentOutOfRangeException();
- }
-
- return (byte)((byte)cryptoOperations | (byte)fileIdentifies | numberOfKeys);
- }
-
- ///
- /// Generate FileAccess Rights for File Settings
- /// Use enum AccesRights for Free or Never Option
- ///
- /// KeyID for Read Access
- /// KeyID for Write Access
- /// KeyID for Read and Write Access
- /// KeyID for Configuration Access
- public UInt16 GenerateFileAccessRights(byte read, byte write, byte read_write, byte configure)
- {
- if(read > 0x0F || write > 0x0F || read_write > 0x0F || configure > 0x0F)
- {
- throw new ArgumentOutOfRangeException("One KeyID is not valid");
- }
-
- return (UInt16)((read << 12) | (write << 8) | (read_write << 4) | configure);
- }
- #endregion
#endregion
}
}
diff --git a/NFC/Readers/PCSC/Hardware.cs b/NFC/Readers/PCSC/PCSC_Hardware.cs
similarity index 87%
rename from NFC/Readers/PCSC/Hardware.cs
rename to NFC/Readers/PCSC/PCSC_Hardware.cs
index efc2373..3f86805 100644
--- a/NFC/Readers/PCSC/Hardware.cs
+++ b/NFC/Readers/PCSC/PCSC_Hardware.cs
@@ -2,7 +2,7 @@
namespace NFC.Readers.PCSC
{
- public class Hardware : IHardware
+ public class PCSC_Hardware : IHardware
{
public string[] GetReaders()
{
@@ -27,7 +27,7 @@ namespace NFC.Readers.PCSC
public IReader OpenReader(string readerID)
{
- return new Reader(readerID);
+ return new PCSC_Reader(readerID);
}
}
}
diff --git a/NFC/Readers/PCSC/Reader.cs b/NFC/Readers/PCSC/PCSC_Reader.cs
similarity index 88%
rename from NFC/Readers/PCSC/Reader.cs
rename to NFC/Readers/PCSC/PCSC_Reader.cs
index dfb440d..c0a399c 100644
--- a/NFC/Readers/PCSC/Reader.cs
+++ b/NFC/Readers/PCSC/PCSC_Reader.cs
@@ -1,13 +1,11 @@
using PCSC;
using PCSC.Iso7816;
using System;
-using System.Collections.Generic;
-using System.Text;
namespace NFC.Readers.PCSC
{
- public class Reader : IReader, IDisposable
+ public class PCSC_Reader : IReader, IDisposable
{
private string _ReaderID;
private IContextFactory _ContextFactory;
@@ -15,7 +13,7 @@ namespace NFC.Readers.PCSC
private IsoReader _ISOReader;
private ICard _Card;
- public Reader(string readerID)
+ public PCSC_Reader(string readerID)
{
_ReaderID = readerID;
}
diff --git a/NFC_Test/Crypto/AES_Test.cs b/NFC_Test/Crypto/AES_Test.cs
index a4a2cf0..df41197 100644
--- a/NFC_Test/Crypto/AES_Test.cs
+++ b/NFC_Test/Crypto/AES_Test.cs
@@ -1,8 +1,8 @@
-using NFC.Crypto;
-using NFC.Mifare_DESFire;
+using NFC;
+using NFC.Crypto;
using NUnit.Framework;
-namespace NFC_Test.Crypto
+namespace NFC_Unit_Test.Crypto
{
[TestFixture]
public class AES_Test
@@ -10,16 +10,14 @@ namespace NFC_Test.Crypto
[Test]
public void Encrypt()
{
- MIFARE_DESFire desfire = new MIFARE_DESFire(null);
-
- byte[] data = desfire.ConvertFromHexString("8db1f942f2d7cc82f6fa1486a30f8c12104a3b07e8eb77a7ac00000000000000");
- byte[] key = desfire.ConvertFromHexString("e7aff3361c3e85347993c3219a87d24b");
- byte[] iv = desfire.ConvertFromHexString("00000000000000000000000000000000");
+ byte[] data = HexConverter.ConvertFromHexString("8db1f942f2d7cc82f6fa1486a30f8c12104a3b07e8eb77a7ac00000000000000");
+ byte[] key = HexConverter.ConvertFromHexString("e7aff3361c3e85347993c3219a87d24b");
+ byte[] iv = HexConverter.ConvertFromHexString("00000000000000000000000000000000");
AES aes = new AES();
byte[] data_enc = aes.Encrypt(data, key, iv);
- byte[] data_enc_expected = desfire.ConvertFromHexString("3c79d74a4969ba7123e5d8f6df24493112d221fd131a4617d0eda5d92ccc1b46");
+ byte[] data_enc_expected = HexConverter.ConvertFromHexString("3c79d74a4969ba7123e5d8f6df24493112d221fd131a4617d0eda5d92ccc1b46");
Assert.AreEqual(data_enc_expected, data_enc);
}
}
diff --git a/NFC_Test/Crypto/CRC16_Test.cs b/NFC_Test/Crypto/CRC16_Test.cs
index d174e05..3098f35 100644
--- a/NFC_Test/Crypto/CRC16_Test.cs
+++ b/NFC_Test/Crypto/CRC16_Test.cs
@@ -2,7 +2,7 @@
using NFC.Crypto;
using NUnit.Framework;
-namespace NFC_Test.Crypto
+namespace NFC_Unit_Test.Crypto
{
[TestFixture]
public class CRC16_Test
diff --git a/NFC_Test/Crypto/CRC32_Test.cs b/NFC_Test/Crypto/CRC32_Test.cs
index aa14248..f2ce5a8 100644
--- a/NFC_Test/Crypto/CRC32_Test.cs
+++ b/NFC_Test/Crypto/CRC32_Test.cs
@@ -2,7 +2,7 @@
using NFC.Crypto;
using NUnit.Framework;
-namespace NFC_Test.Crypto
+namespace NFC_Unit_Test.Crypto
{
[TestFixture]
public class CRC32_Test
diff --git a/NFC_Test/Crypto/CipherKey_Test.cs b/NFC_Test/Crypto/CipherKey_Test.cs
new file mode 100644
index 0000000..492d2d1
--- /dev/null
+++ b/NFC_Test/Crypto/CipherKey_Test.cs
@@ -0,0 +1,13 @@
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NFC_Unit_Test.Crypto
+{
+ [TestFixture]
+ public class CipherKey_Test
+ {
+
+ }
+}
diff --git a/NFC_Test/Crypto/TDES_Test.cs b/NFC_Test/Crypto/TDES_Test.cs
index 3789040..fbf8ba0 100644
--- a/NFC_Test/Crypto/TDES_Test.cs
+++ b/NFC_Test/Crypto/TDES_Test.cs
@@ -1,8 +1,8 @@
-using NFC.Crypto;
-using NFC.Mifare_DESFire;
+using NFC;
+using NFC.Crypto;
using NUnit.Framework;
-namespace NFC_Test.Crypto
+namespace NFC_Unit_Test.Crypto
{
[TestFixture]
public class TDES_Test
@@ -11,16 +11,14 @@ namespace NFC_Test.Crypto
[Ignore("Unknown Expected Data")]
public void Encrypt_TDES()
{
- MIFARE_DESFire desfire = new MIFARE_DESFire(null);
-
- byte[] data = desfire.ConvertFromHexString("");
- byte[] key = desfire.ConvertFromHexString("");
- byte[] iv = desfire.ConvertFromHexString("0000000000000000");
+ byte[] data = HexConverter.ConvertFromHexString("");
+ byte[] key = HexConverter.ConvertFromHexString("");
+ byte[] iv = HexConverter.ConvertFromHexString("0000000000000000");
TDES des = new TDES();
byte[] data_enc = des.Encrypt(data, key, iv);
- byte[] data_enc_expected = desfire.ConvertFromHexString("");
+ byte[] data_enc_expected = HexConverter.ConvertFromHexString("");
Assert.AreEqual(data_enc_expected, data_enc);
}
@@ -28,16 +26,14 @@ namespace NFC_Test.Crypto
[Ignore("Unknown Expected Data")]
public void Encrypt_TDES_2K()
{
- MIFARE_DESFire desfire = new MIFARE_DESFire(null);
-
- byte[] data = desfire.ConvertFromHexString("");
- byte[] key = desfire.ConvertFromHexString("");
- byte[] iv = desfire.ConvertFromHexString("0000000000000000");
+ byte[] data = HexConverter.ConvertFromHexString("");
+ byte[] key = HexConverter.ConvertFromHexString("");
+ byte[] iv = HexConverter.ConvertFromHexString("0000000000000000");
TDES_2K des = new TDES_2K();
byte[] data_enc = des.Encrypt(data, key, iv);
- byte[] data_enc_expected = desfire.ConvertFromHexString("");
+ byte[] data_enc_expected = HexConverter.ConvertFromHexString("");
Assert.AreEqual(data_enc_expected, data_enc);
}
@@ -45,16 +41,14 @@ namespace NFC_Test.Crypto
[Ignore("Unknown Expected Data")]
public void Encrypt_TDES_3K()
{
- MIFARE_DESFire desfire = new MIFARE_DESFire(null);
-
- byte[] data = desfire.ConvertFromHexString("");
- byte[] key = desfire.ConvertFromHexString("");
- byte[] iv = desfire.ConvertFromHexString("0000000000000000");
+ byte[] data = HexConverter.ConvertFromHexString("");
+ byte[] key = HexConverter.ConvertFromHexString("");
+ byte[] iv = HexConverter.ConvertFromHexString("0000000000000000");
TDES_3K des = new TDES_3K();
byte[] data_enc = des.Encrypt(data, key, iv);
- byte[] data_enc_expected = desfire.ConvertFromHexString("");
+ byte[] data_enc_expected = HexConverter.ConvertFromHexString("");
Assert.AreEqual(data_enc_expected, data_enc);
}
}
diff --git a/NFC_Test/HexConverter_Test.cs b/NFC_Test/HexConverter_Test.cs
new file mode 100644
index 0000000..f20669c
--- /dev/null
+++ b/NFC_Test/HexConverter_Test.cs
@@ -0,0 +1,34 @@
+using NFC;
+using NUnit.Framework;
+
+namespace NFC_Unit_Test
+{
+ public class HexConverter_Test
+ {
+ [Test]
+ public void ConvertFromHexString()
+ {
+ string s = "0180ff0a";
+
+ byte[] expected_s =
+ {
+ 0x01, 0x80, 0xFF, 0x0A
+ };
+
+ Assert.AreEqual(expected_s, HexConverter.ConvertFromHexString(s));
+ }
+
+ [Test]
+ public void ConvertToHexString()
+ {
+ byte[] s =
+ {
+ 0x01, 0x80, 0xFF, 0x0A
+ };
+
+ string expected_s = "0180ff0a";
+
+ Assert.AreEqual(expected_s, HexConverter.ConvertToHexString(s));
+ }
+ }
+}
diff --git a/NFC_Test/ISO7816-4/APDUCommand_Test.cs b/NFC_Test/ISO7816-4/APDUCommand_Test.cs
index 28c68e1..1688aea 100644
--- a/NFC_Test/ISO7816-4/APDUCommand_Test.cs
+++ b/NFC_Test/ISO7816-4/APDUCommand_Test.cs
@@ -3,7 +3,7 @@ using NFC.ISO7816_4;
using NUnit.Framework;
using PCSC.Iso7816;
-namespace NFC_Test.ISO7816_4
+namespace NFC_Unit_Test.ISO7816_4
{
[TestFixture]
public class APDUCommand_Test
diff --git a/NFC_Test/NXP MIFARE DESFire/MIFARE_DESFire_Test.cs b/NFC_Test/NXP MIFARE DESFire/MIFARE_DESFire_Test.cs
index 0a1b6d5..f39d986 100644
--- a/NFC_Test/NXP MIFARE DESFire/MIFARE_DESFire_Test.cs
+++ b/NFC_Test/NXP MIFARE DESFire/MIFARE_DESFire_Test.cs
@@ -1,35 +1,55 @@
using NFC;
+using NFC.Mifare_DESFire.Enums;
using NFC.ISO7816_4;
using NFC.Mifare_DESFire;
using NFC.NXP_MIFARE_DESFire.Exceptions;
using NSubstitute;
using NUnit.Framework;
using System;
+using System.Text;
-namespace NFC_Test.NXP_MIFARE_DESFire
+namespace NFC_Unit_Test.NXP_MIFARE_DESFire
{
[TestFixture]
public class MIFARE_DESFire_Test
{
#region Helper Methods
[Test]
- public void GenerateDefaultKey()
+ public void GenerateEmptyArray()
{
uint i = 16;
MIFARE_DESFire desfire = new MIFARE_DESFire(null);
- byte[] data = desfire.GenerateEmptyKey(i);
+ byte[] data = desfire.GenerateEmptyArray(i);
- for(int e = 0; e < i; e++)
+ for (int e = 0; e < i; e++)
{
- if(data[e] != 0x00)
+ if (data[e] != 0x00)
{
Assert.Fail("Data is not 0x00");
}
}
}
+ [Test]
+ public void GetSubArray()
+ {
+ byte[] array = new byte[]
+ {
+ 0x01, 0x02, 0x03, 0x04, 0x05
+ };
+
+ byte[] expected_subarray = new byte[]
+ {
+ 0x02, 0x03, 0x04
+ };
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(null);
+
+ Assert.AreEqual(expected_subarray, desfire.GetSubArray(array, 1, 3));
+ }
+
[Test]
public void CheckAPDUResponse__NULL()
{
@@ -175,7 +195,6 @@ namespace NFC_Test.NXP_MIFARE_DESFire
});
}
-
[Test]
public void CheckAPDUResponse__PARAMETER_ERROR()
{
@@ -194,7 +213,6 @@ namespace NFC_Test.NXP_MIFARE_DESFire
});
}
-
[Test]
public void CheckAPDUResponse__AUTHENTICATION_DELAY()
{
@@ -370,6 +388,40 @@ namespace NFC_Test.NXP_MIFARE_DESFire
});
}
+ [Test]
+ public void ExpandToBlockSize()
+ {
+ byte[] data = new byte[]
+ {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
+ };
+
+ byte[] expected_lastblock = new byte[]
+ {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00
+ };
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(null);
+
+ byte[] lastblock = desfire.ExpandToBlockSize(data, 8);
+
+ Assert.AreEqual(expected_lastblock, lastblock);
+ }
+
+ [Test]
+ public void ExpandToBlockSize_Null()
+ {
+ byte[] data = null;
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(null);
+
+ Assert.Throws(
+ delegate
+ {
+ byte[] lastblock = desfire.ExpandToBlockSize(data, 8);
+ });
+ }
+
[Test]
public void RotateLeft()
{
@@ -538,153 +590,92 @@ namespace NFC_Test.NXP_MIFARE_DESFire
});
}
+ [Test]
+ public void GenerateSessionKey_DES()
+ {
+ MIFARE_DESFire desfire = new MIFARE_DESFire(null);
+
+ byte[] rndA = HexConverter.ConvertFromHexString("a541a9dc9138df07");
+ Console.WriteLine(HexConverter.ConvertToHexString(rndA));
+ byte[] rndB = HexConverter.ConvertFromHexString("cbe55aa893b2da25");
+ Console.WriteLine(HexConverter.ConvertToHexString(rndB));
+
+ byte[] expected_sessionkey = HexConverter.ConvertFromHexString("a541a9dccbe55aa8a541a9dccbe55aa8");
+ Console.WriteLine(HexConverter.ConvertToHexString(expected_sessionkey));
+
+ byte[] sessionkey = desfire.GenerateSesionKey_DES(rndA, rndB);
+ Console.WriteLine(HexConverter.ConvertToHexString(sessionkey));
+ Assert.AreEqual(expected_sessionkey, sessionkey);
+ }
+
[Test]
public void GenerateSessionKey_AES()
{
MIFARE_DESFire desfire = new MIFARE_DESFire(null);
- byte[] rndA = desfire.ConvertFromHexString("bc14dfde20074617e45a8822f06fdd91");
- Console.WriteLine(desfire.ConvertToHexString(rndA));
- byte[] rndB = desfire.ConvertFromHexString("482ddc54426e6dee560413b8d95471f5");
- Console.WriteLine(desfire.ConvertToHexString(rndB));
+ byte[] rndA = HexConverter.ConvertFromHexString("bc14dfde20074617e45a8822f06fdd91");
+ Console.WriteLine(HexConverter.ConvertToHexString(rndA));
+ byte[] rndB = HexConverter.ConvertFromHexString("482ddc54426e6dee560413b8d95471f5");
+ Console.WriteLine(HexConverter.ConvertToHexString(rndB));
- byte[] expected_sessionkey = desfire.ConvertFromHexString("bc14dfde482ddc54f06fdd91d95471f5");
- Console.WriteLine(desfire.ConvertToHexString(expected_sessionkey));
+ byte[] expected_sessionkey = HexConverter.ConvertFromHexString("bc14dfde482ddc54f06fdd91d95471f5");
+ Console.WriteLine(HexConverter.ConvertToHexString(expected_sessionkey));
byte[] sessionkey = desfire.GenerateSesionKey_AES(rndA, rndB);
- Console.WriteLine(desfire.ConvertToHexString(sessionkey));
+ Console.WriteLine(HexConverter.ConvertToHexString(sessionkey));
Assert.AreEqual(expected_sessionkey, sessionkey);
}
#endregion
- #region DESFire Commands
- [Test]
- public void AuthenticateISO_DES()
- {
- ICard card = Substitute.For();
-
- MIFARE_DESFire desfire = new MIFARE_DESFire(card);
-
- APDUResponse response_challenge_request = new APDUResponse()
- {
- SW1 = 0x91,
- SW2 = 0xAF,
- Body = HexConverter.ConvertFromHexString("5D994CE085F24089")
- };
-
- APDUResponse response_challenge_response = new APDUResponse()
- {
- SW1 = 0x91,
- SW2 = 0x00,
- Body = HexConverter.ConvertFromHexString("913C6DED84221C41")
- };
-
- byte[] rndA = HexConverter.ConvertFromHexString("849B36C5F8BF4A09");
- byte[] key = HexConverter.ConvertFromHexString("00000000000000000000000000000000");
-
- card.Transmit(Arg.Is(x => x.INS == 0x1A)).Returns(response_challenge_request);
- card.Transmit(Arg.Is(x => x.INS == 0xAF)).Returns(response_challenge_response);
-
- desfire.AuthenticateISO_DES(0x00, key, rndA);
-
- byte[] expected_sessionkey = HexConverter.ConvertFromHexString("849B36C54FD1B759849B36C54FD1B759");
- byte[] expected_iv = desfire.GenerateEmptyKey(8);
-
- Assert.AreEqual(expected_sessionkey, desfire._SessionKey);
- Assert.AreEqual(expected_iv, desfire._IV);
- }
-
- [Test]
- public void AuthenticateISO_AES()
- {
- ICard card = Substitute.For();
-
- MIFARE_DESFire desfire = new MIFARE_DESFire(card);
-
- APDUResponse response_challenge_request = new APDUResponse()
- {
- SW1 = 0x91,
- SW2 = 0xAF,
- Body = HexConverter.ConvertFromHexString("43a28e28c653df83cd85039714bccb51")
- };
-
- APDUResponse response_challenge_response = new APDUResponse()
- {
- SW1 = 0x91,
- SW2 = 0x00,
- Body = HexConverter.ConvertFromHexString("d8f70a0f9a43f522f775a56f5688592f")
- };
-
- byte[] rndA = HexConverter.ConvertFromHexString("8a8b3c15e576ae3a21c2b18e6aead1f1");
- byte[] key = HexConverter.ConvertFromHexString("00000000000000000000000000000000");
-
- card.Transmit(Arg.Is(x => x.INS == 0xAA)).Returns(response_challenge_request);
- card.Transmit(Arg.Is(x => x.INS == 0xAF)).Returns(response_challenge_response);
-
- desfire.AuthenticateISO_AES(0x00, key, rndA);
-
- byte[] expected_sessionkey = HexConverter.ConvertFromHexString("8a8b3c15c71d0cf46aead1f148f27703");
- byte[] expected_iv = desfire.GenerateEmptyKey(16);
-
- Assert.AreEqual(expected_sessionkey, desfire._SessionKey);
- Assert.AreEqual(expected_iv, desfire._IV);
- }
-
- [Test]
- public void ChangeKey_AES()
- {
- ICard card = Substitute.For();
-
- MIFARE_DESFire desfire = new MIFARE_DESFire(card);
-
- APDUResponse response = new APDUResponse()
- {
- SW1 = 0x91,
- SW2 = 0x00
- };
-
- byte[] new_key = HexConverter.ConvertFromHexString("45eeb8338ae8f49a032e85bb11143530");
-
- byte[] sessionkey = HexConverter.ConvertFromHexString("2f96515262e1beb0129de2df3e97feb3");
- byte[] iv = HexConverter.ConvertFromHexString("00000000000000000000000000000000");
-
- desfire._SessionKey = sessionkey;
- desfire._IV = iv;
-
- card.Transmit(null).ReturnsForAnyArgs(response);
-
- desfire.ChangeKey_AES(0x00, new_key, 0x10);
- }
-
- [Test]
- public void ChangeOtherKey_AES()
- {
- ICard card = Substitute.For();
-
- MIFARE_DESFire desfire = new MIFARE_DESFire(card);
-
- APDUResponse response = new APDUResponse()
- {
- SW1 = 0x91,
- SW2 = 0x00
- };
-
- byte[] new_key = HexConverter.ConvertFromHexString("8db1f942f2d7cc82f6fa1486a30f8c12");
- byte[] old_key = HexConverter.ConvertFromHexString("00000000000000000000000000000000");
-
- byte[] sessionkey = HexConverter.ConvertFromHexString("e7aff3361c3e85347993c3219a87d24b");
- byte[] iv = HexConverter.ConvertFromHexString("00000000000000000000000000000000");
-
- desfire._SessionKey = sessionkey;
- desfire._IV = iv;
-
- card.Transmit(null).ReturnsForAnyArgs(response);
-
- desfire.ChangeOtherKey_AES(0x01, new_key, old_key, 0x10);
- }
- #endregion
-
#region Configuration Generator
+ [Test]
+ public void GenerateKeySetting1()
+ {
+ MIFARE_DESFire desfire = new MIFARE_DESFire(null);
+
+ Assert.AreEqual(0x0B, desfire.GenerateKeySetting1(ChangeApplicationKey.MASTERKEY, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE));
+ }
+
+ [Test]
+ public void GenerateKeySetting1_ChangeKey()
+ {
+ MIFARE_DESFire desfire = new MIFARE_DESFire(null);
+ Assert.AreEqual(0x1B, desfire.GenerateKeySetting1(0x01, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE));
+ }
+
+ [Test]
+ public void GenerateKeySetting1_Wrong_KeyID()
+ {
+ MIFARE_DESFire desfire = new MIFARE_DESFire(null);
+
+ Assert.Throws(
+ delegate
+ {
+ desfire.GenerateKeySetting1(0x10, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE);
+ });
+ }
+
+ [Test]
+ public void GenerateKeySetting2()
+ {
+ MIFARE_DESFire desfire = new MIFARE_DESFire(null);
+
+ Assert.AreEqual(0x82, desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 0x02));
+ }
+
+ [Test]
+ public void GenerateKeySetting2_Wrong_KeyNumbers()
+ {
+ MIFARE_DESFire desfire = new MIFARE_DESFire(null);
+
+ Assert.Throws(
+ delegate
+ {
+ desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 0x10);
+ });
+ }
+
+
[Test]
public void GenerateFileAccessRights()
{
@@ -705,5 +696,440 @@ namespace NFC_Test.NXP_MIFARE_DESFire
});
}
#endregion
+
+ #region DESFire Commands
+ [Test]
+ public void SelectApplication()
+ {
+ ICard card = Substitute.For();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ APDUResponse response = new APDUResponse()
+ {
+ SW1 = 0x91,
+ SW2 = 0x00
+ };
+
+ card.Transmit(Arg.Is(x => HexConverter.ConvertToHexString(x.ToArray()) == "905a00000333221100")).Returns(response);
+
+ desfire.SelectApplication(0x112233);
+ }
+
+ [Test]
+ public void SelectApplication_InvalidAID()
+ {
+ ICard card = Substitute.For();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(null);
+
+ Assert.Throws(
+ delegate
+ {
+ desfire.SelectApplication(0xFF000000);
+ });
+ }
+
+ [Test]
+ public void AuthenticateISO_DES()
+ {
+ ICard card = Substitute.For();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ APDUResponse response_challenge_request = new APDUResponse()
+ {
+ SW1 = 0x91,
+ SW2 = 0xAF,
+ Body = HexConverter.ConvertFromHexString("2bf9a938ecca02e2")
+ };
+
+ APDUResponse response_challenge_response = new APDUResponse()
+ {
+ SW1 = 0x91,
+ SW2 = 0x00,
+ Body = HexConverter.ConvertFromHexString("07d825607a552e2e")
+ };
+
+ byte[] rndA = HexConverter.ConvertFromHexString("5f7d1dd12d979173");
+ byte[] key = HexConverter.ConvertFromHexString("00000000000000000000000000000000");
+
+ card.Transmit(Arg.Is(x => HexConverter.ConvertToHexString(x.ToArray()) == "901a0000010000")).Returns(response_challenge_request);
+ card.Transmit(Arg.Is(x => HexConverter.ConvertToHexString(x.ToArray()) == "90af000010f8cdb2eaa42a3167dfcb53852ce267fd00")).Returns(response_challenge_response);
+
+ desfire.AuthenticateISO_DES(0x00, key, rndA);
+
+ byte[] expected_sessionkey = HexConverter.ConvertFromHexString("5f7d1dd1f449db5c5f7d1dd1f449db5c");
+ byte[] expected_iv = HexConverter.ConvertFromHexString("0000000000000000");
+
+ Assert.AreEqual(expected_sessionkey, desfire._SessionKey);
+ Assert.AreEqual(expected_iv, desfire._IV);
+ }
+
+ [Test]
+ public void AuthenticateISO_DES_InvalidKeyNo()
+ {
+ MIFARE_DESFire desfire = new MIFARE_DESFire(null);
+
+ Assert.Throws(
+ delegate
+ {
+ desfire.AuthenticateISO_DES(0x0F, null);
+ });
+ }
+
+ [Test]
+ public void Format()
+ {
+ ICard card = Substitute.For();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ APDUResponse response = new APDUResponse()
+ {
+ SW1 = 0x91,
+ SW2 = 0x00
+ };
+
+ card.Transmit(Arg.Is(x => HexConverter.ConvertToHexString(x.ToArray()) == "90fc000000")).Returns(response);
+
+ desfire.Format();
+ }
+
+ [Test]
+ public void CreateApplication()
+ {
+ ICard card = Substitute.For();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ APDUResponse response = new APDUResponse()
+ {
+ SW1 = 0x91,
+ SW2 = 0x00
+ };
+
+ card.Transmit(Arg.Is(x => HexConverter.ConvertToHexString(x.ToArray()) == "90ca000005eeffaa0b8200")).Returns(response);
+
+ desfire.CreateApplication(0xAAFFEE, 0x0b, 0x82);
+ }
+
+ [Test]
+ public void CreateApplication_InvalidAID()
+ {
+ ICard card = Substitute.For();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(null);
+
+ Assert.Throws(
+ delegate
+ {
+ desfire.CreateApplication(0xFF000000, 0x00, 0x00);
+ });
+ }
+
+ [Test]
+ public void AuthenticateISO_AES()
+ {
+ ICard card = Substitute.For();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ APDUResponse response_challenge_request = new APDUResponse()
+ {
+ SW1 = 0x91,
+ SW2 = 0xAF,
+ Body = HexConverter.ConvertFromHexString("a33856932308775cf464610c2b17a558")
+ };
+
+ APDUResponse response_challenge_response = new APDUResponse()
+ {
+ SW1 = 0x91,
+ SW2 = 0x00,
+ Body = HexConverter.ConvertFromHexString("8fdc476f6bac44fe9150e285abd68d48")
+ };
+
+ byte[] rndA = HexConverter.ConvertFromHexString("2176770e7a6eb4bef00d5e4b201d1e57");
+ byte[] key = HexConverter.ConvertFromHexString("00000000000000000000000000000000");
+
+ card.Transmit(Arg.Is(x => HexConverter.ConvertToHexString(x.ToArray()) == "90aa0000010000")).Returns(response_challenge_request);
+ card.Transmit(Arg.Is(x => HexConverter.ConvertToHexString(x.ToArray()) == "90af000020cbe9726faf54bc76b2055d0b9700e7dc97ecad5627f1d1702a16e8408d2a0ada00")).Returns(response_challenge_response);
+
+ desfire.AuthenticateISO_AES(0x00, key, rndA);
+
+ byte[] expected_sessionkey = HexConverter.ConvertFromHexString("2176770e11c512ca201d1e57fde6e15a");
+ byte[] expected_iv = HexConverter.ConvertFromHexString("00000000000000000000000000000000");
+
+ Assert.AreEqual(expected_sessionkey, desfire._SessionKey);
+ Assert.AreEqual(expected_iv, desfire._IV);
+ }
+
+ [Test]
+ public void AuthenticateISO_AES_InvalidKeyNo()
+ {
+ MIFARE_DESFire desfire = new MIFARE_DESFire(null);
+
+ Assert.Throws(
+ delegate
+ {
+ desfire.AuthenticateISO_AES(0x0F, null);
+ });
+ }
+
+ [Test]
+ public void ChangeKey_AES()
+ {
+ ICard card = Substitute.For();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ APDUResponse response = new APDUResponse()
+ {
+ SW1 = 0x91,
+ SW2 = 0x00
+ };
+
+ card.Transmit(Arg.Is(x => HexConverter.ConvertToHexString(x.ToArray()) == "90c400002100c2b54a718d0251845653199909bb32e8e38bd6719e8dc21799c29c922a0984fc00")).Returns(response);
+
+ byte[] new_key = HexConverter.ConvertFromHexString("25432a462d4a614e645267556b587032");
+
+ byte[] sessionkey = HexConverter.ConvertFromHexString("a8514dd0350f3dfbc86e80744bcc9b57");
+ byte[] iv = HexConverter.ConvertFromHexString("00000000000000000000000000000000");
+
+ desfire._SessionKey = sessionkey;
+ desfire._IV = iv;
+
+ desfire.ChangeKey_AES(0x00, new_key, 0x10);
+ }
+
+ [Test]
+ public void ChangeKey_AES_InvalidKeyNo()
+ {
+ MIFARE_DESFire desfire = new MIFARE_DESFire(null);
+
+ Assert.Throws(
+ delegate
+ {
+ desfire.ChangeKey_AES(0x0F, null, 0x10);
+ });
+ }
+
+ [Test]
+ public void ChangeOtherKey_AES()
+ {
+ ICard card = Substitute.For();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ APDUResponse response = new APDUResponse()
+ {
+ SW1 = 0x91,
+ SW2 = 0x00
+ };
+
+ card.Transmit(Arg.Is(x => HexConverter.ConvertToHexString(x.ToArray()) == "90c400002101a8c5a61a06f56f38dc91266fed2e87dc00a5ad72a634ff0e62c8d6d80707dd6000")).Returns(response);
+
+ byte[] new_key = HexConverter.ConvertFromHexString("25432a462d4a614e645267556b587032");
+ byte[] old_key = HexConverter.ConvertFromHexString("00000000000000000000000000000000");
+
+ byte[] sessionkey = HexConverter.ConvertFromHexString("1677623e1e158a62dc3d128db55f947d");
+ byte[] iv = HexConverter.ConvertFromHexString("00000000000000000000000000000000");
+
+ desfire._SessionKey = sessionkey;
+ desfire._IV = iv;
+
+ desfire.ChangeOtherKey_AES(0x01, new_key, old_key, 0x10);
+ }
+
+ [Test]
+ public void ChangeOtherKey_AES_InvalidKeyNo()
+ {
+ MIFARE_DESFire desfire = new MIFARE_DESFire(null);
+
+ Assert.Throws(
+ delegate
+ {
+ desfire.ChangeKey_AES(0x0F, null, 0x10);
+ });
+ }
+
+ [Test]
+ public void CreateFile_Standard()
+ {
+ ICard card = Substitute.For();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ APDUResponse response = new APDUResponse()
+ {
+ SW1 = 0x91,
+ SW2 = 0x00
+ };
+
+ card.Transmit(Arg.Is(x => HexConverter.ConvertToHexString(x.ToArray()) == "90cd000007010000e0f0000000")).Returns(response);
+
+ UInt16 accesRights = desfire.GenerateFileAccessRights((byte)FileAccessRights.FREE, 0x00, 0x00, 0x00);
+ desfire.CreateFile_Standard(0x01, FileCommunication.PLAIN, accesRights, 0xF0);
+ }
+
+ [Test]
+ public void CreateFile_Standard_InvalidFID()
+ {
+ ICard card = Substitute.For();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ Assert.Throws(
+ delegate
+ {
+ desfire.CreateFile_Standard(0x21, FileCommunication.PLAIN, 0x0000, 0xF0);
+ });
+ }
+
+ [Test]
+ public void WriteData()
+ {
+ ICard card = Substitute.For();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ APDUResponse response = new APDUResponse()
+ {
+ SW1 = 0x91,
+ SW2 = 0x00
+ };
+
+ card.Transmit(Arg.Is(x => HexConverter.ConvertToHexString(x.ToArray()) == "903d00000f01000000080000546573743132333400")).Returns(response);
+
+ desfire.WriteData(0x01, 0, Encoding.ASCII.GetBytes("Test1234"));
+ }
+
+ [Test]
+ public void WriteData_Long()
+ {
+ ICard card = Substitute.For();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ APDUResponse response = new APDUResponse()
+ {
+ SW1 = 0x91,
+ SW2 = 0x00
+ };
+
+ card.Transmit(Arg.Is(x => HexConverter.ConvertToHexString(x.ToArray()) == "903d000036010000002f0000546573743132333454657374313233345465737431323334546573743132333454657374313233345465737431323300")).Returns(response);
+ card.Transmit(Arg.Is(x => HexConverter.ConvertToHexString(x.ToArray()) == "903d000036012f00002f0000345465737431323334546573743132333454657374313233345465737431323334546573743132333454657374313200")).Returns(response);
+ card.Transmit(Arg.Is(x => HexConverter.ConvertToHexString(x.ToArray()) == "903d000019015e000012000033345465737431323334546573743132333400")).Returns(response);
+
+ desfire.WriteData(0x01, 0, Encoding.ASCII.GetBytes("Test1234Test1234Test1234Test1234Test1234Test1234Test1234Test1234Test1234Test1234Test1234Test1234Test1234Test1234"));
+ }
+
+ [Test]
+ public void WriteData_InvalidFileID()
+ {
+ ICard card = Substitute.For();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ Assert.Throws(
+ delegate
+ {
+ desfire.WriteData(0x21, 0x00, Encoding.ASCII.GetBytes("Test1234"));
+ });
+ }
+
+ [Test]
+ public void ReadData()
+ {
+ ICard card = Substitute.For();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ APDUResponse response = new APDUResponse()
+ {
+ SW1 = 0x91,
+ SW2 = 0x00,
+ Body = HexConverter.ConvertFromHexString("54657374313233340000000000000000000000000000000000000000000000009100")
+ };
+
+ card.Transmit(Arg.Is(x => HexConverter.ConvertToHexString(x.ToArray()) == "90bd0000070100000020000000")).Returns(response);
+
+ byte[] data = desfire.ReadData(0x01, 0x00, 0x20);
+
+ Assert.AreEqual("Test1234", Encoding.ASCII.GetString(data).Replace("\u0000", ""));
+ }
+
+ [Test]
+ public void ReadData_CMAC()
+ {
+ ICard card = Substitute.For();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ APDUResponse response = new APDUResponse()
+ {
+ SW1 = 0x91,
+ SW2 = 0x00,
+ Body = HexConverter.ConvertFromHexString("5465737431323334000000000000000000000000000000000000000000000000809a9bedbc559a5b9100")
+ };
+
+ card.Transmit(Arg.Is(x => HexConverter.ConvertToHexString(x.ToArray()) == "90bd0000070100000020000000")).Returns(response);
+
+ byte[] data = desfire.ReadData(0x01, 0x00, 0x20);
+
+ Assert.AreEqual("Test1234", Encoding.ASCII.GetString(data).Replace("\u0000", ""));
+ }
+
+ [Test]
+ public void ReadData_Long()
+ {
+ ICard card = Substitute.For();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ APDUResponse response_1 = new APDUResponse()
+ {
+ SW1 = 0x91,
+ SW2 = 0x00,
+ Body = HexConverter.ConvertFromHexString("54657374313233340000000000000000000000000000000000000000000000000000000000000000000000000000009100")
+ };
+
+ APDUResponse response_2 = new APDUResponse()
+ {
+ SW1 = 0x91,
+ SW2 = 0x00,
+ Body = HexConverter.ConvertFromHexString("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009100")
+ };
+
+ APDUResponse response_3 = new APDUResponse()
+ {
+ SW1 = 0x91,
+ SW2 = 0x00,
+ Body = HexConverter.ConvertFromHexString("00009100")
+ };
+
+ card.Transmit(Arg.Is(x => HexConverter.ConvertToHexString(x.ToArray()) == "90bd000007010000002f000000")).Returns(response_1);
+ card.Transmit(Arg.Is(x => HexConverter.ConvertToHexString(x.ToArray()) == "90bd000007012f00002f000000")).Returns(response_2);
+ card.Transmit(Arg.Is(x => HexConverter.ConvertToHexString(x.ToArray()) == "90bd000007015e000002000000")).Returns(response_3);
+
+ byte[] data = desfire.ReadData(0x01, 0x00, 0x60);
+
+ Assert.AreEqual("Test1234", Encoding.ASCII.GetString(data).Replace("\u0000", ""));
+ }
+
+ [Test]
+ public void ReadData_InvalidFileID()
+ {
+ ICard card = Substitute.For();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ Assert.Throws(
+ delegate
+ {
+ desfire.ReadData(0x21, 0x00, 0x20);
+ });
+ }
+ #endregion
}
}
diff --git a/NFC_Test/NamespaceSetUp.cs b/NFC_Test/NamespaceSetUp.cs
index eb86856..64b4adc 100644
--- a/NFC_Test/NamespaceSetUp.cs
+++ b/NFC_Test/NamespaceSetUp.cs
@@ -1,8 +1,11 @@
using log4net.Config;
using NUnit.Framework;
-namespace NFC_Test
+namespace NFC_Unit_Test
{
+ ///
+ /// Add log4net Output to Console Out
+ ///
[SetUpFixture]
public class NamespaceSetUp
{
@@ -13,3 +16,19 @@ namespace NFC_Test
}
}
}
+
+namespace NFC_Real_Test
+{
+ ///
+ /// Add log4net Output to Console Out
+ ///
+ [SetUpFixture]
+ public class NamespaceSetUp
+ {
+ [OneTimeSetUp]
+ public void OneTimeSetUp()
+ {
+ BasicConfigurator.Configure();
+ }
+ }
+}
diff --git a/NFC_Test/OTA.cs b/NFC_Test/OTA.cs
deleted file mode 100644
index 9e1cd36..0000000
--- a/NFC_Test/OTA.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using NUnit.Framework;
-using NFC;
-using NFC.Readers.PCSC;
-using NFC.Mifare_DESFire;
-using NFC.Mifare_DESFire.Enums;
-using System;
-using System.Text;
-
-namespace NFC_Test
-{
- [TestFixture, Explicit]
- public class OTA
- {
- private string _ReaderID = "ACS ACR122U PICC Interface 0";
-
- [Test]
- public void Init()
- {
- IHardware hardware = new Hardware();
- IReader reader = hardware.OpenReader(_ReaderID);
-
- bool transmit_successfully = false;
-
- ReaderEventHandler handler = (sender, card) =>
- {
- card.Connect();
-
- MIFARE_DESFire desfire = new MIFARE_DESFire(card);
-
- desfire.SelectApplication(0x000000);
- desfire.AuthenticateISO_DES(0x00, desfire.GenerateEmptyKey(16));
- desfire.Format();
-
- desfire.AuthenticateISO_DES(0x00, desfire.GenerateEmptyKey(16));
-
- byte keySetting1 = desfire.GenerateKeySetting1(ChangeApplicationKey.MASTERKEY, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.NOKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE);
- byte keySetting2 = desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 0x03);
- desfire.CreateApplication(0xC0FFEE, keySetting1, keySetting2);
-
- desfire.SelectApplication(0xC0FFEE);
- desfire.AuthenticateISO_AES(0x00, desfire.GenerateEmptyKey(16));
-
- byte[] key_master = desfire.ConvertFromHexString("45eeb8338ae8f49a032e85bb11143530");
- byte[] key_1 = desfire.ConvertFromHexString("8db1f942f2d7cc82f6fa1486a30f8c12");
- byte[] key_2 = desfire.ConvertFromHexString("77611d170c449df6f294c48581ab315d");
- desfire.ChangeKey_AES(0x00, key_master, 0x10);
-
- desfire.AuthenticateISO_AES(0x00, key_master);
- desfire.ChangeOtherKey_AES(0x01, key_1, desfire.GenerateEmptyKey(16), 0x10);
-
- desfire.AuthenticateISO_AES(0x00, key_master);
- desfire.ChangeOtherKey_AES(0x02, key_2, desfire.GenerateEmptyKey(16), 0x10);
-
- UInt16 accesRights = desfire.GenerateFileAccessRights((byte)FileAccessRights.FREE, 0x00, 0x00, 0x00);
- desfire.CreateFile_Standard(0x01, FileCommunication.PLAIN, accesRights, 0x100);
-
- desfire.WriteData(0x01, 0, Encoding.ASCII.GetBytes("user@domain.org"));
-
- byte[] data = desfire.ReadData(0x01, 0, 32);
-
- Console.WriteLine(Encoding.ASCII.GetString(data));
-
- transmit_successfully = true;
-
- card.Disconnect();
- };
-
- reader.CardDiscovered += handler;
- reader.Start();
-
- Assert.AreEqual(true, transmit_successfully);
-
- reader.Stop();
- reader.CardDiscovered -= handler;
- }
- }
-}
diff --git a/NFC_Test/REAL_DESFireCommands.cs b/NFC_Test/REAL_DESFireCommands.cs
new file mode 100644
index 0000000..5808d54
--- /dev/null
+++ b/NFC_Test/REAL_DESFireCommands.cs
@@ -0,0 +1,477 @@
+using NFC;
+using NFC.Crypto;
+using NFC.Mifare_DESFire;
+using NFC.Mifare_DESFire.Enums;
+using NFC.Readers.PCSC;
+using NUnit.Framework;
+using System;
+using System.Text;
+
+namespace NFC_Real_Test
+{
+ ///
+ /// Test all DESFire Commands with an Empty Card
+ /// The Test are ordered to check the Commands one by one
+ ///
+ [TestFixture, Explicit]
+ public class REAL_DESFireCommands
+ {
+ ///
+ /// Set ReaderID for PCSC Interface
+ /// You can get the ID from REAL_Reader_PCSC
+ ///
+ public readonly string ReaderID = "ACS ACR122U PICC Interface 0";
+
+ #region Fixed Config Properties
+ public readonly UInt32 ApplicationID = 0xAAFFEE;
+ public readonly string ApplicationMasterKey = "25432A462D4A614E645267556B587032";
+ public readonly string ApplicationKey_1 = "25432A462D4A614E645267556B587032";
+ public readonly byte FileID = 0x01;
+ public readonly byte FileSize = 0xF0;
+ #endregion
+
+ [Test, Order(1)]
+ public void SelectApplication()
+ {
+ IHardware hardware = new PCSC_Hardware();
+ IReader reader = hardware.OpenReader(ReaderID);
+
+ bool test_successfully = false;
+
+ ReaderEventHandler handler = (sender, card) =>
+ {
+ card.Connect();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ desfire.SelectApplication(0x000000);
+
+ test_successfully = true;
+
+ card.Disconnect();
+ };
+
+ reader.CardDiscovered += handler;
+ reader.Start();
+
+ Assert.AreEqual(true, test_successfully);
+
+ reader.Stop();
+ reader.CardDiscovered -= handler;
+ }
+
+ [Test, Order(2)]
+ public void Authenticate_DES()
+ {
+ IHardware hardware = new PCSC_Hardware();
+ IReader reader = hardware.OpenReader(ReaderID);
+
+ bool test_successfully = false;
+
+ ReaderEventHandler handler = (sender, card) =>
+ {
+ card.Connect();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ desfire.SelectApplication(0x000000);
+
+ CipherKey key = new CipherKey(CipherType.TDES);
+ desfire.AuthenticateISO_DES(0x00, key._Key);
+
+ test_successfully = true;
+
+ card.Disconnect();
+ };
+
+ reader.CardDiscovered += handler;
+ reader.Start();
+
+ Assert.AreEqual(true, test_successfully);
+
+ reader.Stop();
+ reader.CardDiscovered -= handler;
+ }
+
+ [Test, Order(3)]
+ public void Format()
+ {
+ IHardware hardware = new PCSC_Hardware();
+ IReader reader = hardware.OpenReader(ReaderID);
+
+ bool test_successfully = false;
+
+ ReaderEventHandler handler = (sender, card) =>
+ {
+ card.Connect();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ desfire.SelectApplication(0x000000);
+
+ CipherKey key = new CipherKey(CipherType.TDES);
+ desfire.AuthenticateISO_DES(0x00, key._Key);
+
+ desfire.Format();
+
+ test_successfully = true;
+
+ card.Disconnect();
+ };
+
+ reader.CardDiscovered += handler;
+ reader.Start();
+
+ Assert.AreEqual(true, test_successfully);
+
+ reader.Stop();
+ reader.CardDiscovered -= handler;
+ }
+
+ [Test, Order(4)]
+ public void CreateApplication()
+ {
+ IHardware hardware = new PCSC_Hardware();
+ IReader reader = hardware.OpenReader(ReaderID);
+
+ bool test_successfully = false;
+
+ ReaderEventHandler handler = (sender, card) =>
+ {
+ card.Connect();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ desfire.SelectApplication(0x000000);
+
+ CipherKey key = new CipherKey(CipherType.TDES);
+ desfire.AuthenticateISO_DES(0x00, key._Key);
+
+ desfire.Format();
+
+ desfire.AuthenticateISO_DES(0x00, key._Key);
+
+ byte keysetting1 = desfire.GenerateKeySetting1(ChangeApplicationKey.MASTERKEY, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE);
+ byte keysetting2 = desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 2);
+
+ desfire.CreateApplication(ApplicationID, keysetting1, keysetting2);
+
+ test_successfully = true;
+
+ card.Disconnect();
+ };
+
+ reader.CardDiscovered += handler;
+ reader.Start();
+
+ Assert.AreEqual(true, test_successfully);
+
+ reader.Stop();
+ reader.CardDiscovered -= handler;
+ }
+
+ [Test, Order(5)]
+ public void Authenticate_AES()
+ {
+ IHardware hardware = new PCSC_Hardware();
+ IReader reader = hardware.OpenReader(ReaderID);
+
+ bool test_successfully = false;
+
+ ReaderEventHandler handler = (sender, card) =>
+ {
+ card.Connect();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ desfire.SelectApplication(0x000000);
+
+ CipherKey key = new CipherKey(CipherType.TDES);
+ desfire.AuthenticateISO_DES(0x00, key._Key);
+
+ desfire.Format();
+
+ desfire.AuthenticateISO_DES(0x00, key._Key);
+
+ byte keysetting1 = desfire.GenerateKeySetting1(ChangeApplicationKey.MASTERKEY, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE);
+ byte keysetting2 = desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 2);
+
+ desfire.CreateApplication(ApplicationID, keysetting1, keysetting2);
+
+ desfire.SelectApplication(ApplicationID);
+
+ CipherKey key_aes = new CipherKey(CipherType.AES);
+ desfire.AuthenticateISO_AES(0x00, key_aes._Key);
+
+ test_successfully = true;
+
+ card.Disconnect();
+ };
+
+ reader.CardDiscovered += handler;
+ reader.Start();
+
+ Assert.AreEqual(true, test_successfully);
+
+ reader.Stop();
+ reader.CardDiscovered -= handler;
+ }
+
+ [Test, Order(6)]
+ public void ChangeApplicationMasterKey()
+ {
+ IHardware hardware = new PCSC_Hardware();
+ IReader reader = hardware.OpenReader(ReaderID);
+
+ bool test_successfully = false;
+
+ ReaderEventHandler handler = (sender, card) =>
+ {
+ card.Connect();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ desfire.SelectApplication(0x000000);
+
+ CipherKey key = new CipherKey(CipherType.TDES);
+ desfire.AuthenticateISO_DES(0x00, key._Key);
+
+ desfire.Format();
+
+ desfire.AuthenticateISO_DES(0x00, key._Key);
+
+ byte keysetting1 = desfire.GenerateKeySetting1(ChangeApplicationKey.MASTERKEY, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE);
+ byte keysetting2 = desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 2);
+
+ desfire.CreateApplication(ApplicationID, keysetting1, keysetting2);
+
+ desfire.SelectApplication(ApplicationID);
+
+ CipherKey key_aes = new CipherKey(CipherType.AES);
+ desfire.AuthenticateISO_AES(0x00, key_aes._Key);
+
+ CipherKey key_aes_new = new CipherKey(ApplicationMasterKey, CipherType.AES, 0x10);
+ desfire.ChangeKey_AES(0x00, key_aes_new._Key, key_aes_new._KeyVersion);
+
+ test_successfully = true;
+
+ card.Disconnect();
+ };
+
+ reader.CardDiscovered += handler;
+ reader.Start();
+
+ Assert.AreEqual(true, test_successfully);
+
+ reader.Stop();
+ reader.CardDiscovered -= handler;
+ }
+
+ [Test, Order(7)]
+ public void ChangeApplicationKey_1()
+ {
+ IHardware hardware = new PCSC_Hardware();
+ IReader reader = hardware.OpenReader(ReaderID);
+
+ bool test_successfully = false;
+
+ ReaderEventHandler handler = (sender, card) =>
+ {
+ card.Connect();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ desfire.SelectApplication(0x000000);
+
+ CipherKey key = new CipherKey(CipherType.TDES);
+ desfire.AuthenticateISO_DES(0x00, key._Key);
+
+ desfire.Format();
+
+ desfire.AuthenticateISO_DES(0x00, key._Key);
+
+ byte keysetting1 = desfire.GenerateKeySetting1(ChangeApplicationKey.MASTERKEY, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE);
+ byte keysetting2 = desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 2);
+
+ desfire.CreateApplication(ApplicationID, keysetting1, keysetting2);
+
+ desfire.SelectApplication(ApplicationID);
+
+ CipherKey key_aes = new CipherKey(CipherType.AES);
+ desfire.AuthenticateISO_AES(0x00, key_aes._Key);
+
+ CipherKey key_new = new CipherKey(ApplicationKey_1, CipherType.AES, 0x10);
+ desfire.ChangeOtherKey_AES(0x01, key_new._Key, key_aes._Key, key_new._KeyVersion);
+
+ test_successfully = true;
+
+ card.Disconnect();
+ };
+
+ reader.CardDiscovered += handler;
+ reader.Start();
+
+ Assert.AreEqual(true, test_successfully);
+
+ reader.Stop();
+ reader.CardDiscovered -= handler;
+ }
+
+ [Test, Order(8)]
+ public void CreateFile()
+ {
+ IHardware hardware = new PCSC_Hardware();
+ IReader reader = hardware.OpenReader(ReaderID);
+
+ bool test_successfully = false;
+
+ ReaderEventHandler handler = (sender, card) =>
+ {
+ card.Connect();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ desfire.SelectApplication(0x000000);
+
+ CipherKey key = new CipherKey(CipherType.TDES);
+ desfire.AuthenticateISO_DES(0x00, key._Key);
+
+ desfire.Format();
+
+ desfire.AuthenticateISO_DES(0x00, key._Key);
+
+ byte keysetting1 = desfire.GenerateKeySetting1(ChangeApplicationKey.MASTERKEY, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE);
+ byte keysetting2 = desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 2);
+
+ desfire.CreateApplication(ApplicationID, keysetting1, keysetting2);
+
+ desfire.SelectApplication(ApplicationID);
+
+ CipherKey key_aes = new CipherKey(CipherType.AES);
+ desfire.AuthenticateISO_AES(0x00, key_aes._Key);
+
+ UInt16 accesRights = desfire.GenerateFileAccessRights((byte)FileAccessRights.FREE, 0x00, 0x00, 0x00);
+ desfire.CreateFile_Standard(FileID, FileCommunication.PLAIN, accesRights, FileSize);
+
+ test_successfully = true;
+
+ card.Disconnect();
+ };
+
+ reader.CardDiscovered += handler;
+ reader.Start();
+
+ Assert.AreEqual(true, test_successfully);
+
+ reader.Stop();
+ reader.CardDiscovered -= handler;
+ }
+
+ [Test, Order(9)]
+ public void WriteFile()
+ {
+ IHardware hardware = new PCSC_Hardware();
+ IReader reader = hardware.OpenReader(ReaderID);
+
+ bool test_successfully = false;
+
+ ReaderEventHandler handler = (sender, card) =>
+ {
+ card.Connect();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ desfire.SelectApplication(0x000000);
+
+ CipherKey key = new CipherKey(CipherType.TDES);
+ desfire.AuthenticateISO_DES(0x00, key._Key);
+
+ desfire.Format();
+
+ desfire.AuthenticateISO_DES(0x00, key._Key);
+
+ byte keysetting1 = desfire.GenerateKeySetting1(ChangeApplicationKey.MASTERKEY, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE);
+ byte keysetting2 = desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 2);
+
+ desfire.CreateApplication(ApplicationID, keysetting1, keysetting2);
+
+ desfire.SelectApplication(ApplicationID);
+
+ CipherKey key_aes = new CipherKey(CipherType.AES);
+ desfire.AuthenticateISO_AES(0x00, key_aes._Key);
+
+ UInt16 accesRights = desfire.GenerateFileAccessRights((byte)FileAccessRights.FREE, 0x00, 0x00, 0x00);
+ desfire.CreateFile_Standard(FileID, FileCommunication.PLAIN, accesRights, FileSize);
+
+ desfire.WriteData(FileID, 0, Encoding.ASCII.GetBytes("Test1234"));
+
+ test_successfully = true;
+
+ card.Disconnect();
+ };
+
+ reader.CardDiscovered += handler;
+ reader.Start();
+
+ Assert.AreEqual(true, test_successfully);
+
+ reader.Stop();
+ reader.CardDiscovered -= handler;
+ }
+
+ [Test, Order(10)]
+ public void ReadFile()
+ {
+ IHardware hardware = new PCSC_Hardware();
+ IReader reader = hardware.OpenReader(ReaderID);
+
+ bool test_successfully = false;
+
+ ReaderEventHandler handler = (sender, card) =>
+ {
+ card.Connect();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ desfire.SelectApplication(0x000000);
+
+ CipherKey key = new CipherKey(CipherType.TDES);
+ desfire.AuthenticateISO_DES(0x00, key._Key);
+
+ desfire.Format();
+
+ desfire.AuthenticateISO_DES(0x00, key._Key);
+
+ byte keysetting1 = desfire.GenerateKeySetting1(ChangeApplicationKey.MASTERKEY, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE);
+ byte keysetting2 = desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 2);
+
+ desfire.CreateApplication(ApplicationID, keysetting1, keysetting2);
+
+ desfire.SelectApplication(ApplicationID);
+
+ CipherKey key_aes = new CipherKey(CipherType.AES);
+ desfire.AuthenticateISO_AES(0x00, key_aes._Key);
+
+ UInt16 accesRights = desfire.GenerateFileAccessRights((byte)FileAccessRights.FREE, 0x00, 0x00, 0x00);
+ desfire.CreateFile_Standard(FileID, FileCommunication.PLAIN, accesRights, FileSize);
+
+ desfire.WriteData(FileID, 0, Encoding.ASCII.GetBytes("Test1234"));
+
+ byte[] data = desfire.ReadData(FileID, 0, FileSize);
+ Console.WriteLine(Encoding.ASCII.GetString(data).Replace("\u0000", ""));
+
+ test_successfully = true;
+
+ card.Disconnect();
+ };
+
+ reader.CardDiscovered += handler;
+ reader.Start();
+
+ Assert.AreEqual(true, test_successfully);
+
+ reader.Stop();
+ reader.CardDiscovered -= handler;
+ }
+ }
+}
diff --git a/NFC_Test/REAL_FabAccess_OTA.cs b/NFC_Test/REAL_FabAccess_OTA.cs
new file mode 100644
index 0000000..a17c0dc
--- /dev/null
+++ b/NFC_Test/REAL_FabAccess_OTA.cs
@@ -0,0 +1,130 @@
+using NUnit.Framework;
+using NFC;
+using NFC.Readers.PCSC;
+using NFC.Mifare_DESFire;
+using NFC.Mifare_DESFire.Enums;
+using System;
+using System.Text;
+using NFC.Crypto;
+
+namespace NFC_Real_Test
+{
+ [TestFixture, Explicit]
+ public class REAL_FabAccess_OTA
+ {
+ private string _ReaderID = "ACS ACR122U PICC Interface 0";
+ private UInt32 _FabAccess_AID = 0x2A472D;
+ private byte _FabAccess_FID = 0x01;
+ private UInt32 _FabAccess_FSize = 0xF0;
+
+ // Change of PICC Key is not implementet yet
+ // private CipherKey _FabAccess_Card_MasterKey = new CipherKey("294A404E635266556A576E5A72347537", CipherType.AES, 0x10);
+
+ private CipherKey _FabAccess_Application_MasterKey = new CipherKey("50645367566B59703273357638792F42", CipherType.AES, 0x10);
+ private CipherKey _FabAccess_Application_AuthKey = new CipherKey("6D5A7134743677397A24432646294A40", CipherType.AES, 0x10);
+
+ private string _FabAccess_UserDomain = "verrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrylooooooooooooooooooongusssssssssssssssssssssssernaaaaaaaaaaaaaaaaaaaaaaaame@fvm.fab-access.org";
+ private string _FabAccess_Domain = "fvm.fab-access.org";
+
+ private CipherKey _Default_DESKey = new CipherKey(CipherType.TDES);
+ private CipherKey _Default_AESKey = new CipherKey(CipherType.AES);
+
+ ///
+ /// Create FabAccess Application and UserData File
+ ///
+ [Test, Order(1)]
+ public void Init_EmptyCard()
+ {
+ IHardware hardware = new PCSC_Hardware();
+ IReader reader = hardware.OpenReader(_ReaderID);
+
+ bool transmit_successfully = false;
+
+ ReaderEventHandler handler = (sender, card) =>
+ {
+ card.Connect();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ desfire.SelectApplication(0x000000);
+ desfire.AuthenticateISO_DES(0x00, _Default_DESKey._Key);
+ desfire.Format();
+
+ desfire.AuthenticateISO_DES(0x00, _Default_DESKey._Key);
+
+ byte keySetting1 = desfire.GenerateKeySetting1(ChangeApplicationKey.MASTERKEY, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE);
+ byte keySetting2 = desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 0x02);
+ desfire.CreateApplication(_FabAccess_AID, keySetting1, keySetting2);
+
+ desfire.SelectApplication(_FabAccess_AID);
+ desfire.AuthenticateISO_AES(0x00, _Default_AESKey._Key);
+
+ desfire.ChangeKey_AES(0x00, _FabAccess_Application_MasterKey._Key, _FabAccess_Application_MasterKey._KeyVersion);
+
+ desfire.AuthenticateISO_AES(0x00, _FabAccess_Application_MasterKey._Key);
+ desfire.ChangeOtherKey_AES(0x01, _FabAccess_Application_AuthKey._Key, _Default_AESKey._Key, _FabAccess_Application_AuthKey._KeyVersion);
+
+ UInt16 accesRights = desfire.GenerateFileAccessRights((byte)FileAccessRights.FREE, 0x00, 0x00, 0x00);
+ desfire.CreateFile_Standard(_FabAccess_FID, FileCommunication.PLAIN, accesRights, _FabAccess_FSize);
+
+ desfire.WriteData(_FabAccess_FID, 0, Encoding.ASCII.GetBytes(_FabAccess_UserDomain));
+
+ transmit_successfully = true;
+
+ card.Disconnect();
+ };
+
+ reader.CardDiscovered += handler;
+ reader.Start();
+
+ Assert.AreEqual(true, transmit_successfully);
+
+ reader.Stop();
+ reader.CardDiscovered -= handler;
+ }
+
+ ///
+ /// Authenticate with UserData File and AuthKey
+ ///
+ [Test, Order(2)]
+ public void Authenticate()
+ {
+ IHardware hardware = new PCSC_Hardware();
+ IReader reader = hardware.OpenReader(_ReaderID);
+
+ bool transmit_successfully = false;
+
+ ReaderEventHandler handler = (sender, card) =>
+ {
+ card.Connect();
+
+ MIFARE_DESFire desfire = new MIFARE_DESFire(card);
+
+ desfire.SelectApplication(_FabAccess_AID);
+ byte[] card_data = desfire.ReadData(_FabAccess_FID, 0x00, _FabAccess_FSize);
+ string userdomain = Encoding.ASCII.GetString(card_data).Replace("\u0000", "");
+
+ string domain = userdomain.Split('@')[1];
+ if(domain != _FabAccess_Domain)
+ {
+ throw new Exception("Incorrect Domain");
+ }
+
+ desfire.SelectApplication(_FabAccess_AID);
+ desfire.AuthenticateISO_AES(0x01, _FabAccess_Application_AuthKey._Key);
+
+ transmit_successfully = true;
+
+ card.Disconnect();
+ };
+
+ reader.CardDiscovered += handler;
+ reader.Start();
+
+ Assert.AreEqual(true, transmit_successfully);
+
+ reader.Stop();
+ reader.CardDiscovered -= handler;
+ }
+ }
+}
diff --git a/NFC_Test/REAL_Windows.cs b/NFC_Test/REAL_Reader_PCSC.cs
similarity index 64%
rename from NFC_Test/REAL_Windows.cs
rename to NFC_Test/REAL_Reader_PCSC.cs
index 0951e4b..9510556 100644
--- a/NFC_Test/REAL_Windows.cs
+++ b/NFC_Test/REAL_Reader_PCSC.cs
@@ -1,29 +1,25 @@
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NFC;
+using NFC;
using NFC.Readers.PCSC;
-using System.Threading;
-using NFC.Mifare_DESFire;
-using NFC.Mifare_DESFire.Enums;
-using NFC.ISO7816_4;
-using PCSC.Iso7816;
+using NUnit.Framework;
+using System;
-namespace NFC_Test
+namespace NFC_Real_Test
{
[TestFixture, Explicit]
- public class REAL_Windows
+ public class REAL_Reader_PCSC
{
+ ///
+ /// Print PCSC ReaderIDs to Console Out
+ ///
[Test]
public void GetReaders()
{
- IHardware hardware = new Hardware();
+ IHardware hardware = new PCSC_Hardware();
string[] readers = hardware.GetReaders();
- Console.WriteLine("Readers detected: {0}", readers.Length);
+ Console.WriteLine("PCSC Readers detected: {0}", readers.Length);
- if(readers.Length > 0)
+ if (readers.Length > 0)
{
Console.WriteLine("List of ReaderIDs:");
foreach (string readerID in readers)
@@ -33,10 +29,14 @@ namespace NFC_Test
}
}
+ ///
+ /// Connect to specific PCSC Reader by ReaderID
+ ///
+ /// ReaderID from GetReaders
[TestCase("ACS ACR122U PICC Interface 0")]
public void Connect(string readerID)
{
- IHardware hardware = new Hardware();
+ IHardware hardware = new PCSC_Hardware();
IReader reader = hardware.OpenReader(readerID);
bool connected_successfully = false;
@@ -44,9 +44,9 @@ namespace NFC_Test
ReaderEventHandler handler = (sender, card) =>
{
card.Connect();
-
+
connected_successfully = true;
-
+
card.Disconnect();
};
diff --git a/NFC_Test/REAL_Windows_CardSetUp.cs b/NFC_Test/REAL_Windows_CardSetUp.cs
deleted file mode 100644
index 931a17a..0000000
--- a/NFC_Test/REAL_Windows_CardSetUp.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-using NFC;
-using NFC.Mifare_DESFire;
-using NFC.Mifare_DESFire.Enums;
-using NFC.Readers.PCSC;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace NFC_Test
-{
- //[TestFixture]
- //public class REAL_Windows_CardSetUp
- //{
- // public static UInt32 FabAccessAID = 0x001100;
- // public static string CardReaderID = "ACS ACR122U PICC Interface 0";
- // public static byte[] PICC_MasterKey = new byte[]
- // {
- // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- // };
-
- // public static byte[] APP_MasterKey = new byte[]
- // {
- // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- // };
-
- // public static byte[] APP_Key_1 = new byte[]
- // {
- // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- // };
-
- // public static byte[] APP_Key_2 = new byte[]
- // {
- // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- // };
-
- // public static byte[] Empty_Key = new byte[]
- // {
- // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- // };
-
- // public static byte FabAccessIdentFileID = 0x01;
- // public static string UserDomain = "user1@fabaccess.org";
-
- // [Test]
- // public void ResetCard()
- // {
- // IHardware hardware = new Hardware();
- // IReader reader = hardware.OpenReader(CardReaderID);
-
- // bool connected_successfully = false;
-
- // ReaderEventHandler handler = (sender, card) =>
- // {
- // card.Connect();
-
- // MIFARE_DESFire mifareDESFire = new MIFARE_DESFire(card);
-
- // mifareDESFire.AuthenticateISO_DES(0x01, PICC_MasterKey);
-
- // mifareDESFire.Format();
-
- // connected_successfully = true;
-
- // card.Disconnect();
- // };
-
- // reader.CardDiscovered += handler;
- // reader.Start();
-
- // Assert.AreEqual(true, connected_successfully);
-
- // reader.Stop();
- // reader.CardDiscovered -= handler;
- // }
-
- // [Test]
- // public void ProvisionCard()
- // {
- // IHardware hardware = new Hardware();
- // IReader reader = hardware.OpenReader(CardReaderID);
-
- // bool connected_successfully = false;
-
- // ReaderEventHandler handler = (sender, card) =>
- // {
- // card.Connect();
-
- // MIFARE_DESFire mifareDESFire = new MIFARE_DESFire(card);
-
- // mifareDESFire.AuthenticateISO_DES(0x01, APP_MasterKey);
- // mifareDESFire.CreateApplication(FabAccessAID);
- // mifareDESFire.SelectApplication(FabAccessAID);
-
- // mifareDESFire.AuthenticateDES(0x00, Empty_Key);
- // mifareDESFire.ChangeApplicationMasterKey(APP_MasterKey);
-
- // mifareDESFire.AuthenticateDES(0x00, APP_MasterKey);
- // mifareDESFire.ChangeApplicationKey(0x01, APP_Key_1);
-
- // connected_successfully = true;
-
- // card.Disconnect();
- // };
-
- // reader.CardDiscovered += handler;
- // reader.Start();
-
- // Assert.AreEqual(true, connected_successfully);
-
- // reader.Stop();
- // reader.CardDiscovered -= handler;
- // }
-
-
- // [Test]
- // public void SetUpUserCard()
- // {
- // IHardware hardware = new Hardware();
- // IReader reader = hardware.OpenReader(CardReaderID);
-
- // bool connected_successfully = false;
-
- // ReaderEventHandler handler = (sender, card) =>
- // {
- // card.Connect();
-
- // MIFARE_DESFire mifareDESFire = new MIFARE_DESFire(card);
-
- // mifareDESFire.SelectApplication(FabAccessAID);
- // mifareDESFire.AuthenticateDES(0x00, Empty_Key);
- // UInt16 fileAccessRight = mifareDESFire.GenerateFileAccessRight(AccessRights.FREE, 0x00, 0x00, 0x00);
- // mifareDESFire.CreateFile(FabAccessIdentFileID, FileCommunication.PLAIN, fileAccessRight, (UInt32)0x90);
-
- // System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();
-
- // mifareDESFire.WirteData(FabAccessIdentFileID, 0x00000000, 0x00000000, enc.GetBytes(UserDomain));
-
- // connected_successfully = true;
-
- // card.Disconnect();
- // };
-
- // reader.CardDiscovered += handler;
- // reader.Start();
-
- // Assert.AreEqual(true, connected_successfully);
-
- // reader.Stop();
- // reader.CardDiscovered -= handler;
- // }
-
- // [Test]
- // public void AuthenticateCard()
- // {
- // IHardware hardware = new Hardware();
- // IReader reader = hardware.OpenReader(CardReaderID);
-
- // bool connected_successfully = false;
-
- // ReaderEventHandler handler = (sender, card) =>
- // {
- // card.Connect();
-
- // MIFARE_DESFire mifareDESFire = new MIFARE_DESFire(card);
-
- // mifareDESFire.SelectApplication(FabAccessAID);
- // byte[] filedata = mifareDESFire.ReadData(FabAccessIdentFileID, 0x00000000, 0x00000000);
-
- // System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();
- // string userdomain = enc.GetString(filedata);
-
- // Console.WriteLine(userdomain);
-
- // mifareDESFire.AuthenticateDES(0x01, APP_Key_1);
-
- // connected_successfully = true;
-
- // card.Disconnect();
- // };
-
- // reader.CardDiscovered += handler;
- // reader.Start();
-
- // Assert.AreEqual(true, connected_successfully);
-
- // reader.Stop();
- // reader.CardDiscovered -= handler;
- // }
- //}
-}
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..972e79e
--- /dev/null
+++ b/README.md
@@ -0,0 +1,48 @@
+Borepin
+===
+
+# Building
+
+## On Windows
+1. Install Visual Studio 2019
+ [download Visual Studio](https://visualstudio.microsoft.com/de/)
+ * with Xamarin
+ * with UWP
+ * with .NET Desktop
+2. Install GTKSharp for Windows
+ [download GTKSharp](https://www.mono-project.com/download/stable/#download-win)
+4. Clone Borepin
+ [download Borepin](https://gitlab.com/fabinfra/fabaccess/client)
+6. Load Borepin
+7. Build Borepin
+
+If Step 5. Build Borepin is failing because of GTKSharp, it could help to restart your PC.
+
+## Build GTK Project
+1. Install mono, gtk-sharp, msbuild, nuget
+ 1.1 Debian based
+ ```shell
+ $ apt install mono-complete, gtk-sharp2, nuget
+ ```
+ 1.2 ArchLinux based
+ ```shell
+ $ pacman -S mono, mono-msbuild, gtk-sharp-2, nuget
+ ```
+2. Clone Borepin
+ ```shell
+ $ git clone https://gitlab.com/fabinfra/fabaccess/client.git
+ ```
+
+3. Build Borepin
+ ```shell
+ $ cd client
+ $ msbuild -t:Borepin_GTK
+ ```
+4. Run Borepin
+ ```shell
+ $ mono ./Borepin/Borepin.GTK/bin/Debug/Borepin.GTK.exe
+ ```
+You can also use Rider or monodevelop as an IDE for development on Borepin
+
+## Testing
+We use [NUnit](https://nunit.org/) for testing.