Update u2f.c

Fixed small apparent typo.

.editorconfig

@@ -0,0 +1,19 @@
+https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties
+
+# editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 4
+tab_width = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[Makefile]
+indent_style = tab
+
+[*.{yml,yaml}]
+indent_size = 2

.gitignore

@@ -74,7 +74,8 @@ tools/python-fido2/*
 *.key
 site/
 _site/
-venv/
+env2/
+env3/
 .project
 .tags*
 targets/*/docs/

.gitmodules

@@ -3,7 +3,7 @@
 	url = https://github.com/intel/tinycbor
 [submodule "python-fido2"]
 	path = python-fido2
-	url = https://github.com/SoloKeysSec/python-fido2
+	url = https://github.com/solokeys/python-fido2
 [submodule "crypto/micro-ecc"]
 	path = crypto/micro-ecc
 	url = https://github.com/kmackay/micro-ecc.git
@@ -12,4 +12,4 @@
     url = https://github.com/kokke/tiny-AES-c
 [submodule "targets/stm32l442/dfuse-tool"]
 	path = targets/stm32l442/dfuse-tool
-    url = https://github.com/SoloKeysSec/dfuse-tool
+    url = https://github.com/solokeys/dfuse-tool

99-solo.rules

@@ -0,0 +1,6 @@
+# Solo
+ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a2ca", ATTRS{product}=="Solo",                   TAG+="uaccess", GROUP="plugdev", SYMLINK+="solokey"
+ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a2ca", ATTRS{product}=="Solo HACKER (Unlocked)", TAG+="uaccess", GROUP="plugdev", SYMLINK+="solohacker"
+
+# U2F Zero
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="8acf", TAG+="uaccess", GROUP="plugdev", SYMLINK+="u2fzero"

LICENSE

@@ -1,19 +1,619 @@
-Copyright 2018 Conor Patrick
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+                            Preamble
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  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.

Makefile

@@ -7,7 +7,7 @@
 #define uECC_arm64      6
 #define uECC_avr        7
 
-platform=2
+ecc_platform=2
 
 EFM32_DEBUGGER= -s 440083537 --device EFM32JG1B200F128GM32
 #EFM32_DEBUGGER= -s 440121060    #dev board
@@ -23,24 +23,18 @@ else
   export LDFLAGS = -Wl,--gc-sections
 endif
 LDFLAGS += $(LIBCBOR)
-CFLAGS = -O2 -fdata-sections -ffunction-sections 
+CFLAGS = -O2 -fdata-sections -ffunction-sections
 
 INCLUDES = -I./tinycbor/src -I./crypto/sha256 -I./crypto/micro-ecc/ -Icrypto/tiny-AES-c/ -I./fido2/ -I./pc -I./fido2/extensions
 
 CFLAGS += $(INCLUDES)
 # for crypto/tiny-AES-c
-CFLAGS += -DAES256=1
+CFLAGS += -DAES256=1 -DAPP_CONFIG=\"app.h\"
 
 name = main
 
 .PHONY: all
-all: python-fido2 main
-
-.PHONY: test
-test:
-	$(MAKE) -C . main
-	$(MAKE) -C . testgcm
-	./testgcm
+all: main
 
 tinycbor/Makefile crypto/tiny-AES-c/aes.c:
 	git submodule update --init
@@ -51,6 +45,9 @@ cbor: $(LIBCBOR)
 $(LIBCBOR): tinycbor/Makefile
 	cd tinycbor/ && $(MAKE) clean && $(MAKE) -j8
 
+test:
+	$(MAKE) -C . main
+
 .PHONY: efm8prog
 efm8prog:
 	cd './targets/efm8\Keil 8051 v9.53 - Debug' && $(MAKE) all
@@ -70,50 +67,36 @@ efm32bootprog: efm32com
 $(name): $(obj) $(LIBCBOR)
 	$(CC) $(LDFLAGS) -o $@ $(obj) $(LDFLAGS)
 
-crypto/aes-gcm/aes_gcm.o:
-	$(CC) -c crypto/aes-gcm/aes_gcm.c $(CFLAGS) -DTEST -o crypto/aes-gcm/aes_gcm.o
-
-testgcm: $(obj) $(LIBCBOR) crypto/aes-gcm/aes_gcm.o
-	$(CC) -c fido2/main.c $(CFLAGS) -DTEST -o fido2/main.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS)
-
 uECC.o: ./crypto/micro-ecc/uECC.c
-	$(CC) -c -o $@ $^ -O2 -fdata-sections -ffunction-sections -DuECC_PLATFORM=$(platform) -I./crypto/micro-ecc/
+	$(CC) -c -o $@ $^ -O2 -fdata-sections -ffunction-sections -DuECC_PLATFORM=$(ecc_platform) -I./crypto/micro-ecc/
 
+env2:
+	virtualenv --python=python2.7 env2
+	env2/bin/pip install --upgrade -r tools/requirements.txt
 
-# python virtualenv
+env3:
+	python3 -m venv env3
+	env3/bin/pip install --upgrade -r tools/requirements.txt
+	env3/bin/pip install --upgrade black
 
-venv:
-	@if ! which virtualenv >/dev/null ; then \
-	    echo "ERR: Sorry, no python virtualenv found. Please consider installing " ;\
-	    echo "     it via something like:" ;\
-	    echo "   sudo apt install python-virtualenv" ;\
-	    echo "     or maybe:" ;\
-	    echo "   pip install virtualenv" ;\
-	fi
-	virtualenv venv
-	./venv/bin/pip install wheel
+# selectively reformat our own code
+black: env3
+	env3/bin/black --skip-string-normalization tools/
 
-.PHONY: python-fido2
-python-fido2: venv
-	cd python-fido2/ && ../venv/bin/python setup.py install
+wink2: env2
+	env2/bin/python tools/solotool.py solo --wink
 
-venv/bin/mkdocs: venv
-	./venv/bin/pip install mkdocs mkdocs-material
+wink3: env3
+	env3/bin/python tools/solotool.py solo --wink
 
-.PHONY: docsrv
-docsrv:	venv/bin/mkdocs
-	./venv/bin/mkdocs serve
-
-.PHONY: fido2-test
-fido2-test:
-	./venv/bin/python tools/ctap_test.py
+fido2-test: env3
+	env3/bin/python tools/ctap_test.py
 
 clean:
-	rm -f *.o main.exe main testgcm $(obj)
+	rm -f *.o main.exe main $(obj)
+	rm -rf env2 env3
 	for f in crypto/tiny-AES-c/Makefile tinycbor/Makefile ; do \
 	    if [ -f "$$f" ]; then \
 	    	(cd `dirname $$f` ; git checkout -- .) ;\
 	    fi ;\
 	done
-	rm -rf venv

README.md

@@ -1,145 +1,126 @@
-![GitHub](https://img.shields.io/github/license/mashape/apistatus.svg)
-[![Kickstarter](https://img.shields.io/badge/kickstarter-back%20us-red.svg)](https://solokeys.com/kickstarter)
-[![Build Status](https://travis-ci.com/SoloKeysSec/solo.svg?branch=master)](https://travis-ci.com/SoloKeysSec/solo)
-[![Discourse Status](https://img.shields.io/discourse/https/meta.discourse.org/status.svg)](https://discourse.solokeys.com)
+[![License](https://img.shields.io/github/license/solokeys/solo.svg)](https://github.com/solokeys/solo/blob/master/LICENSE)
+[![Build Status](https://travis-ci.com/solokeys/solo.svg?branch=master)](https://travis-ci.com/solokeys/solo)
+[![Discourse Users](https://img.shields.io/discourse/https/discourse.solokeys.com/users.svg)](https://discourse.solokeys.com)
 [![Keybase Chat](https://img.shields.io/badge/chat-on%20keybase-brightgreen.svg)](https://keybase.io/team/solokeys.public)
 
 
 # Solo
 
-Solo is an affordable security key that implements FIDO2/U2F and supports USB, NFC, and extensions.  Extensions
-include SSH, GPG, and cryptocurrency.  Solo is an upgrade to [U2F Zero](https://github.com/conorpp/u2f-zero) and is a work in progress.
+Solo is an open source security key, and you can get one at [solokeys.com](https://solokeys.com).
 
-> Technical documentation for this project is contained in [docs/](https://github.com/SoloKeysSec/solo/tree/master/docs), built with [MkDocs](https://solo.solokeys.io/documenting/) and deployed automatically to <https://solo.solokeys.io>, part of our technical documentation suite hosted at <https://docs.solokeys.io>.
+Solo supports FIDO2 and U2F standards for strong two-factor authentication and password-less login, and it will protect you against phishing and other online attacks. With colored cases and multilingual guides we want to make secure login more personable and accessible to everyone around the globe.
 
-![](https://i.imgur.com/cXWtI1D.png)
-![](https://i.imgur.com/vwFbsQW.png?1)
+<img src="https://solokeys.com/images/photos/hero-on-white-cropped.png" width="600">
 
-The Solo FIDO2/U2F code base is designed to be easily ported to different embedded systems.
-Right now, it has been ported to the NRF52840 and EFM32J.  Soon to be supported is the STM32L442.
+This repo contains the Solo firmware, including implementations of FIDO2 and U2F (CTAP2 and CTAP) over USB and NFC. The main implementation is for STM32L432, and it's ported to NRF52840 and EFM32J.
+
+For development no hardware is needed, Solo also runs as a standalone application for Windows, Linux, and Mac OSX. If you like (or want to learn) hardware instead, you can run Solo on the NUCLEO-L432KC development board, or we make Solo for Hacker, an unlocked version of Solo that lets you customize its firmware.
 
-No hardware is needed for development.  You can run and extend the FIDO2 code base
-using just your PC.
 
 # Security
 
-Solo is based on the STM32L442 microcontroller.  It offers the following security features.
+Solo is based on the STM32L432 microcontroller. It offers the following security features.
 
 - True random number generation to guarantee random keys.
-- Firewall feature for code and secret data isolation.
-- Locked flash
-
-It also has up to 256 KB of memory, meaning it has room for side channel and fault resistant crypto implementations, plus other features.
-
-Each chip ships with a read-only USB bootloader, put in place by ST.  This can be leveraged to completely reset and reprogram the device, to make sure you can trust it's running the right code.  The bootloader can be disabled.
-
-# How do I get one?
-
-We are still working on open sourcing an implementation that anyone can cheaply
-build and program, just like with U2F Zero.  This will be released soon.  It will be easy to solder :)
-
-In the meantime, you can port the code to your favorite microcontroller, or support
-us by [signing up for our Kickstarter](https://solokeys.com/kickstarter).  Our aim is to crowdfund enough to make an economic
-bulk order and provide open source security tokens for everyone that is interested.  We will offer 
-"hackable" tokens that come with USB bootloaders and are reprogrammable.
-
-[Sign up here](https://solokeys.com/kickstarter)!
+- Security isolation so only simple & secure parts of code can handle keys.
+- Flash protection from both external use and untrusted code segments.
+- 256 KB of memory to support hardened crypto implementations and, later, additional features such as OpenPGP or SSH.
+- No NDA needed to develop for.
 
 
-# Setting up
+# Solo for Hackers
 
-Clone solo and build it
+Solo for Hacker is a special version of Solo that let you customize its firmware, for example you can change the LED color, and even build advanced applications.
+
+You can only buy Solo for Hacker at [solokeys.com](https://solokeys.com), as we don't sell it on Amazon and other places to avoid confusing customers. If you buy a Hacker, you can permanently lock it into a regular Solo, but viceversa you can NOT take a regular Solo and turn it a Hacker.
+
+If you have a Solo for Hacker, here's how you can load your own code on it. You can find more details, including how to permanently lock it, in our [documentation](https://docs.solokeys.io/solo/building/).
 
 ```bash
-git clone --recurse-submodules https://github.com/SoloKeysSec/solo
-cd solo/
+git clone --recurse-submodules https://github.com/solokeys/solo
+cd solo
 
-git submodules init
-git submodules update
+cd targets/stm32l432
+make cbor
+make all-hacker
+cd ../..
 
+make env3
+source env3/bin/activate
+python tools/solotool.py program targets/stm32l432/solo.hex
+```
+
+If you forgot the `--recurse-submodules` when cloning, simply `git submodule update --init --recursive`.
+
+For example, if you want to turn off any blue light emission, you can edit [`led_rgb()`](https://github.com/solokeys/solo/blob/master/targets/stm32l432/src/led.c#L15) and force:
+```
+uint32_t b = 0;
+```
+
+Then recompile, load your new firmware, and enjoy a blue-light-free version of Solo.
+
+In the Hacker version, hardware is the same and firmware is unlocked, in the sense that you can 1) load an unsigned application, or 2) entirely reflash the key. By contrast, in a regular Solo you can only upgrade to a firmware signed by SoloKeys, and flash is locked and debug disabled permanently.
+
+A frequently asked question is whether Solo for Hacker is less secure than regular Solo. The answer is certainly yes, and therefore we only recommend to use Solo for Hacker for development, experimentation, and fun. An attacker with physical access to a Solo for Hacker can reflash it following the steps above, and even a malware on your computer could possibly reflash it.
+
+
+# Developing Solo (No Hardware Needed)
+
+Clone Solo and build it
+
+```bash
+git clone --recurse-submodules https://github.com/solokeys/solo
+cd solo
 make all
 ```
 
-This builds our FIDO 2.0 and the U2F authenticator, as well as making a virtualenv in venv/
-that has our python-fido2 fork installed.
+This builds Solo as a standalone application. Solo application is set up to send and recv USB HID messages over UDP to ease development and reduce need for hardware.
 
-Note that our python-fido2 fork will only connect to the software FIDO2 application,
-not a hardware authenticator.  Install Yubico's fork to do that.
+Testing can be done using our fork of Yubico's client software, python-fido2. Our fork of python-fido2 has small changes to make it send USB HID over UDP to the authenticator application. You can install our fork by running the following:
 
+```bash
+cd python-fido2 && python setup.py install
+```
 
-# Testing and development
-
-The application is set up to send and recv USB HID messages over UDP to ease
-development and reduce need for hardware.
-
-Testing can be done using our fork of Yubico's client software, `python-fido2`.  
-Our fork of `python-fido2` has small changes to make it send
-USB HID over UDP to the authenticator application.
-
-Run FIDO 2 / U2F application.
-
+Run the Solo application:
 ```bash
 ./main
 ```
 
-Run example client software.  This runs through a registration and authentication.
-
-```
-./venv/bin/python python-fido2/examples/credential.py
+In another shell, you can run client software, for example our tests:
+```bash
+python tools/ctap_test.py
 ```
 
-Run the FIDO2 tests.
-
-```
-make fido2-test
+Or any client example such as:
+```bash
+python python-fido2/examples/credential.py
 ```
 
-Follow specifications to really dig in.
+You can find more details in our [documentation](https://docs.solokeys.io/solo/), including how to build on the the NUCLEO-L432KC development board.
 
-[https://fidoalliance.org/specs/fido-v2.0-ps-20170927/fido-client-to-authenticator-protocol-v2.0-ps-20170927.html](https://fidoalliance.org/specs/fido-v2.0-ps-20170927/fido-client-to-authenticator-protocol-v2.0-ps-20170927.html)
-
-## Extensions
-
-Extensions can be added to FIDO2/U2F to support things like SSH, GPG, and cryptocurrency.
-Right now, an experimental cryptocurrency extension can be found in `fido2/extensions` and `web/index.html`.
-More documentation to come.
-
-The main goal is to expose an extensible API on Solo, like the following:
-- Command to store private key
-- Command to sign arbitrary hash
-- Command to derive a public key
-- Commands for setting/changing/authenticating a pin code (like in FIDO2)
-- Command to expose entropy from TRNG.
-
-Using these generic commands, various external programs can be implemented for the security key.
-Since FIDO2/U2F are implemented, these programs can potentially work in the browser on desktops
-and mobile devices, with no drivers needed to be installed.
-
-
-## Porting
-
-The main code base is in `fido2/`.  See `targets/nrf52840`, `targets/efm32/src`, and `pc/`
-for examples of FIDO2/U2F ports.  In essence, you just need to reimplement `device.c`.  Optionally you can
-re-implement `crypto.c` to accelerate operations and/or add other security features.
-
-
-More documentation to come.
 
 # Documentation
 
-Check out our [official documentation](https://solo.solokeys.io/).
+Check out our [official documentation](https://docs.solokeys.io/solo/).
+
 
 # Contributors
 
-Contributors are welcome.  The ultimate goal is to have a FIDO 2 hardware token
-capable of USB, Bluetooth, and NFC interfaces.  There could be multiple tokens
-for each interface.
-    
-Look at the issues to see what is currently being worked on.  Feel free to add issues as well.
+Solo is an upgrade to [U2F Zero](https://github.com/conorpp/u2f-zero). It was born from Conor's passion for making secure hardware, and from our shared belief that security should be open to be trustworthy, in hardware like in software.
+
+Contributors are welcome. The ultimate goal is to have a FIDO2 security key supporting USB, NFC, and BLE interfaces, that can run on a variety of MCUs.
+
+Look at the issues to see what is currently being worked on. Feel free to add issues as well.
 
-This is an upgrade to [U2F Zero](https://github.com/conorpp/u2f-zero).
 
 # License
 
-Everything in this repo is open source and licensed under the MIT License.
+Solo is fully open source.
+All software is licensed under GPLv3, and hardware under CC BY-SA 4.0.
+Software and hardware are available under licenses for commercial use. Please contact SoloKeys for more information.
 
+
+# Where To Buy Solo
+
+You can buy Solo, Solo Tap, and Solo for Hackers at [solokeys.com](https://solokeys.com).

docs/building.md

@@ -1,28 +0,0 @@
-To build, develop and debug the firmware for the STM32L442 (WIP!) via cross-compilation on Linux, no vendor-specific software is necessary.
-
-There exists a development board [NUCLEO-L432KC](https://www.st.com/en/evaluation-tools/nucleo-l432kc.html) you can use; the L432 chip differs from the L442 used for Solo only in that it lacks a cryptographic accelerator. The board does contain a debugger, so all you need is a USB cable (and some [udev](/udev) [rules](https://rust-embedded.github.io/book/intro/install/linux.html#udev-rules)).
-
-You will need the following packages (naming given for Arch Linux):
-
-- arm-none-eabi-gcc
-- arm-none-eabi-newlib
-- arm-none-eabi-binutils
-
-and one of
-
-- [openocd](http://openocd.org)
-- [stlink](https://github.com/texane/stlink)
-
-If you remove the `.exe` extensions in the [Makefile](https://github.com/SoloKeysSec/solo/blob/master/targets/stm32l442/Makefile), and possibly add a `-g` flag, compilation runs through.
-
-To flash and step through the code:
-
-* connect the Nucleo to your PC
-* attach one of the debuggers: `st-util` (for stlink), or `openocd -f interface/stlink-v2-1.cfg -f target/stm32l4x.cfg` (for openocd)
-* launch `gdb` via `arm-none-eabi-gdb -q solo.elf`
-* connect gdb to the debugger via `target extended-remote :4242` (for stlink), or `target remote :3333` (for openocd)
-* flash the firmware via `load`
-* optionally set a breakpoint via `break main`
-* `continue`, and start stepping 🙌
-
-Note that the code for `targets/stm32l442` currently consists of only a blinky hello world...

docs/index.md

@@ -1,4 +0,0 @@
-Welcome to the technical documentation for [solokeyssec/solo](https://github.com/solokeyssec/solo).
-
-For now, you can read the repository `README.md`, more documentation to come!
-

docs/repo-readme.md

@@ -1 +0,0 @@
-../README.md

docs/solo/building.md

@@ -0,0 +1,185 @@
+To build, develop and debug the firmware for the STM32L432.  This will work
+for Solo Hacker, the Nucleo development board, or you own homemade Solo.
+
+There exists a development board [NUCLEO-L432KC](https://www.st.com/en/evaluation-tools/nucleo-l432kc.html) you can use;  The board does contain a debugger, so all you need is a USB cable (and some [udev](/udev) [rules](https://rust-embedded.github.io/book/intro/install/linux.html#udev-rules)).
+
+# Prerequisites
+
+Install the [latest ARM compiler toolchain](https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads) for your system.  We recommend getting the latest compilers from ARM.
+
+You can also install the ARM toolchain  using a package manage like `apt-get` or `pacman`,
+but be warned they might be out of date.  Typically it will be called `gcc-arm-none-eabi binutils-arm-none-eabi`.
+
+To program your build, you'll need one of the following programs.
+
+- [openocd](http://openocd.org)
+- [stlink](https://github.com/texane/stlink)
+- [STM32CubeProg](https://www.st.com/en/development-tools/stm32cubeprog.html)
+
+# Compilation
+
+Enter the `stm32l4xx` target directory.
+
+```
+cd targets/stm32l432
+```
+
+Build the cbor library.
+
+```bash
+make cbor
+```
+
+Now build Solo.
+
+```
+make build-hacker
+```
+
+The `build-hacker` recipe does a few things.  First it builds the bootloader, with
+signature checking disabled.  Then it builds the Solo application with "hacker" features
+enabled, like being able to jump to the bootloader on command.  It then merges bootloader
+and solo builds into the same binary.  I.e. it combines `bootloader.hex` and `solo.hex`
+into `all.hex`.
+
+If you're just planning to do development, please don't try to reprogram the bootloader,
+as this can be risky if done often.  Just use `solo.hex`.
+
+### Building with debug messages
+
+If you're developing, you probably want to see debug messages!  Solo has a USB
+Serial port that it will send debug messages through (from `printf`).  You can read them using
+a normal serial terminal like `picocom` or `putty`.
+
+Just add `DEBUG=1` or `DEBUG=2` to your build recipe, like this.
+
+```
+make build-hacker DEBUG=1
+```
+
+If you use `DEBUG=2`, that means Solo will not boot until something starts reading
+it's debug messages.  So it basically it waits to tether to a serial terminal so that you don't
+miss any debug messages.
+
+We recommend using our `solotool.py` as a serial emulator since it will automatically
+reconnect each time you program Solo.
+
+```
+python tools/solotool.py monitor <serial-port>
+```
+
+#### Linux Users:
+
+[See issue 62](https://github.com/solokeys/solo/issues/62).
+
+### Building a Solo release
+
+If you want to build a release of Solo, we recommend trying a Hacker build first
+just to make sure that it's working.  Otherwise it may not be as easy or possible to
+fix any mistakes.
+
+If you're ready to program a full release, run this recipe to build.
+
+```
+make build-release-locked
+```
+
+Programming `all.hex` will cause the device to permanently lock itself.
+
+
+# Programming
+
+It's recommended to test a debug/hacker build first to make sure Solo is working as expected.
+Then you can switch to a locked down build, which cannot be reprogrammed as easily (or not at all!).
+
+We recommend using our `solotool.py` to manage programming.  It is cross platform.  First you must
+install the prerequisites:
+
+```
+pip3 install -r tools/requirements.txt
+```
+
+If you're on Windows, you must also install [libusb](https://sourceforge.net/projects/libusb-win32/files/libusb-win32-releases/1.2.6.0/).
+
+## Pre-programmed Solo Hacker
+
+If your Solo device is already programmed (it flashes green when powered), we recommend
+programming it using the Solo bootloader.
+
+```
+python tools/solotool.py program solo.hex
+```
+
+Make sure to program `solo.hex` and not `all.hex`.  Nothing bad would happen, but you'd
+see errors.
+
+If something bad happens, you can always boot the Solo bootloader by doing the following.
+
+1. Unplug device.
+2. Hold down button.
+3. Plug in device while holding down button.
+4. Wait about 2 seconds for flashing yellow light.  Release button.
+
+If you hold the button for an additional 5 seconds, it will boot to the ST DFU (device firmware update).
+Don't use the ST DFU unless you know what you're doing.
+
+## ST USB DFU
+
+If your Solo has never been programmed, it will boot the ST USB DFU.  The LED is turned
+off and it enumerates as "STM BOOTLOADER".
+
+You can program it by running the following.
+
+```
+python tools/solotool.py program all.hex --use-dfu --detach
+```
+
+Make sure to program `all.hex`, as this contains both the bootloader and the Solo application.
+
+If all goes well, you should see a slow-flashing green light.
+
+##  Solo Hacker vs Solo
+
+A Solo hacker device doesn't need to be in bootloader mode to be programmed, it will automatically switch.
+
+Solo (locked) needs the button to be held down when plugged in to boot to the bootloader.
+
+A locked Solo will only accept signed updates.
+
+## Signed updates
+
+If this is not a device with a hacker build, you can only program signed updates.
+
+```
+python tools/solotool.py program /path/to/firmware.json
+```
+
+If you've provisioned the Solo bootloader with your own secp256r1 public key, you can sign your
+firmware by running the following command.
+
+```
+python tools/solotool.py sign /path/to/signing-key.pem /path/to/solo.hex /output-path/to/firmware.json
+```
+
+If your Solo isn't locked, you can always reprogram it using a debugger connected directly
+to the token.
+
+# Permanently locking the device
+
+If you plan to be using your Solo for real, you should lock it permanently.  This prevents
+someone from connecting a debugger to your token and stealing credentials.
+
+To do this, build the locked release firmware.
+```
+make build-release-locked
+```
+
+Now when you program `all.hex`, the device will lock itself when it first boots.  You can only update it
+with signed updates.
+
+If you'd like to also permanently disable signed updates, plug in your programmed Solo and run the following:
+
+```
+# WARNING: No more signed updates.
+python tools/programmer.py --disable
+```

docs/solo/contributing.md

@@ -1,14 +1,14 @@
 We are very open to contributions!
 
-[Currently](https://github.com/solokeyssec/solo/issues), most work will go towards
+[Currently](https://github.com/solokeys/solo/issues), most work will go towards
 
-* implementing STM32L442
+* implementing STM32L432
 * implementing NFC
 * adding documentation and improving accessability of the code
 
-In the future, we would love to see creative plugins/extensions, putting the TRNG and other features of the STM32L442 to good use! 
+In the future, we would love to see creative plugins/extensions, putting the TRNG and other features of the STM32L432 to good use! 
 
-Feel free to send a [pull request](https://github.com/SoloKeysSec/solo/pulls) at any time, we don't currently have a formal contribution process.
+Feel free to send a [pull request](https://github.com/solokeys/solo/pulls) at any time, we don't currently have a formal contribution process.
 
 If you want to discuss your plans in quasi-realtime beforehand, you can also join our [solokeys.public](https://keybase.io/team/solokeys.public) Keybase team.
 

docs/solo/documenting.md

@@ -6,6 +6,6 @@ To host or develop locally:
 pip install mkdocs mkdocs-material
 ```
 
-`make docsrv` and visit [localhost:8000](http://localhost:8000).
+`mkdocs serve` and visit [localhost:8000](http://localhost:8000).
 
 The file `runtime.txt` is necessary to tell Netlify to use Python3.

docs/solo/fido2-impl.md

@@ -21,7 +21,7 @@ When you register a service with a FIDO2 or U2F authenticator, the
 authenticator must generate a new keypair unique to that service.  This keypair
 could be stored on the authenticator to be used in subsequent authentications,
 but now a certain amount of memory needs to be allocated for this.  On embedded
-devices, there isn't much memory to spare and users will allows frustratingly
+devices, there isn't much memory to spare and users will always frustratingly
 hit the limit of this memory.
 
 The answer to this problem is to do key wrapping.  The authenticator just

docs/solo/index.md

@@ -0,0 +1,4 @@
+Welcome to the technical documentation for [solokeys/solo](https://github.com/solokeys/solo).
+
+For now, you can read the repository `README.md`, more documentation to come!
+

docs/solo/repo-readme.md

@@ -0,0 +1 @@
+../../README.md

docs/solo/signed-updates.md

@@ -2,7 +2,7 @@
 Solo has a bootloader that's fixed in memory to allow for signed firmware updates.  It is not a built-in bootloader provided by the chip
 manufacturer, it is our own. We plan to use Ed25519 signatures, which have [efficient constant-time implementations on Cortex-M4 chips](http://www.cs.haifa.ac.il/~orrd/LC17/paper39.pdf).
 
-On the STM32L442, there is 256 KB of memory.  The first 14 KB of memory is reserved for the bootloader.
+On the STM32L432, there is 256 KB of memory.  The first 14 KB of memory is reserved for the bootloader.
 The bootloader is the first thing that boots, and if the button of the device is not held for 2 seconds, the
 application is immediately booted.
 

docs/solo/udev.md

@@ -1,10 +1,13 @@
 # tl;dr
 
-Create `/etc/udev/fido.rules` and add the following.
+Create [`/etc/udev/99-solo.rules`](https://github.com/solokeys/solo/blob/master/99-solo.rules) and add the following (which assumes your user is in group `plugdev`):
 
 ```
+# Solo
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a2ca", TAG+="uaccess", GROUP="plugdev", SYMLINK+="solokey"
+
 # U2F Zero
-KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="8acf", TAG+="uaccess"
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="8acf", TAG+="uaccess", GROUP="plugdev", SYMLINK+="u2fzero"
 ```
 
 Then run
@@ -30,13 +33,13 @@ You can either compare `ls /dev` before and after inserting, or use the `udevadm
 ```
 udevadm monitor --environment --udev | grep DEVNAME
 ```
-Typically, you will detect `/dev/hidraw0`.
+Typically, you will detect `/dev/hidraw0`. Using the symlinks above, you can follow symlinks from `/dev/solokey` and `/dev/u2fzero`.
 
 ## How do you know if your system is configured correctly?
 Try reading and writing to the device node you identified in the previous step. Assuming the node is called `/dev/hidraw0`:
 
-* read: try `cat /dev/hidraw0`, if you don't get "permission denied", you can access.
-* write: try `echo "hello, Solo" > /dev/hidraw0`. Again, if you don't get denied permission, you're OK.
+* read: try `cat /dev/solokey`, if you don't get "permission denied", you can access.
+* write: try `echo "hello, Solo" > /dev/solokey`. Again, if you don't get denied permission, you're OK.
 
 ## Which rule should I use, and how do I do it?
 Simplest is probably to copy [Yubico's rule file](https://github.com/Yubico/libu2f-host/blob/master/70-u2f.rules) to `/etc/udev/rules.d/fido.rules` on your system, for instance:
@@ -60,7 +63,10 @@ udevadm trigger
 ```
 
 ## What about vendor and product ID for Solo?
-Current prototypes reuse the IDs of the U2F Zero (10c4/8acf). The final Solo will probably be assigned new IDs; read about it here first :)
+| Key | Vendor ID | Product ID |
+| --- | --- | --- |
+| Solo | 10c4 | 8acf |
+| U2F Zero | 0483 | a2ca |
 
 ## You got this all wrong, I can't believe it!
-Are you suffering from [us being wrong](https://xkcd.com/386/)? Please, send us a [pull request](https://github.com/SoloKeysSec/solo/pulls) and prove us wrong :D
+Are you suffering from [us being wrong](https://xkcd.com/386/)? Please, send us a [pull request](https://github.com/solokeys/solo/pulls) and prove us wrong :D

fido2/cose_key.h

@@ -1,24 +1,24 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #ifndef _COSE_KEY_H
 #define _COSE_KEY_H
 

fido2/crypto.c

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 /*
  *  Wrapper for crypto implementation on device
  *
@@ -18,7 +39,8 @@
 #include "aes.h"
 #include "ctap.h"
 #include "device.h"
-#include "app.h"
+#include "log.h"
+#include APP_CONFIG
 
 #ifdef USING_PC
 typedef enum
@@ -104,7 +126,7 @@ void crypto_sha256_hmac_init(uint8_t * key, uint32_t klen, uint8_t * hmac)
 
     if(klen > 64)
     {
-        printf("Error, key size must be <= 64\n");
+        printf2(TAG_ERR,"Error, key size must be <= 64\n");
         exit(1);
     }
 
@@ -134,7 +156,7 @@ void crypto_sha256_hmac_final(uint8_t * key, uint32_t klen, uint8_t * hmac)
 
     if(klen > 64)
     {
-        printf("Error, key size must be <= 64\n");
+        printf2(TAG_ERR,"Error, key size must be <= 64\n");
         exit(1);
     }
     memmove(buf, key, klen);
@@ -168,7 +190,7 @@ void crypto_ecc256_sign(uint8_t * data, int len, uint8_t * sig)
 {
     if ( uECC_sign(_signing_key, data, len, sig, _es256_curve) == 0)
     {
-        printf("error, uECC failed\n");
+        printf2(TAG_ERR,"error, uECC failed\n");
         exit(1);
     }
 }
@@ -205,19 +227,19 @@ void crypto_ecdsa_sign(uint8_t * data, int len, uint8_t * sig, int MBEDTLS_ECP_I
             if (_key_len != 32)  goto fail;
             break;
         default:
-            printf("error, invalid ECDSA alg specifier\n");
+            printf2(TAG_ERR,"error, invalid ECDSA alg specifier\n");
             exit(1);
     }
 
     if ( uECC_sign(_signing_key, data, len, sig, curve) == 0)
     {
-        printf("error, uECC failed\n");
+        printf2(TAG_ERR,"error, uECC failed\n");
         exit(1);
     }
     return;
 
 fail:
-    printf("error, invalid key length\n");
+    printf2(TAG_ERR,"error, invalid key length\n");
     exit(1);
 
 }
@@ -257,7 +279,7 @@ void crypto_ecc256_make_key_pair(uint8_t * pubkey, uint8_t * privkey)
 {
     if (uECC_make_key(pubkey, privkey, _es256_curve) != 1)
     {
-        printf("Error, uECC_make_key failed\n");
+        printf2(TAG_ERR,"Error, uECC_make_key failed\n");
         exit(1);
     }
 }
@@ -266,7 +288,7 @@ void crypto_ecc256_shared_secret(const uint8_t * pubkey, const uint8_t * privkey
 {
     if (uECC_shared_secret(pubkey, privkey, shared_secret, _es256_curve) != 1)
     {
-        printf("Error, uECC_shared_secret failed\n");
+        printf2(TAG_ERR,"Error, uECC_shared_secret failed\n");
         exit(1);
     }
 

fido2/crypto.h

@@ -1,24 +1,24 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #ifndef _CRYPTO_H
 #define _CRYPTO_H
 

fido2/ctap.c

@@ -1,24 +1,24 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ *
+ * This file is part of Solo.
+ *
+ * Solo 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.
+ *
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ *
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -34,7 +34,7 @@
 #include "util.h"
 #include "log.h"
 #include "device.h"
-#include "app.h"
+#include APP_CONFIG
 #include "wallet.h"
 
 #include "device.h"
@@ -1030,7 +1030,8 @@ uint8_t ctap_get_assertion(CborEncoder * encoder, uint8_t * request, int length)
     }
 
     printf1(TAG_GA,"resulting order of creds:\n");
-    for (int j = 0; j < GA.credLen; j++)
+    int j;
+    for (j = 0; j < GA.credLen; j++)
     {
         printf1(TAG_GA,"CRED ID (# %d)\n", GA.creds[j].credential.id.count);
     }
@@ -1368,13 +1369,11 @@ uint8_t ctap_request(uint8_t * pkt_raw, int length, CTAP_RESPONSE * resp)
     length--;
 
     uint8_t * buf = resp->data;
-    printf1(TAG_GREEN, "lastcmd0 = 0x%02x\r\n", getAssertionState.lastcmd);
 
     cbor_encoder_init(&encoder, buf, resp->data_size, 0);
 
     printf1(TAG_CTAP,"cbor input structure: %d bytes\n", length);
     printf1(TAG_DUMP,"cbor req: "); dump_hex1(TAG_DUMP, pkt_raw, length);
-    printf1(TAG_GREEN, "lastcmd1 = 0x%02x\r\n", getAssertionState.lastcmd);
 
     switch(cmd)
     {
@@ -1465,7 +1464,7 @@ uint8_t ctap_request(uint8_t * pkt_raw, int length, CTAP_RESPONSE * resp)
             else
             {
                 printf2(TAG_ERR, "unwanted GET_NEXT_ASSERTION.  lastcmd == 0x%02x\n", getAssertionState.lastcmd);
-                dump_hex1(TAG_GREEN, &getAssertionState, sizeof(getAssertionState));
+                dump_hex1(TAG_GREEN, (uint8_t*)&getAssertionState, sizeof(getAssertionState));
                 status = CTAP2_ERR_NOT_ALLOWED;
             }
             break;
@@ -1477,7 +1476,6 @@ uint8_t ctap_request(uint8_t * pkt_raw, int length, CTAP_RESPONSE * resp)
 done:
     device_set_status(CTAPHID_STATUS_IDLE);
     getAssertionState.lastcmd = cmd;
-    printf1(TAG_GREEN, "lastcmd = 0x%02x\r\n", getAssertionState.lastcmd);
 
     if (status != CTAP1_ERR_SUCCESS)
     {

fido2/ctap.h

@@ -1,24 +1,24 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #ifndef _CTAP_H
 #define _CTAP_H
 

fido2/ctap_errors.h

@@ -1,24 +1,24 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #define CTAP1_ERR_SUCCESS                   0x00
 #define CTAP1_ERR_INVALID_COMMAND           0x01
 #define CTAP1_ERR_INVALID_PARAMETER         0x02

fido2/ctap_parse.c

@@ -1,24 +1,24 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #include <stdint.h>
 
 #include "cbor.h"

fido2/ctap_parse.h

@@ -1,24 +1,24 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #ifndef _CTAP_PARSE_H
 #define _CTAP_PARSE_H
 

fido2/ctaphid.c

@@ -1,24 +1,24 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -30,7 +30,8 @@
 #include "time.h"
 #include "util.h"
 #include "log.h"
-#include "app.h"
+#include "extensions.h"
+#include APP_CONFIG
 
 typedef enum
 {
@@ -608,6 +609,8 @@ uint8_t ctaphid_handle_packet(uint8_t * pkt_raw)
 
             ctaphid_write_buffer_init(&wb);
 
+            device_wink();
+
             wb.cid = cid;
             wb.cmd = CTAPHID_WINK;
 
@@ -682,6 +685,56 @@ uint8_t ctaphid_handle_packet(uint8_t * pkt_raw)
             printf1(TAG_HID,"CTAPHID_CANCEL\n");
             is_busy = 0;
             break;
+#if defined(IS_BOOTLOADER)
+        case CTAPHID_BOOT:
+            printf1(TAG_HID,"CTAPHID_BOOT\n");
+            ctap_response_init(&ctap_resp);
+            u2f_set_writeback_buffer(&ctap_resp);
+            is_busy = bootloader_bridge(len, ctap_buffer);
+
+            ctaphid_write_buffer_init(&wb);
+            wb.cid = cid;
+            wb.cmd = CTAPHID_BOOT;
+            wb.bcnt = (ctap_resp.length + 1);
+            ctaphid_write(&wb, &is_busy, 1);
+            ctaphid_write(&wb, ctap_resp.data, ctap_resp.length);
+            ctaphid_write(&wb, NULL, 0);
+            is_busy = 0;
+        break;
+#endif
+#if defined(SOLO_HACKER)
+        case CTAPHID_ENTERBOOT:
+            printf1(TAG_HID,"CTAPHID_ENTERBOOT\n");
+            boot_solo_bootloader();
+            ctaphid_write_buffer_init(&wb);
+            wb.cid = cid;
+            wb.cmd = CTAPHID_ENTERBOOT;
+            wb.bcnt = 0;
+            ctaphid_write(&wb, NULL, 0);
+            is_busy = 0;
+        break;
+        case CTAPHID_ENTERSTBOOT:
+            printf1(TAG_HID,"CTAPHID_ENTERBOOT\n");
+            boot_st_bootloader();
+        break;
+#endif
+#if !defined(IS_BOOTLOADER)
+        case CTAPHID_GETRNG:
+            printf1(TAG_HID,"CTAPHID_GETRNG\n");
+            ctap_response_init(&ctap_resp);
+            ctaphid_write_buffer_init(&wb);
+            wb.cid = cid;
+            wb.cmd = CTAPHID_GETRNG;
+            wb.bcnt = ctap_buffer[0];
+            if (!wb.bcnt)
+                wb.bcnt = 57;
+            memset(ctap_buffer,0,wb.bcnt);
+            ctap_generate_rng(ctap_buffer, wb.bcnt);
+            ctaphid_write(&wb, &ctap_buffer, wb.bcnt);
+            ctaphid_write(&wb, NULL, 0);
+            is_busy = 0;
+        break;
+#endif
         default:
             printf2(TAG_ERR,"error, unimplemented HID cmd: %02x\r\n", buffer_cmd());
             ctaphid_send_error(cid, CTAP1_ERR_INVALID_COMMAND);

fido2/ctaphid.h

@@ -1,24 +1,24 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #ifndef _CTAPHID_H_H
 #define _CTAPHID_H_H
 
@@ -38,6 +38,12 @@
 #define CTAPHID_ERROR        (TYPE_INIT | 0x3f)
 #define CTAPHID_KEEPALIVE    (TYPE_INIT | 0x3b)
 
+// Custom commands between 0x40-0x7f
+#define CTAPHID_BOOT            (TYPE_INIT | 0x50)
+#define CTAPHID_ENTERBOOT       (TYPE_INIT | 0x51)
+#define CTAPHID_ENTERSTBOOT     (TYPE_INIT | 0x52)
+#define CTAPHID_GETRNG          (TYPE_INIT | 0x60)
+
     #define ERR_INVALID_CMD         0x01
     #define ERR_INVALID_PAR         0x02
     #define ERR_INVALID_SEQ         0x04

fido2/device.h

@@ -1,24 +1,24 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #ifndef _DEVICE_H
 #define _DEVICE_H
 
@@ -45,6 +45,7 @@ void main_loop_delay();
 
 void heartbeat();
 
+
 void authenticator_read_state(AuthenticatorState * );
 
 void authenticator_read_backup_state(AuthenticatorState * );
@@ -62,6 +63,9 @@ void device_manage();
 // A timer should be set up to call `ctaphid_update_status`
 void device_set_status(int status);
 
+// Returns if button is currently pressed
+int device_is_button_pressed();
+
 // Test for user presence
 // Return 1 for user is present, 0 user not present, -1 if cancel is requested.
 extern int ctap_user_presence_test();
@@ -90,4 +94,12 @@ void ctap_store_rk(int index,CTAP_residentKey * rk);
 void ctap_load_rk(int index,CTAP_residentKey * rk);
 void ctap_overwrite_rk(int index,CTAP_residentKey * rk);
 
+// For Solo hacker
+void boot_solo_bootloader();
+void boot_st_bootloader();
+
+// HID wink command
+void device_wink();
+
+
 #endif

fido2/extensions/extensions.c

@@ -1,31 +1,90 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #include <stdint.h>
 #include "extensions.h"
 #include "u2f.h"
 #include "wallet.h"
+#include "device.h"
 
 #include "log.h"
 
+#define htonl(x)    (((x & 0xff) << 24) | ((x & 0xff00) << 8) \
+                    | ((x & 0xff0000) >> 8) | ((x & 0xff000000) >> 24) )
+
+int is_extension_request(uint8_t * kh, int len)
+{
+    wallet_request * req = (wallet_request *) kh;
+
+    if (len < WALLET_MIN_LENGTH)
+        return 0;
+
+    return memcmp(req->tag, WALLET_TAG, sizeof(WALLET_TAG)-1) == 0;
+}
+
+
+int extension_needs_atomic_count(uint8_t klen, uint8_t * keyh)
+{
+    return ((wallet_request *) keyh)->operation == WalletRegister
+            || ((wallet_request *) keyh)->operation == WalletSign;
+}
+
+int16_t bridge_u2f_to_extensions(uint8_t * _chal, uint8_t * _appid, uint8_t klen, uint8_t * keyh)
+{
+    int8_t ret = 0;
+    uint32_t count;
+    uint8_t up = 1;
+    uint8_t sig[72];
+    if (extension_needs_atomic_count(klen, keyh))
+    {
+        count = htonl(ctap_atomic_count(0));
+    }
+    else
+    {
+        count = htonl(10);
+    }
+
+    u2f_response_writeback(&up,1);
+    u2f_response_writeback((uint8_t *)&count,4);
+    u2f_response_writeback((uint8_t *)&ret,1);
+#ifdef IS_BOOTLOADER
+    ret = bootloader_bridge(klen, keyh);
+#elif  defined(WALLET_EXTENSION)
+    ret = bridge_u2f_to_wallet(_chal, _appid, klen, keyh);
+#endif
+
+    if (ret != 0)
+    {
+        u2f_reset_response();
+        u2f_response_writeback(&up,1);
+        u2f_response_writeback((uint8_t *)&count,4);
+
+        memset(sig,0,sizeof(sig));
+        sig[0] = ret;
+        u2f_response_writeback(sig,72);
+    }
+
+    return U2F_SW_NO_ERROR;
+}
+
 int16_t extend_u2f(struct u2f_request_apdu* req, uint32_t len)
 {
 
@@ -37,7 +96,7 @@ int16_t extend_u2f(struct u2f_request_apdu* req, uint32_t len)
         if (req->p1 == U2F_AUTHENTICATE_CHECK)
         {
 
-            if (is_wallet_device((uint8_t *) &auth->kh, auth->khl))     // Pin requests
+            if (is_extension_request((uint8_t *) &auth->kh, auth->khl))     // Pin requests
             {
                 rcode =  U2F_SW_CONDITIONS_NOT_SATISFIED;
             }
@@ -45,23 +104,25 @@ int16_t extend_u2f(struct u2f_request_apdu* req, uint32_t len)
             {
                 rcode =  U2F_SW_WRONG_DATA;
             }
-            printf1(TAG_WALLET,"Ignoring U2F request\n");
+            printf1(TAG_EXT,"Ignoring U2F request\n");
+            dump_hex1(TAG_EXT, (uint8_t *) &auth->kh, auth->khl);
             goto end;
         }
         else
         {
-            if ( ! is_wallet_device((uint8_t *) &auth->kh, auth->khl))     // Pin requests
+            if ( ! is_extension_request((uint8_t *) &auth->kh, auth->khl))     // Pin requests
             {
                 rcode = U2F_SW_WRONG_PAYLOAD;
-                printf1(TAG_WALLET,"Ignoring U2F request\n");
+                printf1(TAG_EXT, "Ignoring U2F request\n");
+                dump_hex1(TAG_EXT, (uint8_t *) &auth->kh, auth->khl);
                 goto end;
             }
-            rcode = bridge_u2f_to_wallet(auth->chal, auth->app, auth->khl, (uint8_t*)&auth->kh);
+            rcode = bridge_u2f_to_extensions(auth->chal, auth->app, auth->khl, (uint8_t*)&auth->kh);
         }
     }
     else if (req->ins == U2F_VERSION)
     {
-        printf1(TAG_U2F, "U2F_VERSION\n");
+        printf1(TAG_EXT, "U2F_VERSION\n");
         if (len)
         {
             rcode = U2F_SW_WRONG_LENGTH;

fido2/extensions/extensions.h

@@ -1,28 +1,30 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #ifndef EXTENSIONS_H_
 #define EXTENSIONS_H_
 #include "u2f.h"
 
 int16_t extend_u2f(struct u2f_request_apdu* req, uint32_t len);
 
+int bootloader_bridge(int klen, uint8_t * keyh);
+
 #endif /* EXTENSIONS_H_ */

fido2/extensions/wallet.c

@@ -1,26 +1,26 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #include "wallet.h"
-#include "app.h"
+#include APP_CONFIG
 #include "ctap.h"
 #include "ctap_errors.h"
 #include "crypto.h"
@@ -52,26 +52,6 @@ typedef enum
 #endif
 
 
-typedef enum
-{
-    WalletSign = 0x10,
-    WalletRegister = 0x11,
-    WalletPin = 0x12,
-    WalletReset= 0x13,
-    WalletVersion= 0x14,
-    WalletRng = 0x15,
-} WalletOperation;
-
-int is_wallet_device(uint8_t * kh, int len)
-{
-    wallet_request * req = (wallet_request *) kh;
-
-    if (len < WALLET_MIN_LENGTH)
-        return 0;
-
-    return memcmp(req->tag, WALLET_TAG, sizeof(WALLET_TAG)-1) == 0;
-}
-
 // return 1 if hash is valid, 0 otherwise
 int check_pinhash(uint8_t * pinAuth, uint8_t * msg, uint8_t len)
 {
@@ -200,8 +180,7 @@ int16_t bridge_u2f_to_wallet(uint8_t * _chal, uint8_t * _appid, uint8_t klen, ui
     int reqlen = klen;
     int i;
     int8_t ret = 0;
-    uint32_t count;
-    uint8_t up = 1;
+
     uint8_t sig[200];
 
     uint8_t * args[5] = {NULL,NULL,NULL,NULL,NULL};
@@ -222,21 +201,6 @@ int16_t bridge_u2f_to_wallet(uint8_t * _chal, uint8_t * _appid, uint8_t klen, ui
 
     printf1(TAG_WALLET, "u2f2wallet [%d]: ",reqlen); dump_hex1(TAG_WALLET, msg_buf,reqlen);
 
-    if (req->operation == WalletRegister || req->operation == WalletSign)
-    {
-        count = ctap_atomic_count(0);
-    }
-    else
-    {
-        count = 10;
-    }
-
-    u2f_response_writeback(&up,1);
-    u2f_response_writeback((uint8_t *)&count,4);
-    u2f_response_writeback((uint8_t *)&ret,1);
-
-#ifndef IS_BOOTLOADER
-
     int offset = 0;
     for (i = 0; i < MIN(5,req->numArgs); i++)
     {
@@ -348,8 +312,6 @@ int16_t bridge_u2f_to_wallet(uint8_t * _chal, uint8_t * _appid, uint8_t klen, ui
             memmove(chksum, args[0] + lens[0] - 4, 4);
             lens[0] -= 4;
 
-            /*printf("chksum: "); dump_hex1(TAG_WALLET, chksum, 4);*/
-
             // perform integrity check
             /*printf1(TAG_WALLET,"shasum on [%d]: ",lens[0]); dump_hex1(TAG_WALLET, args[0], lens[0]);*/
             crypto_sha256_init();
@@ -466,24 +428,8 @@ int16_t bridge_u2f_to_wallet(uint8_t * _chal, uint8_t * _appid, uint8_t klen, ui
             ret = CTAP1_ERR_INVALID_COMMAND;
             break;
     }
-#else
-    ret = bootloader_bridge(klen, keyh);
-#endif
 
 cleanup:
-    if (ret != 0)
-    {
-        u2f_reset_response();
-        u2f_response_writeback(&up,1);
-        u2f_response_writeback((uint8_t *)&count,4);
 
-        memset(sig,0,sizeof(sig));
-        sig[0] = ret;
-        u2f_response_writeback(sig,72);
-    }
-    else
-    {
-        /*u2f_response_writeback(sig,sizeof(sig));*/
-    }
-    return U2F_SW_NO_ERROR;
+    return ret;
 }

fido2/extensions/wallet.h

@@ -1,25 +1,24 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
-
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #ifndef WALLET_H_
 #define WALLET_H_
 
@@ -92,10 +91,21 @@ typedef struct
 }__attribute__((packed)) wallet_request;
 
 
-int16_t bridge_u2f_to_wallet(uint8_t * chal, uint8_t * appid, uint8_t klen, uint8_t * keyh);
+typedef enum
+{
+    WalletSign = 0x10,
+    WalletRegister = 0x11,
+    WalletPin = 0x12,
+    WalletReset= 0x13,
+    WalletVersion= 0x14,
+    WalletRng = 0x15,
+} WalletOperation;
+
+
+int16_t bridge_u2f_to_extensions(uint8_t * chal, uint8_t * appid, uint8_t klen, uint8_t * keyh);
 
 // return 1 if request is a wallet request
-int is_wallet_device(uint8_t * req, int len);
+int is_extension_request(uint8_t * req, int len);
 
 void wallet_init();
 

fido2/log.c

@@ -1,36 +1,41 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include "log.h"
 #include "util.h"
 
+#if DEBUG_LEVEL > 0
+
 static uint32_t LOGMASK = TAG_FILENO;
 
+
 void set_logging_mask(uint32_t mask)
 {
     LOGMASK = mask;
 }
+
+
 struct logtag
 {
     uint32_t tagn;
@@ -55,6 +60,8 @@ struct logtag tagtable[] = {
     {TAG_TIME,"TIME"},
     {TAG_WALLET,"WALLET"},
     {TAG_STOR,"STOR"},
+    {TAG_BOOT,"BOOT"},
+    {TAG_BOOT,"EXT"},
 };
 
 
@@ -107,3 +114,4 @@ void LOG_HEX(uint32_t tag, uint8_t * data, int length)
     set_logging_tag(tag);
     dump_hex(data,length);
 }
+#endif

fido2/log.h

@@ -1,28 +1,28 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #ifndef _LOG_H
 #define _LOG_H
 
-#include "app.h"
+#include APP_CONFIG
 #include <stdint.h>
 
 #ifndef DEBUG_LEVEL
@@ -33,7 +33,7 @@
 
 void LOG(uint32_t tag, const char * filename, int num, const char * fmt, ...);
 void LOG_HEX(uint32_t tag, uint8_t * data, int length);
-void set_logging_mask(uint32_t mask);
+
 void set_logging_tag(uint32_t tag);
 
 typedef enum
@@ -55,12 +55,15 @@ typedef enum
     TAG_WALLET = (1 << 14),
     TAG_STOR = (1 << 15),
     TAG_DUMP2 = (1 << 16),
+    TAG_BOOT = (1 << 17),
+    TAG_EXT = (1 << 17),
 
     TAG_FILENO = (1<<31)
 } LOG_TAG;
 
-#if DEBUG_LEVEL == 1
+#if DEBUG_LEVEL > 0
 
+void set_logging_mask(uint32_t mask);
 #define printf1(tag,fmt, ...) LOG(tag & ~(TAG_FILENO), NULL, 0, fmt, ##__VA_ARGS__)
 #define printf2(tag,fmt, ...) LOG(tag | TAG_FILENO,__FILE__, __LINE__, fmt, ##__VA_ARGS__)
 #define printf3(tag,fmt, ...) LOG(tag | TAG_FILENO,__FILE__, __LINE__, fmt, ##__VA_ARGS__)
@@ -69,6 +72,7 @@ typedef enum
 
 #else
 
+#define set_logging_mask(mask)
 #define printf1(fmt, ...)
 #define printf2(fmt, ...)
 #define printf3(fmt, ...)

fido2/main.c

@@ -1,24 +1,24 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -30,7 +30,7 @@
 #include "util.h"
 #include "log.h"
 #include "ctap.h"
-#include "app.h"
+#include APP_CONFIG
 
 #if !defined(TEST)
 
@@ -61,11 +61,15 @@ int main(int argc, char * argv[])
     device_init();
     printf1(TAG_GEN,"init device\n");
 
-    printf1(TAG_GEN,"init ctaphid\n");
-    ctaphid_init();
+    usbhid_init();
+    printf1(TAG_GEN,"init usb\n");
+
+
+    ctaphid_init();
+    printf1(TAG_GEN,"init ctaphid\n");
 
-    printf1(TAG_GEN,"init ctap\n");
     ctap_init();
+    printf1(TAG_GEN,"init ctap\n");
 
     memset(hidmsg,0,sizeof(hidmsg));
 
@@ -74,9 +78,8 @@ int main(int argc, char * argv[])
 
     while(1)
     {
-        if (millis() - t1 > 100)
+        if (millis() - t1 > HEARTBEAT_PERIOD)
         {
-            /*printf("heartbeat %ld\n", beat++);*/
             heartbeat();
             t1 = millis();
         }

fido2/storage.h

@@ -1,24 +1,24 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #ifndef _STORAGE_H
 #define _STORAGE_H
 

fido2/stubs.c

@@ -1,24 +1,24 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #include <stdio.h>
 #include "device.h"
 #include "util.h"
@@ -31,18 +31,18 @@
 
 void ctap_init()
 {
-    printf("STUB: ctap_init\n");
+    printf1(TAG_GEN,"STUB: ctap_init\n");
 }
 #endif
 
 #if defined(STUB_CTAPHID)
 void ctaphid_init()
 {
-    printf("STUB: ctaphid_init\n");
+    printf1(TAG_GEN,"STUB: ctaphid_init\n");
 }
 void ctaphid_handle_packet(uint8_t * hidmsg)
 {
-    printf("STUB: ctaphid_handle_packet\n");
+    printf1(TAG_GEN,"STUB: ctaphid_handle_packet\n");
 }
 
 void ctaphid_check_timeouts()
@@ -57,7 +57,7 @@ void ctaphid_check_timeouts()
 
 void ctap_reset_state()
 {
-    printf("STUB: ctap_reset_state\n");
+    printf1(TAG_GEN,"STUB: ctap_reset_state\n");
 }
 
 void ctap_response_init(CTAP_RESPONSE * resp)
@@ -66,12 +66,12 @@ void ctap_response_init(CTAP_RESPONSE * resp)
 
 void u2f_request(struct u2f_request_apdu* req, CTAP_RESPONSE * resp)
 {
-    printf("STUB: u2f_request\n");
+    printf1(TAG_GEN,"STUB: u2f_request\n");
 }
 
 uint8_t ctap_request(uint8_t * pkt_raw, int length, CTAP_RESPONSE * resp)
 {
-    printf("STUB: ctap_request\n");
+    printf1(TAG_GEN,"STUB: ctap_request\n");
     return 0;
 }
 #endif

fido2/test_power.c

@@ -1,25 +1,25 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
-#include "app.h"
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
+#include APP_CONFIG 
 #ifdef TEST_POWER
 
 /*

fido2/u2f.c

@@ -1,24 +1,24 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ *
+ * This file is part of Solo.
+ *
+ * Solo 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.
+ *
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ *
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #include <stdlib.h>
 #include "u2f.h"
 #include "ctap.h"
@@ -26,7 +26,7 @@
 #include "log.h"
 #include "device.h"
 #include "wallet.h"
-#include "app.h"
+#include APP_CONFIG
 
 // void u2f_response_writeback(uint8_t * buf, uint8_t len);
 static int16_t u2f_register(struct u2f_register_request * req);
@@ -34,6 +34,7 @@ static int16_t u2f_authenticate(struct u2f_authenticate_request * req, uint8_t c
 int8_t u2f_response_writeback(const uint8_t * buf, uint16_t len);
 void u2f_reset_response();
 
+
 static CTAP_RESPONSE * _u2f_resp = NULL;
 
 void u2f_request(struct u2f_request_apdu* req, CTAP_RESPONSE * resp)
@@ -43,7 +44,7 @@ void u2f_request(struct u2f_request_apdu* req, CTAP_RESPONSE * resp)
     uint32_t len = ((req->LC3) | ((uint32_t)req->LC2 << 8) | ((uint32_t)req->LC1 << 16));
     uint8_t byte;
 
-    _u2f_resp = resp;
+    u2f_set_writeback_buffer(resp);
 
     if (req->cla != 0)
     {
@@ -137,6 +138,10 @@ void u2f_reset_response()
     ctap_response_init(_u2f_resp);
 }
 
+void u2f_set_writeback_buffer(CTAP_RESPONSE * resp)
+{
+    _u2f_resp = resp;
+}
 
 static void dump_signature_der(uint8_t * sig)
 {
@@ -229,12 +234,15 @@ static int16_t u2f_authenticate(struct u2f_authenticate_request * req, uint8_t c
     }
 
     count = ctap_atomic_count(0);
-
+    hash[0] = (count >> 24) & 0xff;
+    hash[1] = (count >> 16) & 0xff;
+    hash[2] = (count >> 8) & 0xff;
+    hash[3] = (count >> 0) & 0xff;
     crypto_sha256_init();
 
     crypto_sha256_update(req->app,32);
     crypto_sha256_update(&up,1);
-    crypto_sha256_update((uint8_t *)&count,4);
+    crypto_sha256_update(hash,4);
     crypto_sha256_update(req->chal,32);
 
     crypto_sha256_final(hash);
@@ -243,7 +251,11 @@ static int16_t u2f_authenticate(struct u2f_authenticate_request * req, uint8_t c
     crypto_ecc256_sign(hash, 32, sig);
 
     u2f_response_writeback(&up,1);
-    u2f_response_writeback((uint8_t *)&count,4);
+    hash[0] = (count >> 24) & 0xff;
+    hash[1] = (count >> 16) & 0xff;
+    hash[2] = (count >> 8) & 0xff;
+    hash[3] = (count >> 0) & 0xff;
+    u2f_response_writeback(hash,4);
     dump_signature_der(sig);
 
     return U2F_SW_NO_ERROR;
@@ -284,8 +296,6 @@ static int16_t u2f_register(struct u2f_register_request * req)
 
     crypto_ecc256_load_attestation_key();
 
-    /*printf("check key handle size: %d vs %d\n", U2F_KEY_HANDLE_SIZE, sizeof(struct u2f_key_handle));*/
-
     printf1(TAG_U2F, "sha256: "); dump_hex1(TAG_U2F,hash,32);
     crypto_ecc256_sign(hash, 32, sig);
 

fido2/u2f.h

@@ -1,24 +1,24 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #ifndef _U2F_H_
 #define _U2F_H_
 
@@ -116,6 +116,7 @@ void u2f_request(struct u2f_request_apdu* req, CTAP_RESPONSE * resp);
 
 int8_t u2f_response_writeback(const uint8_t * buf, uint16_t len);
 void u2f_reset_response();
+void u2f_set_writeback_buffer(CTAP_RESPONSE * resp);
 
 int16_t u2f_version();
 

fido2/util.c

@@ -1,24 +1,24 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #include <stdint.h>
 #include <stdio.h>
 
@@ -30,5 +30,3 @@ void dump_hex(uint8_t * buf, int size)
     }
     printf("\n");
 }
-
-

fido2/util.h

@@ -1,24 +1,24 @@
 /*
-   Copyright 2018 Conor Patrick
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of
-   this software and associated documentation files (the "Software"), to deal in
-   the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is furnished to do
-   so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #ifndef _UTIL_H
 #define _UTIL_H
 

mkdocs.yml

@@ -1,21 +1,23 @@
-site_name: Solo
+site_name: Solo Technical Documentation
 site_author: SoloKeys
 site_description: 'Documentation for the SoloKeys solo software'
-repo_url: 'https://github.com/solokeyssec/solo'
-repo_name: 'solokeyssec/solo'
-copyright: 'Copyright © 2018 SoloKeys'
+site_url: 'https://docs.solokeys.io/solo/'
+repo_url: 'https://github.com/solokeys/solo'
+repo_name: 'solokeys/solo'
+copyright: 'Copyright © 2018 - 2019 SoloKeys'
 
 nav:
-    - Home: index.md
-    - README.md: repo-readme.md
-    - FIDO2 Implementation: fido2-impl.md
-    - Signed update process: signed-updates.md
-    - Building: building.md
-    - Code documentation: code-overview.md
-    - Contributing Code: contributing.md
-    - Contributing Docs: documenting.md
-    - What the udev?!: udev.md
+    - Home: solo/index.md
+    - FIDO2 Implementation: solo/fido2-impl.md
+    - Build instructions: solo/building.md
+    - Signed update process: solo/signed-updates.md
+    - Code documentation: solo/code-overview.md
+    - Contributing Code: solo/contributing.md
+    - Contributing Docs: solo/documenting.md
+    - udev Rules: solo/udev.md
+    - About: solo/repo-readme.md
 
 theme:
   name: material
-  logo: 'images/logo.svg'
+  logo: 'solo/images/logo.svg'
+  favicon: 'solo/images/favicon.ico'

pc/app.h

@@ -1,10 +1,24 @@
 /*
- * app.h
- *
- *  Created on: Jun 26, 2018
- *      Author: conor
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
  */
-
 #ifndef SRC_APP_H_
 #define SRC_APP_H_
 
@@ -20,5 +34,21 @@
 
 void printing_init();
 
+//                              0xRRGGBB
+#define LED_INIT_VALUE			0x000800
+#define LED_WINK_VALUE			0x000008
+#define LED_MAX_SCALER          30
+#define LED_MIN_SCALER          1
+// # of ms between each change in LED
+#define HEARTBEAT_PERIOD        100
+// Each LED channel will be multiplied by a integer between LED_MAX_SCALER
+// and LED_MIN_SCALER to cause the slow pulse.  E.g.
+// #define LED_INIT_VALUE			0x301000
+// #define LED_MAX_SCALER          30
+// #define LED_MIN_SCALER          1
+// #define HEARTBEAT_PERIOD        8
+// Will pulse from 0x301000 to 0x903000 to 0x301000 ...
+// Which will take ~8 * (30)*2 ms
+
 
 #endif /* SRC_APP_H_ */

pc/device.c

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #include <sys/time.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -14,10 +35,23 @@
 #include "cbor.h"
 #include "util.h"
 #include "log.h"
+#include "ctaphid.h"
 
 
 void authenticator_initialize();
 
+uint32_t __device_status = 0;
+void device_set_status(int status)
+{
+    if (status != CTAPHID_STATUS_IDLE && __device_status != status)
+    {
+        ctaphid_update_status(status);
+    }
+    __device_status = status;
+}
+
+
+
 int udp_server()
 {
     int fd;
@@ -211,15 +245,12 @@ int ctap_generate_rng(uint8_t * dst, size_t num)
         perror("fopen");
         exit(1);
     }
-    ret = fread(dst, 1, num, urand);
-    fclose(urand);
-
-    if (ret != num)
+    if (fread(dst, 1, num, urand) != num)
     {
-        perror("fwrite");
-        exit(1);
+        perror("fread");
     }
-    /*memset(dst,0xaa,num);*/
+
+    fclose(urand);
 
     return 1;
 }
@@ -410,7 +441,34 @@ void authenticator_initialize()
     }
 }
 
-void manage_device()
+void device_manage()
 {
-    
+
+}
+
+void ctap_reset_rk()
+{
+}
+
+uint32_t ctap_rk_size()
+{
+    printf("Warning: rk not implemented\n");
+    return 0;
+}
+void ctap_store_rk(int index,CTAP_residentKey * rk)
+{
+    printf("Warning: rk not implemented\n");
+}
+void ctap_load_rk(int index,CTAP_residentKey * rk)
+{
+    printf("Warning: rk not implemented\n");
+}
+void ctap_overwrite_rk(int index,CTAP_residentKey * rk)
+{
+    printf("Warning: rk not implemented\n");
+}
+
+void device_wink()
+{
+    printf("*WINK*\n");
 }

targets/efm32/inc/app.h

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 /*
  * app.h
  *

targets/efm32/inc/nfc.h

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 /*
  * nfc.h
  *

targets/efm32/src/crypto.c

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 /*
  *  Wrapper for crypto implementation on device
  *

targets/efm32/src/device.c

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 /*
  * device.c
  *

targets/efm32/src/main.c

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #include <stdio.h>
 #include <string.h>
 

targets/efm32/src/nfc.c

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 /*
  * nfc.c
  *

targets/efm32/src/printing.c

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #include "em_chip.h"
 #include "em_cmu.h"
 #include "em_emu.h"

targets/efm32boot/inc/app.h

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 /*
  * app.h
  *

targets/efm32boot/src/crypto.c

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 /*
  *  Wrapper for crypto implementation on device
  *

targets/efm32boot/src/main.c

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #include "em_device.h"
 #include "em_chip.h"
 #include "em_timer.h"

targets/efm8/inc/app.h

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 /*
  * app.h
  *

targets/efm8/inc/eeprom.h

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #ifndef EEPROM_H_
 #define EEPROM_H_
 

targets/efm8/inc/printing.h

@@ -1,29 +1,24 @@
 /*
- * Copyright (c) 2016, Conor Patrick
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
  */
-
 #ifndef PRINTING_H_
 #define PRINTING_H_
 

targets/efm8/src/callback.c

@@ -1,27 +1,23 @@
 /*
- * Copyright (c) 2016, Conor Patrick
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
  */
 #include <SI_EFM8UB1_Register_Enums.h>
 #include <efm8_usb.h>

targets/efm8/src/eeprom.c

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #include <SI_EFM8UB1_Register_Enums.h>
 #include <stdint.h>
 

targets/efm8/src/main.c

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #include <SI_EFM8UB1_Register_Enums.h>
 #include "InitDevice.h"
 #include "efm8_usb.h"

targets/efm8/src/printing.c

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 /*
  * printing.c
  *

targets/nrf52840/crypto.c

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 /*
  *  Wrapper for crypto implementation on device
  *

targets/nrf52840/device.c

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 /*
  * Device specific functionality here
  * */

targets/nrf52840/list.py

@@ -1,3 +1,24 @@
+#
+# Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+# 
+# This file is part of Solo.
+# 
+# Solo 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.
+# 
+# Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+# 
+# This code is available under licenses for commercial use.
+# Please contact SoloKeys for more information.
+#
 from fido2.hid import CtapHidDevice
 from fido2.client import Fido2Client
 from fido2.pyu2f import hidtransport

targets/nrf52840/pyserial.py

@@ -1,4 +1,25 @@
 #!/usr/bin/python
+#
+# Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+# 
+# This file is part of Solo.
+# 
+# Solo 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.
+# 
+# Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+# 
+# This code is available under licenses for commercial use.
+# Please contact SoloKeys for more information.
+#
 import serial, sys
 from sys import argv
 

targets/nrf52840/retarget.c

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #include "nrf.h"
 #include "SEGGER_RTT.h"
 

targets/nrf52840/usb.c

@@ -37,7 +37,6 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>

targets/nrf52840/usb.h

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
 #ifndef _USB_H
 #define _USB_H
 

targets/stm32l432/Makefile

@@ -0,0 +1,75 @@
+ifndef DEBUG
+DEBUG=0
+endif
+
+merge_hex=python ../../tools/solotool.py mergehex
+
+all:
+	$(MAKE) -f application.mk -j8 solo.hex PREFIX=$(PREFIX) DEBUG=$(DEBUG) EXTRA_DEFINES='-DFLASH_ROP=1'
+
+all-hacker:
+	$(MAKE) -f application.mk -j8 solo.hex PREFIX=$(PREFIX) DEBUG=$(DEBUG) EXTRA_DEFINES='-DSOLO_HACKER -DFLASH_ROP=0'
+
+all-locked:
+	$(MAKE) -f application.mk -j8 solo.hex PREFIX=$(PREFIX) EXTRA_DEFINES='-DFLASH_ROP=2'
+
+debugboot-app:
+	$(MAKE) -f application.mk -j8 solo.hex DEBUG=2 PREFIX=$(PREFIX)\
+	LDSCRIPT=linker/stm32l4xx_extra.ld EXTRA_DEFINES='-DAPPLICATION_START_PAGE=16 -DSOLO_HACKER'
+
+debugboot-boot:
+	$(MAKE) -f bootloader.mk -j8 bootloader.hex PREFIX=$(PREFIX) DEBUG=1 \
+	LDSCRIPT=linker/bootloader_stm32l4xx_extra.ld EXTRA_DEFINES='-DAPPLICATION_START_PAGE=16 -DSOLO_HACKER'
+
+boot-sig-checking:
+	$(MAKE) -f bootloader.mk -j8 bootloader.hex PREFIX=$(PREFIX) DEBUG=0
+
+boot-no-sig:
+	$(MAKE) -f bootloader.mk -j8 bootloader.hex PREFIX=$(PREFIX) EXTRA_DEFINES='-DSOLO_HACKER' DEBUG=0
+
+build-release-locked: clean2 boot-sig-checking clean all-locked
+	$(merge_hex) solo.hex bootloader.hex all.hex
+	rm -f solo.hex bootloader.hex  # don't program solo.hex ...
+
+build-release: clean2 boot-sig-checking clean all
+	$(merge_hex) solo.hex bootloader.hex all.hex
+
+build-hacker: clean2 boot-no-sig clean all-hacker
+	$(merge_hex) solo.hex bootloader.hex all.hex
+
+clean:
+	$(MAKE) -f application.mk clean
+	$(MAKE) -f bootloader.mk clean
+clean2:
+	rm -f solo.hex bootloader.hex all.hex
+	$(MAKE) -f application.mk clean
+	$(MAKE) -f bootloader.mk clean
+
+
+flash: solo.hex bootloader.hex
+	$(merge_hex) solo.hex bootloader.hex all.hex
+	STM32_Programmer_CLI -c port=SWD -halt -e all --readunprotect
+	STM32_Programmer_CLI -c port=SWD -halt  -d all.hex -rst
+
+flash_dfu: solo.hex bootloader.hex
+	$(merge_hex) solo.hex bootloader.hex all.hex
+	# STM32_Programmer_CLI -c port=usb1 -halt -e all --readunprotect
+	STM32_Programmer_CLI -c port=usb1 -halt -rdu  -d all.hex
+
+flashboot: solo.hex bootloader.hex
+	$(merge_hex) solo.hex bootloader.hex all.hex
+	STM32_Programmer_CLI -c port=SWD -halt -e all --readunprotect
+	STM32_Programmer_CLI -c port=SWD -halt  -d bootloader.hex -rst
+
+# tell ST DFU to enter application
+detach:
+	STM32_Programmer_CLI -c port=usb1 -ob nBOOT0=1
+
+bootloader.hex:
+	echo "You need to build the bootloader first."
+
+solo.hex:
+	echo "You need to build the application first."
+
+cbor:
+	$(MAKE) -f application.mk -j8 cbor

targets/stm32l432/Makefile.test.mk

@@ -24,10 +24,8 @@ CFLAGS= $(INC)
 TARGET=solo
 HW=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb
 
-# Nucleo board
-#CHIP=STM32L432xx
-# Solo
-CHIP=STM32L442xx
+# Solo or Nucleo board
+CHIP=STM32L432xx
 
 DEFINES = -D$(CHIP) -DAES256=1  -DUSE_FULL_LL_DRIVER
 DEFINES += -DTEST_SOLO_STM32 -DTEST

targets/stm32l432/README.md

@@ -0,0 +1,4 @@
+# STM32L432 Solo
+
+Check out our [official documentation](https://docs.solokeys.io/solo/building/)
+for instructions on building and programming!

targets/stm32l432/application.mk

@@ -1,7 +1,7 @@
-CC=arm-none-eabi-gcc
-CP=arm-none-eabi-objcopy
-SZ=arm-none-eabi-size
-AR=arm-none-eabi-ar
+CC=$(PREFIX)arm-none-eabi-gcc
+CP=$(PREFIX)arm-none-eabi-objcopy
+SZ=$(PREFIX)arm-none-eabi-size
+AR=$(PREFIX)arm-none-eabi-ar
 
 # ST related
 SRC = src/main.c src/init.c src/redirect.c src/flash.c src/rng.c src/led.c src/device.c
@@ -10,14 +10,13 @@ SRC += src/startup_stm32l432xx.s src/system_stm32l4xx.c
 SRC += $(wildcard lib/*.c) $(wildcard lib/usbd/*.c)
 
 # FIDO2 lib
-SRC += ../../fido2/util.c ../../fido2/u2f.c ../../fido2/test_power.c ../../fido2/test_power.c
+SRC += ../../fido2/util.c ../../fido2/u2f.c ../../fido2/test_power.c
 SRC += ../../fido2/stubs.c ../../fido2/log.c  ../../fido2/ctaphid.c  ../../fido2/ctap.c
 SRC += ../../fido2/ctap_parse.c ../../fido2/main.c
 
 # Crypto libs
 SRC += ../../crypto/sha256/sha256.c ../../crypto/micro-ecc/uECC.c ../../crypto/tiny-AES-c/aes.c
 
-
 OBJ1=$(SRC:.c=.o)
 OBJ=$(OBJ1:.s=.o)
 
@@ -27,24 +26,28 @@ INC += -I../../crypto/tiny-AES-c
 
 SEARCH=-L../../tinycbor/lib
 
-LDSCRIPT=stm32l432xx.ld
+ifndef LDSCRIPT
+LDSCRIPT=linker/stm32l4xx.ld
+endif
 
 CFLAGS= $(INC)
 
 TARGET=solo
 HW=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb
 
-# Nucleo board
-#CHIP=STM32L432xx
-# Solo
-CHIP=STM32L442xx
+# Solo or Nucleo board
+CHIP=STM32L432xx
 
-DEFINES = -D$(CHIP) -DAES256=1  -DUSE_FULL_LL_DRIVER
+ifndef DEBUG
+DEBUG=0
+endif
+
+DEFINES = -DDEBUG_LEVEL=$(DEBUG) -D$(CHIP) -DAES256=1  -DUSE_FULL_LL_DRIVER -DAPP_CONFIG=\"app.h\" $(EXTRA_DEFINES)
 # DEFINES += -DTEST_SOLO_STM32 -DTEST -DTEST_FIFO=1
 
-CFLAGS=$(INC) -c $(DEFINES)   -Wall -fdata-sections -ffunction-sections $(HW)
+CFLAGS=$(INC) -c $(DEFINES)   -Wall -fdata-sections -ffunction-sections $(HW) -g
 LDFLAGS_LIB=$(HW) $(SEARCH) -specs=nano.specs  -specs=nosys.specs  -Wl,--gc-sections -u _printf_float -lnosys
-LDFLAGS=$(HW) $(LDFLAGS_LIB) -T$(LDSCRIPT) -Wl,-Map=$(TARGET).map,--cref -ltinycbor
+LDFLAGS=$(HW) $(LDFLAGS_LIB) -T$(LDSCRIPT) -Wl,-Map=$(TARGET).map,--cref -Wl,-Bstatic -ltinycbor
 
 
 .PRECIOUS: %.o
@@ -68,14 +71,8 @@ all: $(TARGET).elf
 	$(CP) -O ihex $^ $(TARGET).hex
 
 clean:
-	rm -f *.o src/*.o src/*.elf *.elf *.hex $(OBJ)
+	rm -f *.o src/*.o src/*.elf  bootloader/*.o $(OBJ)
 
-flash: $(TARGET).hex
-	STM32_Programmer_CLI -c port=SWD -halt -e all --readunprotect
-	STM32_Programmer_CLI -c port=SWD -halt  -d $(TARGET).hex -rst
-
-detach:
-	STM32_Programmer_CLI -c port=usb1 -ob nBOOT0=1
 
 cbor:
 	cd ../../tinycbor/ && make clean

targets/stm32l432/bootloader.mk

@@ -0,0 +1,74 @@
+CC=$(PREFIX)arm-none-eabi-gcc
+CP=$(PREFIX)arm-none-eabi-objcopy
+SZ=$(PREFIX)arm-none-eabi-size
+AR=$(PREFIX)arm-none-eabi-ar
+
+# ST related
+SRC = bootloader/main.c bootloader/bootloader.c
+SRC += src/init.c src/redirect.c src/flash.c src/rng.c src/led.c src/device.c
+SRC += src/fifo.c src/crypto.c src/attestation.c
+SRC += src/startup_stm32l432xx.s src/system_stm32l4xx.c
+SRC += $(wildcard lib/*.c) $(wildcard lib/usbd/*.c)
+
+# FIDO2 lib
+SRC += ../../fido2/util.c ../../fido2/u2f.c ../../fido2/extensions/extensions.c
+SRC += ../../fido2/stubs.c ../../fido2/log.c  ../../fido2/ctaphid.c  ../../fido2/ctap.c
+
+# Crypto libs
+SRC += ../../crypto/sha256/sha256.c ../../crypto/micro-ecc/uECC.c
+
+OBJ1=$(SRC:.c=.o)
+OBJ=$(OBJ1:.s=.o)
+
+
+INC = -Ibootloader/ -Isrc/ -Isrc/cmsis/ -Ilib/ -Ilib/usbd/ -I../../fido2/ -I../../fido2/extensions
+INC += -I../../tinycbor/src -I../../crypto/sha256 -I../../crypto/micro-ecc
+INC += -I../../crypto/tiny-AES-c
+
+ifndef LDSCRIPT
+LDSCRIPT=linker/bootloader_stm32l4xx.ld
+endif
+
+CFLAGS= $(INC)
+
+TARGET=bootloader
+HW=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb
+
+# Solo or Nucleo board
+CHIP=STM32L432xx
+
+ifndef DEBUG
+DEBUG=0
+endif
+
+DEFINES = -DDEBUG_LEVEL=$(DEBUG) -D$(CHIP) -DAES256=1  -DUSE_FULL_LL_DRIVER -DAPP_CONFIG=\"bootloader.h\" $(EXTRA_DEFINES)
+# DEFINES += -DTEST_SOLO_STM32 -DTEST -DTEST_FIFO=1
+
+CFLAGS=$(INC) -c $(DEFINES)   -Wall -fdata-sections -ffunction-sections $(HW) -g
+LDFLAGS_LIB=$(HW) $(SEARCH) -specs=nano.specs  -specs=nosys.specs  -Wl,--gc-sections  -lnosys
+LDFLAGS=$(HW) $(LDFLAGS_LIB) -T$(LDSCRIPT) -Wl,-Map=$(TARGET).map,--cref  -Wl,-Bstatic 
+
+
+.PRECIOUS: %.o
+
+all: $(TARGET).elf
+	$(SZ) $^
+
+
+%.o: %.c
+	$(CC) $^ $(HW)  -Os $(CFLAGS) -o $@
+
+../../crypto/micro-ecc/uECC.o: ../../crypto/micro-ecc/uECC.c
+	$(CC) $^ $(HW)  -Os $(CFLAGS) -o $@
+
+%.o: %.s
+	$(CC) $^ $(HW)  -Os $(CFLAGS) -o $@
+
+%.elf: $(OBJ)
+	$(CC) $^ $(HW) $(LDFLAGS) -o $@
+
+%.hex: %.elf
+	$(CP) -O ihex $^ $(TARGET).hex
+
+clean:
+	rm -f *.o src/*.o bootloader/*.o src/*.elf  $(OBJ)

targets/stm32l432/bootloader/bootloader.c

@@ -0,0 +1,252 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
+#include <stdint.h>
+#include <stdlib.h>
+
+#include APP_CONFIG
+#include "uECC.h"
+#include "u2f.h"
+#include "device.h"
+#include "flash.h"
+#include "crypto.h"
+#include "led.h"
+#include "memory_layout.h"
+#include "ctap_errors.h"
+#include "log.h"
+
+
+extern uint8_t REBOOT_FLAG;
+
+typedef enum
+{
+    BootWrite = 0x40,
+    BootDone = 0x41,
+    BootCheck = 0x42,
+    BootErase = 0x43,
+    BootVersion = 0x44,
+    BootReboot = 0x45,
+    BootBootloader = 0x46,
+    BootDisable = 0x47,
+} BootOperation;
+
+
+typedef struct {
+    uint8_t op;
+    uint8_t addr[3];
+    uint8_t tag[4];
+    uint8_t lenh;
+    uint8_t lenl;
+    uint8_t payload[255 - 10];
+} __attribute__((packed)) BootloaderReq;
+
+
+static void erase_application()
+{
+    int page;
+    for(page = APPLICATION_START_PAGE; page < APPLICATION_END_PAGE; page++)
+    {
+        flash_erase_page(page);
+    }
+}
+
+#define LAST_ADDR       (APPLICATION_END_ADDR-2048 + 8)
+#define LAST_PAGE       (APPLICATION_END_PAGE-1)
+static void disable_bootloader()
+{
+    uint8_t page[PAGE_SIZE];
+    memmove(page, (uint8_t*)LAST_ADDR, PAGE_SIZE);
+    memset(page+PAGE_SIZE -4, 0, 4);
+    flash_erase_page(LAST_PAGE);
+    flash_write(LAST_ADDR, page, PAGE_SIZE);
+}
+
+static void authorize_application()
+{
+    // uint32_t zero = 0;
+    // uint32_t * ptr;
+    // ptr = (uint32_t *)AUTH_WORD_ADDR;
+    // flash_write((uint32_t)ptr, (uint8_t *)&zero, 4);
+    uint8_t page[PAGE_SIZE];
+    if (is_authorized_to_boot())
+        return;
+    memmove(page, (uint8_t*)LAST_ADDR, PAGE_SIZE);
+    memset(page+PAGE_SIZE -8, 0, 4);
+    flash_erase_page(LAST_PAGE);
+    flash_write(LAST_ADDR, page, PAGE_SIZE);
+}
+
+int is_authorized_to_boot()
+{
+    uint32_t * auth = (uint32_t *)AUTH_WORD_ADDR;
+    return *auth == 0;
+}
+
+int is_bootloader_disabled()
+{
+    uint32_t * auth = (uint32_t *)(AUTH_WORD_ADDR+4);
+    return *auth == 0;
+}
+
+int bootloader_bridge(int klen, uint8_t * keyh)
+{
+    static int has_erased = 0;
+    int i;
+    BootloaderReq * req =  (BootloaderReq *  )keyh;
+    uint8_t hash[32];
+    uint8_t version = 1;
+    uint16_t len = (req->lenh << 8) | (req->lenl);
+
+    if (len > klen-10)
+    {
+        printf1(TAG_BOOT,"Invalid length %d / %d\r\n", len, klen-9);
+        return CTAP1_ERR_INVALID_LENGTH;
+    }
+
+    uint8_t * pubkey = (uint8_t*)"\xd2\xa4\x2f\x8f\xb2\x31\x1c\xc1\xf7\x0c\x7e\x64\x32\xfb\xbb\xb4\xa3\xdd\x32\x20\x0f\x1b\x88\x9c\xda\x62\xc2\x83\x25\x93\xdd\xb8\x75\x9d\xf9\x86\xee\x03\x6c\xce\x34\x47\x71\x36\xb3\xb2\xad\x6d\x12\xb7\xbe\x49\x3e\x20\xa4\x61\xac\xc7\x71\xc7\x1f\xa8\x14\xf2";
+    const struct uECC_Curve_t * curve = NULL;
+
+    uint32_t addr = ((*((uint32_t*)req->addr)) & 0xffffff) | 0x8000000;
+
+    uint32_t * ptr = (uint32_t *)addr;
+
+    switch(req->op){
+        case BootWrite:
+            printf1(TAG_BOOT, "BootWrite: %08lx\r\n",(uint32_t)ptr);
+            if ((uint32_t)ptr < APPLICATION_START_ADDR || (uint32_t)ptr >= APPLICATION_END_ADDR
+                || ((uint32_t)ptr+len) > APPLICATION_END_ADDR)
+            {
+                printf1(TAG_BOOT,"Bound exceeded [%08lx, %08lx]\r\n",APPLICATION_START_ADDR,APPLICATION_END_ADDR);
+                return CTAP2_ERR_NOT_ALLOWED;
+            }
+
+            if (!has_erased || is_authorized_to_boot())
+            {
+                erase_application();
+                has_erased = 1;
+            }
+            if (is_authorized_to_boot())
+            {
+                printf2(TAG_ERR, "Error, boot check bypassed\n");
+                exit(1);
+            }
+
+            flash_write((uint32_t)ptr,req->payload, len);
+
+
+            break;
+        case BootDone:
+            printf1(TAG_BOOT, "BootDone: ");
+#ifndef SOLO_HACKER
+            if (len != 64)
+            {
+                printf1(TAG_BOOT,"Invalid length for signature\r\n");
+                return CTAP1_ERR_INVALID_LENGTH;
+            }
+            dump_hex1(TAG_BOOT, req->payload, 32);
+            ptr = (uint32_t *)APPLICATION_START_ADDR;
+            crypto_sha256_init();
+            crypto_sha256_update((uint8_t*)ptr, APPLICATION_END_ADDR-APPLICATION_START_ADDR);
+            crypto_sha256_final(hash);
+            curve = uECC_secp256r1();
+
+            if (! uECC_verify(pubkey,
+                        hash,
+                        32,
+                        req->payload,
+                        curve))
+            {
+                return CTAP2_ERR_OPERATION_DENIED;
+            }
+#endif
+            authorize_application();
+            REBOOT_FLAG = 1;
+            break;
+        case BootCheck:
+            return 0;
+            break;
+        case BootErase:
+            printf1(TAG_BOOT, "BootErase.\r\n");
+            erase_application();
+            return 0;
+            break;
+        case BootVersion:
+            has_erased = 0;
+            printf1(TAG_BOOT, "BootVersion.\r\n");
+            u2f_response_writeback(&version,1);
+            return 0;
+            break;
+        case BootReboot:
+            printf1(TAG_BOOT, "BootReboot.\r\n");
+            REBOOT_FLAG = 1;
+            break;
+        case BootDisable:
+            printf1(TAG_BOOT, "BootDisable %08lx.\r\n", *(uint32_t *)(AUTH_WORD_ADDR+4));
+            if (req->payload[0] == 0xcd && req->payload[1] == 0xde
+               && req->payload[2] == 0xba && req->payload[3] == 0xaa)
+            {
+                disable_bootloader();
+                version = 0;
+                u2f_response_writeback(&version,1);
+            }
+            else
+            {
+                version = CTAP2_ERR_OPERATION_DENIED;
+                u2f_response_writeback(&version,1);
+            }
+            break;
+#ifdef SOLO_HACKER
+        case BootBootloader:
+            printf1(TAG_BOOT, "BootBootloader.\r\n");
+            flash_option_bytes_init(1);
+            boot_st_bootloader();
+            break;
+#endif
+        default:
+            return CTAP1_ERR_INVALID_COMMAND;
+    }
+    return 0;
+}
+
+void bootloader_heartbeat()
+{
+    static int state = 0;
+    static uint32_t val = (LED_MAX_SCALER - LED_MIN_SCALER)/2;
+    uint8_t r = (LED_INIT_VALUE >> 16) & 0xff;
+    uint8_t g = (LED_INIT_VALUE >> 8) & 0xff;
+    uint8_t b = (LED_INIT_VALUE >> 0) & 0xff;
+
+    if (state)
+    {
+        val--;
+    }
+    else
+    {
+        val++;
+    }
+
+    if (val > LED_MAX_SCALER || val < LED_MIN_SCALER)
+    {
+        state = !state;
+    }
+
+    led_rgb(((val * g)<<8) | ((val*r) << 16) | (val*b));
+}

targets/stm32l432/bootloader/bootloader.h

@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ * 
+ * This file is part of Solo.
+ * 
+ * Solo 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.
+ * 
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ * 
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
+#ifndef _APP_H_
+#define _APP_H_
+#include <stdint.h>
+
+#define DEBUG_UART      USART1
+
+#ifndef DEBUG_LEVEL
+#define DEBUG_LEVEL     0
+#endif
+
+#define NON_BLOCK_PRINTING 0
+
+#define BOOT_TO_DFU         0
+
+
+#define IS_BOOTLOADER       1
+
+#define ENABLE_U2F_EXTENSIONS
+// #define ENABLE_U2F
+
+#define DISABLE_CTAPHID_PING
+#define DISABLE_CTAPHID_WINK
+#define DISABLE_CTAPHID_CBOR
+
+//                              0xRRGGBB
+#define LED_INIT_VALUE			0x0a0300
+#define LED_MAX_SCALER          40
+#define LED_MIN_SCALER          1
+// # of ms between each change in LED
+#define HEARTBEAT_PERIOD        5
+// Each LED channel will be multiplied by a integer between LED_MAX_SCALER
+// and LED_MIN_SCALER to cause the slow pulse.  E.g.
+// #define LED_INIT_VALUE			0x301000
+// #define LED_MAX_SCALER          30
+// #define LED_MIN_SCALER          1
+// #define HEARTBEAT_PERIOD        8
+// Will pulse from 0x301000 to 0x903000 to 0x301000 ...
+// Which will take ~8 * (30)*2 ms
+
+// Button
+#define SOLO_BUTTON_PORT        GPIOA
+#define SOLO_BUTTON_PIN         LL_GPIO_PIN_0
+
+#define SKIP_BUTTON_CHECK_WITH_DELAY        0
+#define SKIP_BUTTON_CHECK_FAST              1
+
+void printing_init();
+void hw_init(void);
+
+// Trigger software reset
+void device_reboot();
+
+int is_authorized_to_boot();
+int is_bootloader_disabled();
+void bootloader_heartbeat();
+
+#endif

targets/stm32l432/bootloader/main.c

@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
+ *
+ * This file is part of Solo.
+ *
+ * Solo 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.
+ *
+ * Solo 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 Solo.  If not, see <https://www.gnu.org/licenses/>
+ *
+ * This code is available under licenses for commercial use.
+ * Please contact SoloKeys for more information.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+#include "cbor.h"
+#include "device.h"
+#include "ctaphid.h"
+//#include "bsp.h"
+#include "util.h"
+#include "log.h"
+#include "ctap.h"
+#include "app.h"
+#include "memory_layout.h"
+#include "stm32l4xx_ll_rcc.h"
+
+#include "stm32l4xx.h"
+
+uint8_t REBOOT_FLAG = 0;
+
+
+void  BOOT_boot(void)
+{
+  typedef void (*pFunction)(void);
+
+  uint32_t *bootAddress = (uint32_t *)(APPLICATION_START_ADDR);
+
+  /* Set new vector table */
+  SCB->VTOR = APPLICATION_START_ADDR;
+
+  /* Read new SP and PC from vector table */
+  __set_MSP(bootAddress[0]);
+  ((pFunction)bootAddress[1])();
+}
+
+int main(int argc, char * argv[])
+{
+    uint8_t hidmsg[64];
+    uint32_t t1 = 0;
+    uint32_t stboot_time = 0;
+    uint32_t boot = 1;
+
+    set_logging_mask(
+            /*0*/
+            TAG_GEN|
+            // TAG_MC |
+            // TAG_GA |
+            // TAG_WALLET |
+            TAG_STOR |
+            // TAG_CP |
+            // TAG_CTAP|
+           // TAG_HID|
+            /*TAG_U2F|*/
+            // TAG_PARSE |
+           // TAG_TIME|
+           // TAG_DUMP|
+           // TAG_DUMP2|
+            TAG_BOOT|
+            TAG_EXT|
+            TAG_GREEN|
+            TAG_RED|
+            TAG_ERR
+            );
+
+    device_init();
+    printf1(TAG_GEN,"init device\n");
+
+    t1 = millis();
+    while(device_is_button_pressed())
+    {
+        if ((millis() - t1) > 2000)
+        {
+            boot = 0;
+            break;
+        }
+    }
+
+
+#ifdef SOLO_HACKER
+    if (!is_bootloader_disabled())
+    {
+        stboot_time = millis();
+        if ( RCC->CSR & (1<<29) )// check if there was independent watchdog reset
+        {
+            RCC->CSR |= (1<<23); // clear reset flags
+            goto start_bootloader;
+        }
+    }
+#endif
+
+    if (is_authorized_to_boot() && (boot || is_bootloader_disabled()))
+    {
+        BOOT_boot();
+    }
+    else
+    {
+
+        printf1(TAG_RED,"Not authorized to boot (%08x == %08lx)\r\n", AUTH_WORD_ADDR, *(uint32_t*)AUTH_WORD_ADDR);
+    }
+    start_bootloader:
+    usbhid_init();
+    printf1(TAG_GEN,"init usb\n");
+
+    ctaphid_init();
+    printf1(TAG_GEN,"init ctaphid\n");
+
+    memset(hidmsg,0,sizeof(hidmsg));
+
+    printf1(TAG_GEN,"recv'ing hid msg \n");
+
+
+    while(1)
+    {
+        if (millis() - t1 > HEARTBEAT_PERIOD)
+        {
+            bootloader_heartbeat();
+            t1 = millis();
+        }
+
+        device_manage();
+
+        if (usbhid_recv(hidmsg) > 0)
+        {
+            ctaphid_handle_packet(hidmsg);
+            memset(hidmsg, 0, sizeof(hidmsg));
+        }
+        else
+        {
+        }
+        ctaphid_check_timeouts();
+
+        if (REBOOT_FLAG)
+        {
+            delay(250);
+            device_reboot();
+        }
+#ifdef SOLO_HACKER
+        // Boot ST bootloader if button is held for 5s
+        if (!device_is_button_pressed())
+        {
+            stboot_time = millis();
+        }
+        if ((millis() - stboot_time) > 5000)
+        {
+            boot_st_bootloader();
+        }
+#endif
+    }
+
+    // Should never get here
+    usbhid_close();
+    printf1(TAG_GREEN, "done\n");
+    return 0;
+}

targets/stm32l432/lib/stm32l4xx_ll_iwdg.h

@@ -0,0 +1,361 @@
+/**
+  ******************************************************************************
+  * @file    stm32l4xx_ll_iwdg.h
+  * @author  MCD Application Team
+  * @brief   Header file of IWDG LL module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; COPYRIGHT(c) 2017 STMicroelectronics</center></h2>
+  *
+  * Redistribution and use in source and binary forms, with or without modification,
+  * are permitted provided that the following conditions are met:
+  *   1. Redistributions of source code must retain the above copyright notice,
+  *      this list of conditions and the following disclaimer.
+  *   2. Redistributions in binary form must reproduce the above copyright notice,
+  *      this list of conditions and the following disclaimer in the documentation
+  *      and/or other materials provided with the distribution.
+  *   3. Neither the name of STMicroelectronics nor the names of its contributors
+  *      may be used to endorse or promote products derived from this software
+  *      without specific prior written permission.
+  *
+  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32L4xx_LL_IWDG_H
+#define __STM32L4xx_LL_IWDG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32l4xx.h"
+
+/** @addtogroup STM32L4xx_LL_Driver
+  * @{
+  */
+
+#if defined(IWDG)
+
+/** @defgroup IWDG_LL IWDG
+  * @{
+  */
+
+/* Private types -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+
+/* Private constants ---------------------------------------------------------*/
+/** @defgroup IWDG_LL_Private_Constants IWDG Private Constants
+  * @{
+  */
+
+#define LL_IWDG_KEY_RELOAD                 0x0000AAAAU               /*!< IWDG Reload Counter Enable   */
+#define LL_IWDG_KEY_ENABLE                 0x0000CCCCU               /*!< IWDG Peripheral Enable       */
+#define LL_IWDG_KEY_WR_ACCESS_ENABLE       0x00005555U               /*!< IWDG KR Write Access Enable  */
+#define LL_IWDG_KEY_WR_ACCESS_DISABLE      0x00000000U               /*!< IWDG KR Write Access Disable */
+
+/**
+  * @}
+  */
+
+/* Private macros ------------------------------------------------------------*/
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+/** @defgroup IWDG_LL_Exported_Constants IWDG Exported Constants
+  * @{
+  */
+
+/** @defgroup IWDG_LL_EC_GET_FLAG Get Flags Defines
+  * @brief    Flags defines which can be used with LL_IWDG_ReadReg function
+  * @{
+  */
+#define LL_IWDG_SR_PVU                     IWDG_SR_PVU                           /*!< Watchdog prescaler value update */
+#define LL_IWDG_SR_RVU                     IWDG_SR_RVU                           /*!< Watchdog counter reload value update */
+#define LL_IWDG_SR_WVU                     IWDG_SR_WVU                           /*!< Watchdog counter window value update */
+
+/**
+  * @}
+  */
+
+/** @defgroup IWDG_LL_EC_PRESCALER  Prescaler Divider
+  * @{
+  */
+#define LL_IWDG_PRESCALER_4                0x00000000U                           /*!< Divider by 4   */
+#define LL_IWDG_PRESCALER_8                (IWDG_PR_PR_0)                        /*!< Divider by 8   */
+#define LL_IWDG_PRESCALER_16               (IWDG_PR_PR_1)                        /*!< Divider by 16  */
+#define LL_IWDG_PRESCALER_32               (IWDG_PR_PR_1 | IWDG_PR_PR_0)         /*!< Divider by 32  */
+#define LL_IWDG_PRESCALER_64               (IWDG_PR_PR_2)                        /*!< Divider by 64  */
+#define LL_IWDG_PRESCALER_128              (IWDG_PR_PR_2 | IWDG_PR_PR_0)         /*!< Divider by 128 */
+#define LL_IWDG_PRESCALER_256              (IWDG_PR_PR_2 | IWDG_PR_PR_1)         /*!< Divider by 256 */
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/* Exported macro ------------------------------------------------------------*/
+/** @defgroup IWDG_LL_Exported_Macros IWDG Exported Macros
+  * @{
+  */
+
+/** @defgroup IWDG_LL_EM_WRITE_READ Common Write and read registers Macros
+  * @{
+  */
+
+/**
+  * @brief  Write a value in IWDG register
+  * @param  __INSTANCE__ IWDG Instance
+  * @param  __REG__ Register to be written
+  * @param  __VALUE__ Value to be written in the register
+  * @retval None
+  */
+#define LL_IWDG_WriteReg(__INSTANCE__, __REG__, __VALUE__) WRITE_REG(__INSTANCE__->__REG__, (__VALUE__))
+
+/**
+  * @brief  Read a value in IWDG register
+  * @param  __INSTANCE__ IWDG Instance
+  * @param  __REG__ Register to be read
+  * @retval Register value
+  */
+#define LL_IWDG_ReadReg(__INSTANCE__, __REG__) READ_REG(__INSTANCE__->__REG__)
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+
+/* Exported functions --------------------------------------------------------*/
+/** @defgroup IWDG_LL_Exported_Functions IWDG Exported Functions
+  * @{
+  */
+/** @defgroup IWDG_LL_EF_Configuration Configuration
+  * @{
+  */
+
+/**
+  * @brief  Start the Independent Watchdog
+  * @note   Except if the hardware watchdog option is selected
+  * @rmtoll KR           KEY           LL_IWDG_Enable
+  * @param  IWDGx IWDG Instance
+  * @retval None
+  */
+__STATIC_INLINE void LL_IWDG_Enable(IWDG_TypeDef *IWDGx)
+{
+  WRITE_REG(IWDGx->KR, LL_IWDG_KEY_ENABLE);
+}
+
+/**
+  * @brief  Reloads IWDG counter with value defined in the reload register
+  * @rmtoll KR           KEY           LL_IWDG_ReloadCounter
+  * @param  IWDGx IWDG Instance
+  * @retval None
+  */
+__STATIC_INLINE void LL_IWDG_ReloadCounter(IWDG_TypeDef *IWDGx)
+{
+  WRITE_REG(IWDGx->KR, LL_IWDG_KEY_RELOAD);
+}
+
+/**
+  * @brief  Enable write access to IWDG_PR, IWDG_RLR and IWDG_WINR registers
+  * @rmtoll KR           KEY           LL_IWDG_EnableWriteAccess
+  * @param  IWDGx IWDG Instance
+  * @retval None
+  */
+__STATIC_INLINE void LL_IWDG_EnableWriteAccess(IWDG_TypeDef *IWDGx)
+{
+  WRITE_REG(IWDGx->KR, LL_IWDG_KEY_WR_ACCESS_ENABLE);
+}
+
+/**
+  * @brief  Disable write access to IWDG_PR, IWDG_RLR and IWDG_WINR registers
+  * @rmtoll KR           KEY           LL_IWDG_DisableWriteAccess
+  * @param  IWDGx IWDG Instance
+  * @retval None
+  */
+__STATIC_INLINE void LL_IWDG_DisableWriteAccess(IWDG_TypeDef *IWDGx)
+{
+  WRITE_REG(IWDGx->KR, LL_IWDG_KEY_WR_ACCESS_DISABLE);
+}
+
+/**
+  * @brief  Select the prescaler of the IWDG
+  * @rmtoll PR           PR            LL_IWDG_SetPrescaler
+  * @param  IWDGx IWDG Instance
+  * @param  Prescaler This parameter can be one of the following values:
+  *         @arg @ref LL_IWDG_PRESCALER_4
+  *         @arg @ref LL_IWDG_PRESCALER_8
+  *         @arg @ref LL_IWDG_PRESCALER_16
+  *         @arg @ref LL_IWDG_PRESCALER_32
+  *         @arg @ref LL_IWDG_PRESCALER_64
+  *         @arg @ref LL_IWDG_PRESCALER_128
+  *         @arg @ref LL_IWDG_PRESCALER_256
+  * @retval None
+  */
+__STATIC_INLINE void LL_IWDG_SetPrescaler(IWDG_TypeDef *IWDGx, uint32_t Prescaler)
+{
+  WRITE_REG(IWDGx->PR, IWDG_PR_PR & Prescaler);
+}
+
+/**
+  * @brief  Get the selected prescaler of the IWDG
+  * @rmtoll PR           PR            LL_IWDG_GetPrescaler
+  * @param  IWDGx IWDG Instance
+  * @retval Returned value can be one of the following values:
+  *         @arg @ref LL_IWDG_PRESCALER_4
+  *         @arg @ref LL_IWDG_PRESCALER_8
+  *         @arg @ref LL_IWDG_PRESCALER_16
+  *         @arg @ref LL_IWDG_PRESCALER_32
+  *         @arg @ref LL_IWDG_PRESCALER_64
+  *         @arg @ref LL_IWDG_PRESCALER_128
+  *         @arg @ref LL_IWDG_PRESCALER_256
+  */
+__STATIC_INLINE uint32_t LL_IWDG_GetPrescaler(IWDG_TypeDef *IWDGx)
+{
+  return (READ_REG(IWDGx->PR));
+}
+
+/**
+  * @brief  Specify the IWDG down-counter reload value
+  * @rmtoll RLR          RL            LL_IWDG_SetReloadCounter
+  * @param  IWDGx IWDG Instance
+  * @param  Counter Value between Min_Data=0 and Max_Data=0x0FFF
+  * @retval None
+  */
+__STATIC_INLINE void LL_IWDG_SetReloadCounter(IWDG_TypeDef *IWDGx, uint32_t Counter)
+{
+  WRITE_REG(IWDGx->RLR, IWDG_RLR_RL & Counter);
+}
+
+/**
+  * @brief  Get the specified IWDG down-counter reload value
+  * @rmtoll RLR          RL            LL_IWDG_GetReloadCounter
+  * @param  IWDGx IWDG Instance
+  * @retval Value between Min_Data=0 and Max_Data=0x0FFF
+  */
+__STATIC_INLINE uint32_t LL_IWDG_GetReloadCounter(IWDG_TypeDef *IWDGx)
+{
+  return (READ_REG(IWDGx->RLR));
+}
+
+/**
+  * @brief  Specify high limit of the window value to be compared to the down-counter.
+  * @rmtoll WINR         WIN           LL_IWDG_SetWindow
+  * @param  IWDGx IWDG Instance
+  * @param  Window Value between Min_Data=0 and Max_Data=0x0FFF
+  * @retval None
+  */
+__STATIC_INLINE void LL_IWDG_SetWindow(IWDG_TypeDef *IWDGx, uint32_t Window)
+{
+  WRITE_REG(IWDGx->WINR, IWDG_WINR_WIN & Window);
+}
+
+/**
+  * @brief  Get the high limit of the window value specified.
+  * @rmtoll WINR         WIN           LL_IWDG_GetWindow
+  * @param  IWDGx IWDG Instance
+  * @retval Value between Min_Data=0 and Max_Data=0x0FFF
+  */
+__STATIC_INLINE uint32_t LL_IWDG_GetWindow(IWDG_TypeDef *IWDGx)
+{
+  return (READ_REG(IWDGx->WINR));
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup IWDG_LL_EF_FLAG_Management FLAG_Management
+  * @{
+  */
+
+/**
+  * @brief  Check if flag Prescaler Value Update is set or not
+  * @rmtoll SR           PVU           LL_IWDG_IsActiveFlag_PVU
+  * @param  IWDGx IWDG Instance
+  * @retval State of bit (1 or 0).
+  */
+__STATIC_INLINE uint32_t LL_IWDG_IsActiveFlag_PVU(IWDG_TypeDef *IWDGx)
+{
+  return (uint32_t)(READ_BIT(IWDGx->SR, IWDG_SR_PVU) == (IWDG_SR_PVU));
+}
+
+/**
+  * @brief  Check if flag Reload Value Update is set or not
+  * @rmtoll SR           RVU           LL_IWDG_IsActiveFlag_RVU
+  * @param  IWDGx IWDG Instance
+  * @retval State of bit (1 or 0).
+  */
+__STATIC_INLINE uint32_t LL_IWDG_IsActiveFlag_RVU(IWDG_TypeDef *IWDGx)
+{
+  return (uint32_t)(READ_BIT(IWDGx->SR, IWDG_SR_RVU) == (IWDG_SR_RVU));
+}
+
+/**
+  * @brief  Check if flag Window Value Update is set or not
+  * @rmtoll SR           WVU           LL_IWDG_IsActiveFlag_WVU
+  * @param  IWDGx IWDG Instance
+  * @retval State of bit (1 or 0).
+  */
+__STATIC_INLINE uint32_t LL_IWDG_IsActiveFlag_WVU(IWDG_TypeDef *IWDGx)
+{
+  return (uint32_t)(READ_BIT(IWDGx->SR, IWDG_SR_WVU) == (IWDG_SR_WVU));
+}
+
+/**
+  * @brief  Check if all flags Prescaler, Reload & Window Value Update are reset or not
+  * @rmtoll SR           PVU           LL_IWDG_IsReady\n
+  *         SR           WVU           LL_IWDG_IsReady\n
+  *         SR           RVU           LL_IWDG_IsReady
+  * @param  IWDGx IWDG Instance
+  * @retval State of bits (1 or 0).
+  */
+__STATIC_INLINE uint32_t LL_IWDG_IsReady(IWDG_TypeDef *IWDGx)
+{
+  return (uint32_t)(READ_BIT(IWDGx->SR, IWDG_SR_PVU | IWDG_SR_RVU | IWDG_SR_WVU) == 0U);
+}
+
+/**
+  * @}
+  */
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#endif /* IWDG) */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __STM32L4xx_LL_IWDG_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/