From 242430d5e52cf8ee49dcd1701cf134e7454910c6 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 9 Feb 2019 18:20:57 +0100 Subject: Change license to ISC and reorganise MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- .gitignore | 3 - COPYING | 17 -- LICENSE | 670 +----------------------------------------------- Makefile | 55 ++++ README | 1 - algorithm_output_size.c | 24 ++ behex_lower.c | 20 ++ behex_upper.c | 20 ++ common.h | 9 + config.mk | 6 + digest.c | 66 +++++ libsha2.h | 268 +++++++++++++++++++ src/libsha2.h | 30 --- src/libsha2/digest.c | 217 ---------------- src/libsha2/digest.h | 50 ---- src/libsha2/files.c | 72 ------ src/libsha2/files.h | 40 --- src/libsha2/hex.c | 81 ------ src/libsha2/hex.h | 62 ----- src/libsha2/mac/hmac.c | 21 -- src/libsha2/mac/hmac.h | 25 -- src/libsha2/state.c | 151 ----------- src/libsha2/state.h | 221 ---------------- state_initialise.c | 125 +++++++++ state_output_size.c | 15 ++ sum_fd.c | 46 ++++ unhex.c | 26 ++ update.c | 140 ++++++++++ 28 files changed, 832 insertions(+), 1649 deletions(-) delete mode 100644 COPYING create mode 100644 Makefile create mode 100644 algorithm_output_size.c create mode 100644 behex_lower.c create mode 100644 behex_upper.c create mode 100644 common.h create mode 100644 config.mk create mode 100644 digest.c create mode 100644 libsha2.h delete mode 100644 src/libsha2.h delete mode 100644 src/libsha2/digest.c delete mode 100644 src/libsha2/digest.h delete mode 100644 src/libsha2/files.c delete mode 100644 src/libsha2/files.h delete mode 100644 src/libsha2/hex.c delete mode 100644 src/libsha2/hex.h delete mode 100644 src/libsha2/mac/hmac.c delete mode 100644 src/libsha2/mac/hmac.h delete mode 100644 src/libsha2/state.c delete mode 100644 src/libsha2/state.h create mode 100644 state_initialise.c create mode 100644 state_output_size.c create mode 100644 sum_fd.c create mode 100644 unhex.c create mode 100644 update.c diff --git a/.gitignore b/.gitignore index 2159246..6851f37 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ _/ -/bin/ -/obj/ \#*\# .* !.git* @@ -19,4 +17,3 @@ _/ *.ps *.dvi *.test - diff --git a/COPYING b/COPYING deleted file mode 100644 index d7b0ce5..0000000 --- a/COPYING +++ /dev/null @@ -1,17 +0,0 @@ -libsha2 – SHA-2-family hashing library - -Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) - -This library is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This library 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 Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this library. If not, see . - diff --git a/LICENSE b/LICENSE index dba13ed..e2e53aa 100644 --- a/LICENSE +++ b/LICENSE @@ -1,661 +1,15 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 +ISC License - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. +© 2015, 2019 Mattias Andrée - Preamble +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are 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. - - 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. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - 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 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 work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero 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 Affero 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 Affero 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 Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..566907e --- /dev/null +++ b/Makefile @@ -0,0 +1,55 @@ +.NONPOSIX: + +CONFIGFILE = config.mk + +LIB_MAJOR = 1 +LIB_MINOR = 0 +LIB_VERSION = $(LIB_MAJOR).$(LIB_MINOR) + +LIBEXT = so +LIBFLAGS = -shared -Wl,-soname,libsha2.$(LIBEXT).$(LIB_MAJOR) + +include $(CONFIGFILE) + + +HDR =\ + libsha2.h\ + common.h + +OBJ =\ + algorithm_output_size.o\ + behex_lower.o\ + behex_upper.o\ + digest.o\ + state_initialise.o\ + state_output_size.o\ + sum_fd.o\ + unhex.o\ + update.o\ + + +all: libsha2.a libsha2.$(LIBEXT) +$(OBJ): $(@:.o=.c) $(HDR) +$(OBJ:.o=.lo): $(@:.lo=.c) $(HDR) + +.c.o: + $(CC) -c -o $@ $< $(CFLAGS) + +.c.lo: + $(CC) -fPIC -c -o $@ $< $(CFLAGS) + +libsha2.$(LIBEXT): $(OBJ) + $(CC) $(LIBFLAGS) -o $@ $(OBJ) $(LDFLAGS) + +libsha2.a: $(OBJ) + -rm -f -- $@ + $(AR) rc $@ $? + $(AR) -s $@ + +clean: + -rm -f -- *.o *.lo *.su *.a *.so + +.SUFFIXES: +.SUFFIXES: .lo .o .c + +.PHONY: all check install uninstall clean diff --git a/README b/README index 392e533..4fedb6f 100644 --- a/README +++ b/README @@ -12,4 +12,3 @@ RATIONALE SEE ALSO libkeccak(7), sha224sum(1), sha256sum(1), sha384sum(1), sha512sum(1) - diff --git a/algorithm_output_size.c b/algorithm_output_size.c new file mode 100644 index 0000000..9089aa4 --- /dev/null +++ b/algorithm_output_size.c @@ -0,0 +1,24 @@ +/* See LICENSE file for copyright and license details. */ +#include "common.h" + + +/** + * Get the output size of an algorithm + * + * @parma algorithm The hashing algorithm + * @return The number of bytes in the output, zero on error + */ +size_t +libsha2_algorithm_output_size(enum libsha2_algorithm algorithm) +{ + switch (algorithm) { + case LIBSHA2_224: return 28; + case LIBSHA2_256: return 32; + case LIBSHA2_384: return 48; + case LIBSHA2_512: return 64; + case LIBSHA2_512_224: return 28; + case LIBSHA2_512_256: return 32; + default: + return errno = EINVAL, 0; + } +} diff --git a/behex_lower.c b/behex_lower.c new file mode 100644 index 0000000..476bb18 --- /dev/null +++ b/behex_lower.c @@ -0,0 +1,20 @@ +/* See LICENSE file for copyright and license details. */ +#include "common.h" + + +/** + * Convert a binary hashsum to lower case hexadecimal representation + * + * @param output Output array, should have an allocation size of at least `2 * n + 1` + * @param hashsum The hashsum to convert + * @param n The size of `hashsum` + */ +void +libsha2_behex_lower(char *restrict output, const char *restrict hashsum, size_t n) +{ + output[2 * n] = '\0'; + while (n--) { + output[2 * n + 0] = "0123456789abcdef"[(hashsum[n] >> 4) & 15]; + output[2 * n + 1] = "0123456789abcdef"[(hashsum[n] >> 0) & 15]; + } +} diff --git a/behex_upper.c b/behex_upper.c new file mode 100644 index 0000000..29e5f91 --- /dev/null +++ b/behex_upper.c @@ -0,0 +1,20 @@ +/* See LICENSE file for copyright and license details. */ +#include "common.h" + + +/** + * Convert a binary hashsum to upper case hexadecimal representation + * + * @param output Output array, should have an allocation size of at least `2 * n + 1` + * @param hashsum The hashsum to convert + * @param n The size of `hashsum` + */ +void +libsha2_behex_upper(char *restrict output, const char *restrict hashsum, size_t n) +{ + output[2 * n] = '\0'; + while (n--) { + output[2 * n + 0] = "0123456789ABCDEF"[(hashsum[n] >> 4) & 15]; + output[2 * n + 1] = "0123456789ABCDEF"[(hashsum[n] >> 0) & 15]; + } +} diff --git a/common.h b/common.h new file mode 100644 index 0000000..746cf36 --- /dev/null +++ b/common.h @@ -0,0 +1,9 @@ +/* See LICENSE file for copyright and license details. */ +#include "libsha2.h" + +#include +#include +#include +#include +#include +#include diff --git a/config.mk b/config.mk new file mode 100644 index 0000000..c27a18b --- /dev/null +++ b/config.mk @@ -0,0 +1,6 @@ +PREFIX = /usr +MANPREFIX = $(PREFIX)/share/man + +CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 +CFLAGS = -std=c99 -Wall -Wextra -O3 $(CPPFLAGS) +LDFLAGS = -s diff --git a/digest.c b/digest.c new file mode 100644 index 0000000..8658388 --- /dev/null +++ b/digest.c @@ -0,0 +1,66 @@ +/* See LICENSE file for copyright and license details. */ +#include "common.h" + + +/** + * Absorb the last part of the message and output a hash + * + * @param state The hashing state + * @param message The message, in bits + * @param msglen The length of the message, zero if there is nothing more to absorb + * @param output The output buffer for the hash + */ +void +libsha2_digest(struct libsha2_state *restrict state, const char *restrict message, size_t msglen, char *output) +{ + char *appendix; + size_t i, j, k, n; + + if (msglen & ~7) { + libsha2_update(state, message, msglen & ~7); + message += msglen & ~7; + msglen &= 7; + } + + k = 8 * state->chunk_size; + n = state->chunk_size + 8; + n = (k + (n % k)) % k; + n = n / 8 - 1; + + appendix = state->appendix; + if (msglen) { + j = 7 - msglen; + *appendix = *message; + *appendix |= 1 << j; + *appendix &= ~((1 << j) - 1); + } else { + *appendix = (unsigned char)128; + } + + k = state->message_size + msglen; + i = state->chunk_size / 8; + appendix += n + i - 1; + for (i = i < sizeof(size_t) ? i : sizeof(size_t); i--;) + *(appendix - i) = (unsigned char)((k >> (i * 8)) & 255); + + n += state->chunk_size; + libsha2_update(state, state->appendix, n); + + n = libsha2_algorithm_output_size(state->algorithm); + switch (state->algorithm) { + case LIBSHA2_224: + case LIBSHA2_256: + for (i = 0; i < 8; i++) + for (j = 0; j < (state->chunk_size / 16); j++) + if (k = (i + 1) * (state->chunk_size / 16) - j - 1, k < n) + output[k] = (char)((state->h.b32[i] >> (8 * j)) & 255); + break; + + default: + for (i = 0; i < 8; i++) + for (j = 0; j < (state->chunk_size / 16); j++) + if (k = (i + 1) * (state->chunk_size / 16) - j - 1, k < n) + output[k] = (char)((state->h.b64[i] >> (8 * j)) & 255); + break; + } +} diff --git a/libsha2.h b/libsha2.h new file mode 100644 index 0000000..5b37130 --- /dev/null +++ b/libsha2.h @@ -0,0 +1,268 @@ +/* See LICENSE file for copyright and license details. */ +#ifndef LIBSHA2_H +#define LIBSHA2_H 1 + +#include +#include + + +/** + * Algorithms supported by libsha2 + */ +enum libsha2_algorithm { + /** + * SHA-224, outputs 28 bytes + */ + LIBSHA2_224, + + /** + * SHA-256, outputs 32 bytes + */ + LIBSHA2_256, + + /** + * SHA-384, outputs 48 bytes + */ + LIBSHA2_384, + + /** + * SHA-512, outputs 64 bytes + */ + LIBSHA2_512, + + /** + * SHA-512/224, outputs 28 bytes + */ + LIBSHA2_512_224, + + /** + * SHA-512/256, outputs 32 bytes + */ + LIBSHA2_512_256 +}; + +/** + * Data structure that describes the state of a hashing process + * + * Data that could just as well be allocated (with `auto`) are + * allocated here so that is is easier to wipe the data without + * exposing two versions of each function: one to wipe data, + * and one not to wipe data to gain speed, now you can use use + * `explicit_bzero` (or `memset`) when you are done. + * + * This data structure is flat (it contains dynamic pointers) + * and can be marshalled and unmarshalled naïvely, and does + * not need destroyed; however, if you when to marshall it + * using as little memory as possible, this are comments + * about data that does not need to be mashalled + */ +struct libsha2_state { + /** + * The size of the message, as far as processed, in bits; + */ + size_t message_size; + + /** + * Round constants + */ + union { + /** + * For 32-bit algorithms + */ + uint32_t b32[64]; + + /** + * For 64-bit algorithms + */ + uint64_t b64[80]; + } k; + + /** + * Words + * + * Does not need to be marshalled + */ + union { + /** + * For 32-bit algorithms + */ + uint32_t b32[64]; + + /** + * For 64-bit algorithms + */ + uint64_t b64[80]; + } w; + + /** + * Hashing values + */ + union { + /** + * For 32-bit algorithms + */ + uint32_t b32[8]; + + /** + * For 64-bit algorithms + */ + uint64_t b64[8]; + } h; + + /** + * Temporary hashing values + * + * Does not need to be marshalled + */ + union { + /** + * For 32-bit algorithms + */ + uint32_t b32[8]; + + /** + * For 64-bit algorithms + */ + uint64_t b64[8]; + } work_h; + + /** + * Space for chunks to process, limited + * to 64 bytes on 32-bit algorithms + */ + unsigned char chunk[128]; + + /** + * Space for storing the last bits and + * the padding + * + * Does not need to be marshalled + */ + char appendix[256]; + + /** + * The size of the chunks, in bytes + */ + size_t chunk_size; + + /** + * The algorithm that is used + */ + enum libsha2_algorithm algorithm; + + int __padding1; +}; + + +/** + * Initialise a state + * + * @parma state The state that should be initialised + * @parma algorithm The hashing algorithm + * @return Zero on success, -1 on error + */ +#if defined(__GNUC__) +__attribute__((__leaf__, __nothrow__, __nonnull__)) +#endif +int libsha2_state_initialise(struct libsha2_state *restrict, enum libsha2_algorithm); + +/** + * Get the output size of the algorithm specified for a state + * + * @parma state The state + * @return The number of bytes in the output, zero on error + */ +#if defined(__GNUC__) +__attribute__((__nothrow__, __nonnull__, __pure__)) +#endif +size_t libsha2_state_output_size(const struct libsha2_state *restrict); + +/** + * Get the output size of an algorithm + * + * @parma algorithm The hashing algorithm + * @return The number of bytes in the output, zero on error + */ +#if defined(__GNUC__) +__attribute__((__leaf__, __nothrow__, __const__)) +#endif +size_t libsha2_algorithm_output_size(enum libsha2_algorithm); + +/** + * Absorb more of the message + * + * @param state The hashing state + * @param message The message, in bits, must be equivalent to 0 modulus 8 + * @param msglen The length of the message + */ +#if defined(__GNUC__) +__attribute__((__nonnull__, __nothrow__)) +#endif +void libsha2_update(struct libsha2_state *restrict, const char *restrict, size_t); + +/** + * Absorb the last part of the message and output a hash + * + * @param state The hashing state + * @param message The message, in bits + * @param msglen The length of the message, zero if there is nothing more to absorb + * @param output The output buffer for the hash + */ +#if defined(__GNUC__) +__attribute__((__nonnull__(1, 4), __nothrow__)) +#endif +void libsha2_digest(struct libsha2_state *restrict, const char *restrict, size_t, char *); + +/** + * Calculate the checksum for a file, + * the content of the file is assumed non-sensitive + * + * @param fd The file descriptor of the file + * @param algorithm The hashing algorithm + * @param hashsum Output buffer for the hash + * @return Zero on success, -1 on error + */ +#if defined(__GNUC__) +__attribute__((__nonnull__, __leaf__)) +#endif +int libsha2_sum_fd(int, enum libsha2_algorithm, char *restrict); + +/** + * Convert a binary hashsum to lower case hexadecimal representation + * + * @param output Output array, should have an allocation size of at least `2 * n + 1` + * @param hashsum The hashsum to convert + * @param n The size of `hashsum` + */ +#if defined(__GNUC__) +__attribute__((__leaf__, __nonnull__, __nothrow__)) +#endif +void libsha2_behex_lower(char *restrict, const char *restrict, size_t); + +/** + * Convert a binary hashsum to upper case hexadecimal representation + * + * @param output Output array, should have an allocation size of at least `2 * n + 1` + * @param hashsum The hashsum to convert + * @param n The size of `hashsum` + */ +#if defined(__GNUC__) +__attribute__((__leaf__, __nonnull__, __nothrow__)) +#endif +void libsha2_behex_upper(char *restrict, const char *restrict, size_t); + +/** + * Convert a hexadecimal hashsum (both lower case, upper + * case and mixed is supported) to binary representation + * + * @param output Output array, should have an allocation + * size of at least `strlen(hashsum) / 2` + * @param hashsum The hashsum to convert + */ +#if defined(__GNUC__) +__attribute__((__leaf__, __nonnull__, __nothrow__)) +#endif +void libsha2_unhex(char *restrict, const char *restrict); + + +#endif diff --git a/src/libsha2.h b/src/libsha2.h deleted file mode 100644 index d6ebd2b..0000000 --- a/src/libsha2.h +++ /dev/null @@ -1,30 +0,0 @@ -/** - * libsha2 – SHA-2-family hashing library - * - * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this library. If not, see . - */ -#ifndef LIBSHA2_H -#define LIBSHA2_H 1 - - -#include "libsha2/digest.h" -#include "libsha2/state.h" -#include "libsha2/hex.h" -#include "libsha2/files.h" - - -#endif - diff --git a/src/libsha2/digest.c b/src/libsha2/digest.c deleted file mode 100644 index 6b4765e..0000000 --- a/src/libsha2/digest.c +++ /dev/null @@ -1,217 +0,0 @@ -/** - * libsha2 – SHA-2-family hashing library - * - * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this library. If not, see . - */ -#include "digest.h" -#include -#include - - - -/** - * Unified implementation (what can unified without performance impact) - * of the chunk processing for all SHA-2 functions - * - * @param A Wordsize-dependent constant, take a look at the code - * @param B Wordsize-dependent constant, take a look at the code - * @param C Wordsize-dependent constant, take a look at the code - * @param D Wordsize-dependent constant, take a look at the code - * @param E Wordsize-dependent constant, take a look at the code - * @param F Wordsize-dependent constant, take a look at the code - * @param G Wordsize-dependent constant, take a look at the code - * @param H Wordsize-dependent constant, take a look at the code - * @param I Wordsize-dependent constant, take a look at the code - * @param J Wordsize-dependent constant, take a look at the code - * @param K Wordsize-dependent constant, take a look at the code - * @param L Wordsize-dependent constant, take a look at the code - * @param WORD_T `__typeof()` on any wordsize-dependent variable, with exact size - * @param k Round constants - * @param w Words - * @param h Hash values - * @param work_h Space for temporary hash values - */ -#define SHA2_IMPLEMENTATION(A, B, C, D, E, F, G, H, I, J, K, L, WORD_T, k, w, h, work_h) \ - memcpy(work_h, h, sizeof(work_h)); \ - \ - memset(w, 0, 16 * sizeof(*(w))); \ - for (i = 0; i < 16; i++) \ - for (j = 0; j < sizeof(WORD_T); j++) \ - w[i] |= ((WORD_T)(state->chunk[(i + 1) * sizeof(WORD_T) - j - 1])) << (j << 3); \ - \ - for (i = 16; i < sizeof(k) / sizeof(*(k)); i++) \ - { \ - w[i] = w[i - 16] + w[i - 7]; \ - w[i] += ROTR(w[i - 15], A) ^ ROTR(w[i - 15], B) ^ (w[i - 15] >> (C)); \ - w[i] += ROTR(w[i - 2], D) ^ ROTR(w[i - 2], E) ^ (w[i - 2] >> (F)); \ - } \ - \ - for (i = 0; i < sizeof(k) / sizeof(*(k)); i++) \ - { \ - s1 = (work_h[4] & work_h[5]) ^ (work_h[6] & ~(work_h[4])); \ - s1 += work_h[7] + k[i] + w[i]; \ - s0 = (work_h[0] & work_h[1]) ^ (work_h[0] & work_h[2]) ^ (work_h[1] & work_h[2]); \ - s1 += ROTR(work_h[4], G) ^ ROTR(work_h[4], H) ^ ROTR(work_h[4], I); \ - s0 += ROTR(work_h[0], J) ^ ROTR(work_h[0], K) ^ ROTR(work_h[0], L); \ - \ - memmove(work_h + 1, work_h, 7 * sizeof(*(work_h))); \ - work_h[4] += s1; \ - work_h[0] = s1 + s0; \ - } \ - \ - for (i = 0; i < 8; i++) \ - h[i] += work_h[i] - - - -/** - * Process a chunk using SHA-256 - * - * @param state The hashing state - */ -static __attribute__((nonnull, nothrow)) -void process256(libsha2_state_t* restrict state) -{ - uint32_t s0, s1; - size_t i, j; -#define ROTR(X, N) (((X) >> (N)) | ((X) << ((sizeof(uint32_t) * 8) - (N)))) - SHA2_IMPLEMENTATION(7, 18, 3, 17, 19, 10, 6, 11, 25, 2, 13, 22, uint32_t, - state->k.b32, state->w.b32, state->h.b32, state->work_h.b32); -#undef ROTR -} - - -/** - * Process a chunk using SHA-512 - * - * @param state The hashing state - */ -static __attribute__((nonnull, nothrow)) -void process512(libsha2_state_t* restrict state) -{ - uint64_t s0, s1; - size_t i, j; -#define ROTR(X, N) (((X) >> (N)) | ((X) << ((sizeof(uint64_t) * 8) - (N)))) - SHA2_IMPLEMENTATION(1, 8, 7, 19, 61, 6, 14, 18, 41, 28, 34, 39, uint64_t, - state->k.b64, state->w.b64, state->h.b64, state->work_h.b64); -#undef ROTR -} - - -/** - * Absorb more of the message - * - * @param state The hashing state - * @param message The message, in bits, must be equivalent to 0 modulus 8 - * @param msglen The length of the message - */ -void libsha2_update(libsha2_state_t* restrict state, const char* restrict message, size_t msglen) -{ - size_t n, off, mlen; - - msglen /= 8; - mlen = state->message_size / 8; - - while (msglen) - { - off = mlen % state->chunk_size; - n = state->chunk_size - off; - n = n < msglen ? n : msglen; - memcpy(state->chunk + off, message, n); - if (off + n == state->chunk_size) - switch (state->algorithm) - { - case LIBSHA2_224: - case LIBSHA2_256: - process256(state); - break; - - default: - process512(state); - break; - } - message += n, mlen += n, msglen -= n; - } - - state->message_size = mlen * 8; -} - - -/** - * Absorb the last part of the message and output a hash - * - * @param state The hashing state - * @param message The message, in bits - * @param msglen The length of the message, zero if there is nothing more to absorb - * @param output The output buffer for the hash - */ -void libsha2_digest(libsha2_state_t* restrict state, const char* restrict message, size_t msglen, char* output) -{ - char* appendix; - size_t i, j, k, n; - - if (msglen & ~7) - { - libsha2_update(state, message, msglen & ~7); - message += msglen & ~7; - msglen &= 7; - } - - k = 8 * state->chunk_size; - n = state->chunk_size + 8; - n = (k + (n % k)) % k; - n = n / 8 - 1; - - appendix = state->appendix; - if (msglen) - { - j = 7 - msglen; - *appendix = *message; - *appendix |= 1 << j; - *appendix &= ~((1 << j) - 1); - } - else - *appendix = (unsigned char)128; - - k = state->message_size + msglen; - i = state->chunk_size / 8; - appendix += n + i - 1; - for (i = i < sizeof(size_t) ? i : sizeof(size_t); i--;) - *(appendix - i) = (unsigned char)((k >> (i * 8)) & 255); - - n += state->chunk_size; - libsha2_update(state, state->appendix, n); - - n = libsha2_algorithm_output_size(state->algorithm); - switch (state->algorithm) - { - case LIBSHA2_224: - case LIBSHA2_256: - for (i = 0; i < 8; i++) - for (j = 0; j < (state->chunk_size / 16); j++) - if (k = (i + 1) * (state->chunk_size / 16) - j - 1, k < n) - output[k] = (char)((state->h.b32[i] >> (8 * j)) & 255); - break; - - default: - for (i = 0; i < 8; i++) - for (j = 0; j < (state->chunk_size / 16); j++) - if (k = (i + 1) * (state->chunk_size / 16) - j - 1, k < n) - output[k] = (char)((state->h.b64[i] >> (8 * j)) & 255); - break; - } -} - diff --git a/src/libsha2/digest.h b/src/libsha2/digest.h deleted file mode 100644 index be81f90..0000000 --- a/src/libsha2/digest.h +++ /dev/null @@ -1,50 +0,0 @@ -/** - * libsha2 – SHA-2-family hashing library - * - * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this library. If not, see . - */ -#ifndef LIBSHA2_DIGEST_H -#define LIBSHA2_DIGEST_H 1 - - -#include "state.h" - - -/** - * Absorb more of the message - * - * @param state The hashing state - * @param message The message, in bits, must be equivalent to 0 modulus 8 - * @param msglen The length of the message - */ -__attribute__((nonnull, nothrow)) -void libsha2_update(libsha2_state_t* restrict state, const char* restrict message, size_t msglen); - -/** - * Absorb the last part of the message and output a hash - * - * @param state The hashing state - * @param message The message, in bits - * @param msglen The length of the message, zero if there is nothing more to absorb - * @param output The output buffer for the hash - */ -__attribute__((nonnull(1, 4), nothrow)) -void libsha2_digest(libsha2_state_t* restrict state, const char* restrict message, size_t msglen, char* output); - - - -#endif - diff --git a/src/libsha2/files.c b/src/libsha2/files.c deleted file mode 100644 index 903c592..0000000 --- a/src/libsha2/files.c +++ /dev/null @@ -1,72 +0,0 @@ -/** - * libsha2 – SHA-2-family hashing library - * - * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this library. If not, see . - */ -#include "files.h" -#include "digest.h" -#include -#include -#include -#include -#include - - - -/** - * Calculate the checksum for a file, - * the content of the file is assumed non-sensitive - * - * @param fd The file descriptor of the file - * @param algorithm The hashing algorithm - * @param hashsum Output buffer for the hash - * @return Zero on success, -1 on error - */ -int libsha2_sum_fd(int fd, libsha2_algorithm_t algorithm, char* restrict hashsum) -{ - libsha2_state_t state; - ssize_t got; - struct stat attr; - size_t blksize = 4096; - char* restrict chunk; - - if (libsha2_state_initialise(&state, algorithm) < 0) - return -1; - - if (fstat(fd, &attr) == 0) - if (attr.st_blksize > 0) - blksize = (size_t)(attr.st_blksize); - - chunk = alloca(blksize); - - for (;;) - { - got = read(fd, chunk, blksize); - if (got < 0) - { - if (errno == EINTR) - continue; - return -1; - } - if (got == 0) - break; - libsha2_update(&state, chunk, (size_t)got); - } - - libsha2_digest(&state, NULL, 0, hashsum); - return 0; -} - diff --git a/src/libsha2/files.h b/src/libsha2/files.h deleted file mode 100644 index 2854cd7..0000000 --- a/src/libsha2/files.h +++ /dev/null @@ -1,40 +0,0 @@ -/** - * libsha2 – SHA-2-family hashing library - * - * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this library. If not, see . - */ -#ifndef LIBSHA2_FILES_H -#define LIBSHA2_FILES_H 1 - - -#include "state.h" - - -/** - * Calculate the checksum for a file, - * the content of the file is assumed non-sensitive - * - * @param fd The file descriptor of the file - * @param algorithm The hashing algorithm - * @param hashsum Output buffer for the hash - * @return Zero on success, -1 on error - */ -__attribute__((nonnull, leaf)) -int libsha2_sum_fd(int fd, libsha2_algorithm_t algorithm, char* restrict hashsum); - - -#endif - diff --git a/src/libsha2/hex.c b/src/libsha2/hex.c deleted file mode 100644 index 1f5c372..0000000 --- a/src/libsha2/hex.c +++ /dev/null @@ -1,81 +0,0 @@ -/** - * libsha2 – SHA-2-family hashing library - * - * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this library. If not, see . - */ -#include "hex.h" -#include - - - -/** - * Convert a binary hashsum to lower case hexadecimal representation - * - * @param output Output array, should have an allocation size of at least `2 * n + 1` - * @param hashsum The hashsum to convert - * @param n The size of `hashsum` - */ -void libsha2_behex_lower(char* restrict output, const char* restrict hashsum, size_t n) -{ - output[2 * n] = '\0'; - while (n--) - { - output[2 * n + 0] = "0123456789abcdef"[(hashsum[n] >> 4) & 15]; - output[2 * n + 1] = "0123456789abcdef"[(hashsum[n] >> 0) & 15]; - } -} - - -/** - * Convert a binary hashsum to upper case hexadecimal representation - * - * @param output Output array, should have an allocation size of at least `2 * n + 1` - * @param hashsum The hashsum to convert - * @param n The size of `hashsum` - */ -void libsha2_behex_upper(char* restrict output, const char* restrict hashsum, size_t n) -{ - output[2 * n] = '\0'; - while (n--) - { - output[2 * n + 0] = "0123456789ABCDEF"[(hashsum[n] >> 4) & 15]; - output[2 * n + 1] = "0123456789ABCDEF"[(hashsum[n] >> 0) & 15]; - } -} - - -/** - * Convert a hexadecimal hashsum (both lower case, upper - * case and mixed is supported) to binary representation - * - * @param output Output array, should have an allocation size of at least `strlen(hashsum) / 2` - * @param hashsum The hashsum to convert - */ -void libsha2_unhex(char* restrict output, const char* restrict hashsum) -{ - size_t n = strlen(hashsum) / 2; - while (n--) - { - char a = hashsum[2 * n + 0]; - char b = hashsum[2 * n + 1]; - - a = (char)((a & 15) + (a > '9' ? 9 : 0)); - b = (char)((b & 15) + (b > '9' ? 9 : 0)); - - output[n] = (char)((a << 4) | b); - } -} - diff --git a/src/libsha2/hex.h b/src/libsha2/hex.h deleted file mode 100644 index d9581b0..0000000 --- a/src/libsha2/hex.h +++ /dev/null @@ -1,62 +0,0 @@ -/** - * libsha2 – SHA-2-family hashing library - * - * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this library. If not, see . - */ -#ifndef LIBSHA2_HEX_H -#define LIBSHA2_HEX_H 1 - - -#include - - - -/** - * Convert a binary hashsum to lower case hexadecimal representation - * - * @param output Output array, should have an allocation size of at least `2 * n + 1` - * @param hashsum The hashsum to convert - * @param n The size of `hashsum` - */ -__attribute__((leaf, nonnull, nothrow)) -void libsha2_behex_lower(char* restrict output, const char* restrict hashsum, size_t n); - - -/** - * Convert a binary hashsum to upper case hexadecimal representation - * - * @param output Output array, should have an allocation size of at least `2 * n + 1` - * @param hashsum The hashsum to convert - * @param n The size of `hashsum` - */ -__attribute__((leaf, nonnull, nothrow)) -void libsha2_behex_upper(char* restrict output, const char* restrict hashsum, size_t n); - - -/** - * Convert a hexadecimal hashsum (both lower case, upper - * case and mixed is supported) to binary representation - * - * @param output Output array, should have an allocation size of at least `strlen(hashsum) / 2` - * @param hashsum The hashsum to convert - */ -__attribute__((leaf, nonnull, nothrow)) -void libsha2_unhex(char* restrict output, const char* restrict hashsum); - - - -#endif - diff --git a/src/libsha2/mac/hmac.c b/src/libsha2/mac/hmac.c deleted file mode 100644 index 2ee883d..0000000 --- a/src/libsha2/mac/hmac.c +++ /dev/null @@ -1,21 +0,0 @@ -/** - * libsha2 – SHA-2-family hashing library - * - * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this library. If not, see . - */ -#include "hmac.h" - - diff --git a/src/libsha2/mac/hmac.h b/src/libsha2/mac/hmac.h deleted file mode 100644 index 745d610..0000000 --- a/src/libsha2/mac/hmac.h +++ /dev/null @@ -1,25 +0,0 @@ -/** - * libsha2 – SHA-2-family hashing library - * - * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this library. If not, see . - */ -#ifndef LIBSHA2_MAC_HMAC_H -#define LIBSHA2_MAC_HMAC_H 1 - - - -#endif - diff --git a/src/libsha2/state.c b/src/libsha2/state.c deleted file mode 100644 index fb6b4fc..0000000 --- a/src/libsha2/state.c +++ /dev/null @@ -1,151 +0,0 @@ -/** - * libsha2 – SHA-2-family hashing library - * - * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this library. If not, see . - */ -#include "state.h" -#include -#include - - - -/** - * Round constants, SHA-256, should keep the 32 most significant bits of 64 first constants - */ -static const uint64_t ROUND_CONSTANTS[] = { - 0x428A2F98D728AE22ULL, 0x7137449123EF65CDULL, 0xB5C0FBCFEC4D3B2FULL, 0xE9B5DBA58189DBBCULL, - 0x3956C25BF348B538ULL, 0x59F111F1B605D019ULL, 0x923F82A4AF194F9BULL, 0xAB1C5ED5DA6D8118ULL, - 0xD807AA98A3030242ULL, 0x12835B0145706FBEULL, 0x243185BE4EE4B28CULL, 0x550C7DC3D5FFB4E2ULL, - 0x72BE5D74F27B896FULL, 0x80DEB1FE3B1696B1ULL, 0x9BDC06A725C71235ULL, 0xC19BF174CF692694ULL, - 0xE49B69C19EF14AD2ULL, 0xEFBE4786384F25E3ULL, 0x0FC19DC68B8CD5B5ULL, 0x240CA1CC77AC9C65ULL, - 0x2DE92C6F592B0275ULL, 0x4A7484AA6EA6E483ULL, 0x5CB0A9DCBD41FBD4ULL, 0x76F988DA831153B5ULL, - 0x983E5152EE66DFABULL, 0xA831C66D2DB43210ULL, 0xB00327C898FB213FULL, 0xBF597FC7BEEF0EE4ULL, - 0xC6E00BF33DA88FC2ULL, 0xD5A79147930AA725ULL, 0x06CA6351E003826FULL, 0x142929670A0E6E70ULL, - 0x27B70A8546D22FFCULL, 0x2E1B21385C26C926ULL, 0x4D2C6DFC5AC42AEDULL, 0x53380D139D95B3DFULL, - 0x650A73548BAF63DEULL, 0x766A0ABB3C77B2A8ULL, 0x81C2C92E47EDAEE6ULL, 0x92722C851482353BULL, - 0xA2BFE8A14CF10364ULL, 0xA81A664BBC423001ULL, 0xC24B8B70D0F89791ULL, 0xC76C51A30654BE30ULL, - 0xD192E819D6EF5218ULL, 0xD69906245565A910ULL, 0xF40E35855771202AULL, 0x106AA07032BBD1B8ULL, - 0x19A4C116B8D2D0C8ULL, 0x1E376C085141AB53ULL, 0x2748774CDF8EEB99ULL, 0x34B0BCB5E19B48A8ULL, - 0x391C0CB3C5C95A63ULL, 0x4ED8AA4AE3418ACBULL, 0x5B9CCA4F7763E373ULL, 0x682E6FF3D6B2B8A3ULL, - 0x748F82EE5DEFB2FCULL, 0x78A5636F43172F60ULL, 0x84C87814A1F0AB72ULL, 0x8CC702081A6439ECULL, - 0x90BEFFFA23631E28ULL, 0xA4506CEBDE82BDE9ULL, 0xBEF9A3F7B2C67915ULL, 0xC67178F2E372532BULL, - 0xCA273ECEEA26619CULL, 0xD186B8C721C0C207ULL, 0xEADA7DD6CDE0EB1EULL, 0xF57D4F7FEE6ED178ULL, - 0x06F067AA72176FBAULL, 0x0A637DC5A2C898A6ULL, 0x113F9804BEF90DAEULL, 0x1B710B35131C471BULL, - 0x28DB77F523047D84ULL, 0x32CAAB7B40C72493ULL, 0x3C9EBE0A15C9BEBCULL, 0x431D67C49C100D4CULL, - 0x4CC5D4BECB3E42B6ULL, 0x597F299CFC657E2AULL, 0x5FCB6FAB3AD6FAECULL, 0x6C44198C4A475817ULL}; - - - -/** - * Initialise a state - * - * @parma state The state that should be initialised - * @parma algorithm The hashing algorithm - * @return Zero on success, -1 on error - */ -int libsha2_state_initialise(libsha2_state_t* restrict state, libsha2_algorithm_t algorithm) -{ - static const uint32_t H_224[] = { - 0xC1059ED8UL, 0x367CD507UL, 0x3070DD17UL, 0xF70E5939UL, - 0xFFC00B31UL, 0x68581511UL, 0x64F98FA7UL, 0xBEFA4FA4UL}; - static const uint32_t H_256[] = { - 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, - 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL}; - static const uint64_t H_384[] = { - 0xCBBB9D5DC1059ED8ULL, 0x629A292A367CD507ULL, 0x9159015A3070DD17ULL, 0x152FECD8F70E5939ULL, - 0x67332667FFC00B31ULL, 0x8EB44A8768581511ULL, 0xDB0C2E0D64F98FA7ULL, 0x47B5481DBEFA4FA4ULL}; - static const uint64_t H_512[] = { - 0x6A09E667F3BCC908ULL, 0xBB67AE8584CAA73BULL, 0x3C6EF372FE94F82BULL, 0xA54FF53A5F1D36F1ULL, - 0x510E527FADE682D1ULL, 0x9B05688C2B3E6C1FULL, 0x1F83D9ABFB41BD6BULL, 0x5BE0CD19137E2179ULL}; - static const uint64_t H_512_224[] = { - 0x8C3D37C819544DA2ULL, 0x73E1996689DCD4D6ULL, 0x1DFAB7AE32FF9C82ULL, 0x679DD514582F9FCFULL, - 0x0F6D2B697BD44DA8ULL, 0x77E36F7304C48942ULL, 0x3F9D85A86A1D36C8ULL, 0x1112E6AD91D692A1ULL}; - static const uint64_t H_512_256[] = { - 0x22312194FC2BF72CULL, 0x9F555FA3C84C64C2ULL, 0x2393B86B6F53B151ULL, 0x963877195940EABDULL, - 0x96283EE2A88EFFE3ULL, 0xBE5E1E2553863992ULL, 0x2B0199FC2C85B8AAULL, 0x0EB72DDC81C52CA2ULL}; - - size_t i; - - memset(state, 0, sizeof(*state)); - state->message_size = 0; - state->algorithm = algorithm; - - /* Set initial hash values. */ - switch (algorithm) - { - case LIBSHA2_224: memcpy(state->h.b32, H_224, sizeof(H_224)); break; - case LIBSHA2_256: memcpy(state->h.b32, H_256, sizeof(H_256)); break; - case LIBSHA2_384: memcpy(state->h.b64, H_384, sizeof(H_384)); break; - case LIBSHA2_512: memcpy(state->h.b64, H_512, sizeof(H_512)); break; - case LIBSHA2_512_224: memcpy(state->h.b64, H_512_224, sizeof(H_512_224)); break; - case LIBSHA2_512_256: memcpy(state->h.b64, H_512_256, sizeof(H_512_256)); break; - default: - return errno = EINVAL, -1; - } - - /* Set round constants, and chunk size. */ - switch (algorithm) - { - case LIBSHA2_224: - case LIBSHA2_256: - for (i = 0; i < 64; i++) - state->k.b32[i] = (uint32_t)(ROUND_CONSTANTS[i] >> 32); - state->chunk_size = 64; - break; - - default: - memcpy(state->k.b64, ROUND_CONSTANTS, sizeof(ROUND_CONSTANTS)); - state->chunk_size = 128; - break; - } - - return 0; -} - - -/** - * Get the output size of the algorithm specified for a state - * - * @parma state The state - * @return The number of bytes in the output, zero on error - */ -size_t libsha2_state_output_size(const libsha2_state_t* restrict state) -{ - return libsha2_algorithm_output_size(state->algorithm); -} - - -/** - * Get the output size of an algorithm - * - * @parma algorithm The hashing algorithm - * @return The number of bytes in the output, zero on error - */ -size_t libsha2_algorithm_output_size(libsha2_algorithm_t algorithm) -{ - switch (algorithm) - { - case LIBSHA2_224: return 28; - case LIBSHA2_256: return 32; - case LIBSHA2_384: return 48; - case LIBSHA2_512: return 64; - case LIBSHA2_512_224: return 28; - case LIBSHA2_512_256: return 32; - default: - return errno = EINVAL, 0; - } -} - diff --git a/src/libsha2/state.h b/src/libsha2/state.h deleted file mode 100644 index f081a64..0000000 --- a/src/libsha2/state.h +++ /dev/null @@ -1,221 +0,0 @@ -/** - * libsha2 – SHA-2-family hashing library - * - * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this library. If not, see . - */ -#ifndef LIBSHA2_STATE_H -#define LIBSHA2_STATE_H 1 - - -#include -#include - - - -/** - * Algorithms supported by libsha2 - */ -typedef enum libsha2_algorithm - { - /** - * SHA-224, outputs 28 bytes - */ - LIBSHA2_224 = 1, - - /** - * SHA-256, outputs 32 bytes - */ - LIBSHA2_256 = 2, - - /** - * SHA-384, outputs 48 bytes - */ - LIBSHA2_384 = 3, - - /** - * SHA-512, outputs 64 bytes - */ - LIBSHA2_512 = 4, - - /** - * SHA-512/224, outputs 28 bytes - */ - LIBSHA2_512_224 = 5, - - /** - * SHA-512/256, outputs 32 bytes - */ - LIBSHA2_512_256 = 6 - - } libsha2_algorithm_t; - - -/** - * Datastructure that describes the state of a hashing process - * - * Data that could just as well be allocated (with `auto`) are - * allocated here so that is is easier to wipe the data without - * exposing two versions of each function: one to wipe data, - * and one not to wipe data to gain speed, now you can use use - * `explicit_bzero` (or `memset`) when you are done. - * - * This datastructure is flat (it contains dynamic pointers) - * and can be marshalled and unmarshalled naïvely, and does - * not need destroyed; however, if you when to marshall it - * using as little memory as possible, this are comments - * about data that does not need to be mashalled - */ -typedef struct libsha2_state -{ - /** - * The size of the message, as far as processed, in bits; - */ - size_t message_size; - - /** - * Round constants - */ - union - { - /** - * For 32-bit algorithms - */ - uint32_t b32[64]; - - /** - * For 64-bit algorithms - */ - uint64_t b64[80]; - - } k; - - /** - * Words - * - * Does not need to be marshalled - */ - union - { - /** - * For 32-bit algorithms - */ - uint32_t b32[64]; - - /** - * For 64-bit algorithms - */ - uint64_t b64[80]; - - } w; - - /** - * Hashing values - */ - union - { - /** - * For 32-bit algorithms - */ - uint32_t b32[8]; - - /** - * For 64-bit algorithms - */ - uint64_t b64[8]; - - } h; - - /** - * Temporary hashing values - * - * Does not need to be marshalled - */ - union - { - /** - * For 32-bit algorithms - */ - uint32_t b32[8]; - - /** - * For 64-bit algorithms - */ - uint64_t b64[8]; - - } work_h; - - /** - * Space for chunks to process, limited - * to 64 bytes on 32-bit algorithms - */ - unsigned char chunk[128]; - - /** - * Space for storing the last bits and - * the padding - * - * Does not need to be marshalled - */ - char appendix[256]; - - /** - * The size of the chunks, in bytes - */ - size_t chunk_size; - - /** - * The algorithm that is used - */ - libsha2_algorithm_t algorithm; - - int __padding1; - -} libsha2_state_t; - - - -/** - * Initialise a state - * - * @parma state The state that should be initialised - * @parma algorithm The hashing algorithm - * @return Zero on success, -1 on error - */ -__attribute__((leaf, nothrow, nonnull)) -int libsha2_state_initialise(libsha2_state_t* restrict state, libsha2_algorithm_t algorithm); - -/** - * Get the output size of the algorithm specified for a state - * - * @parma state The state - * @return The number of bytes in the output, zero on error - */ -__attribute__((nothrow, nonnull, pure)) -size_t libsha2_state_output_size(const libsha2_state_t* restrict state); - -/** - * Get the output size of an algorithm - * - * @parma algorithm The hashing algorithm - * @return The number of bytes in the output, zero on error - */ -__attribute__((leaf, nothrow, const)) -size_t libsha2_algorithm_output_size(libsha2_algorithm_t algorithm); - - - -#endif - diff --git a/state_initialise.c b/state_initialise.c new file mode 100644 index 0000000..ba6fee0 --- /dev/null +++ b/state_initialise.c @@ -0,0 +1,125 @@ +/* See LICENSE file for copyright and license details. */ +#include "common.h" + + +/** + * Round constants, SHA-256, should keep the 32 most significant bits of 64 first constants + */ +static const uint64_t ROUND_CONSTANTS[] = { + 0x428A2F98D728AE22ULL, 0x7137449123EF65CDULL, 0xB5C0FBCFEC4D3B2FULL, 0xE9B5DBA58189DBBCULL, + 0x3956C25BF348B538ULL, 0x59F111F1B605D019ULL, 0x923F82A4AF194F9BULL, 0xAB1C5ED5DA6D8118ULL, + 0xD807AA98A3030242ULL, 0x12835B0145706FBEULL, 0x243185BE4EE4B28CULL, 0x550C7DC3D5FFB4E2ULL, + 0x72BE5D74F27B896FULL, 0x80DEB1FE3B1696B1ULL, 0x9BDC06A725C71235ULL, 0xC19BF174CF692694ULL, + 0xE49B69C19EF14AD2ULL, 0xEFBE4786384F25E3ULL, 0x0FC19DC68B8CD5B5ULL, 0x240CA1CC77AC9C65ULL, + 0x2DE92C6F592B0275ULL, 0x4A7484AA6EA6E483ULL, 0x5CB0A9DCBD41FBD4ULL, 0x76F988DA831153B5ULL, + 0x983E5152EE66DFABULL, 0xA831C66D2DB43210ULL, 0xB00327C898FB213FULL, 0xBF597FC7BEEF0EE4ULL, + 0xC6E00BF33DA88FC2ULL, 0xD5A79147930AA725ULL, 0x06CA6351E003826FULL, 0x142929670A0E6E70ULL, + 0x27B70A8546D22FFCULL, 0x2E1B21385C26C926ULL, 0x4D2C6DFC5AC42AEDULL, 0x53380D139D95B3DFULL, + 0x650A73548BAF63DEULL, 0x766A0ABB3C77B2A8ULL, 0x81C2C92E47EDAEE6ULL, 0x92722C851482353BULL, + 0xA2BFE8A14CF10364ULL, 0xA81A664BBC423001ULL, 0xC24B8B70D0F89791ULL, 0xC76C51A30654BE30ULL, + 0xD192E819D6EF5218ULL, 0xD69906245565A910ULL, 0xF40E35855771202AULL, 0x106AA07032BBD1B8ULL, + 0x19A4C116B8D2D0C8ULL, 0x1E376C085141AB53ULL, 0x2748774CDF8EEB99ULL, 0x34B0BCB5E19B48A8ULL, + 0x391C0CB3C5C95A63ULL, 0x4ED8AA4AE3418ACBULL, 0x5B9CCA4F7763E373ULL, 0x682E6FF3D6B2B8A3ULL, + 0x748F82EE5DEFB2FCULL, 0x78A5636F43172F60ULL, 0x84C87814A1F0AB72ULL, 0x8CC702081A6439ECULL, + 0x90BEFFFA23631E28ULL, 0xA4506CEBDE82BDE9ULL, 0xBEF9A3F7B2C67915ULL, 0xC67178F2E372532BULL, + 0xCA273ECEEA26619CULL, 0xD186B8C721C0C207ULL, 0xEADA7DD6CDE0EB1EULL, 0xF57D4F7FEE6ED178ULL, + 0x06F067AA72176FBAULL, 0x0A637DC5A2C898A6ULL, 0x113F9804BEF90DAEULL, 0x1B710B35131C471BULL, + 0x28DB77F523047D84ULL, 0x32CAAB7B40C72493ULL, 0x3C9EBE0A15C9BEBCULL, 0x431D67C49C100D4CULL, + 0x4CC5D4BECB3E42B6ULL, 0x597F299CFC657E2AULL, 0x5FCB6FAB3AD6FAECULL, 0x6C44198C4A475817ULL +}; + + +/** + * Initial state for SHA224 + */ +static const uint32_t H_224[] = { + 0xC1059ED8UL, 0x367CD507UL, 0x3070DD17UL, 0xF70E5939UL, + 0xFFC00B31UL, 0x68581511UL, 0x64F98FA7UL, 0xBEFA4FA4UL +}; + +/** + * Initial state for SHA256 + */ +static const uint32_t H_256[] = { + 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, + 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL +}; + +/** + * Initial state for SHA384 + */ +static const uint64_t H_384[] = { + 0xCBBB9D5DC1059ED8ULL, 0x629A292A367CD507ULL, 0x9159015A3070DD17ULL, 0x152FECD8F70E5939ULL, + 0x67332667FFC00B31ULL, 0x8EB44A8768581511ULL, 0xDB0C2E0D64F98FA7ULL, 0x47B5481DBEFA4FA4ULL +}; + +/** + * Initial state for SHA512 + */ +static const uint64_t H_512[] = { + 0x6A09E667F3BCC908ULL, 0xBB67AE8584CAA73BULL, 0x3C6EF372FE94F82BULL, 0xA54FF53A5F1D36F1ULL, + 0x510E527FADE682D1ULL, 0x9B05688C2B3E6C1FULL, 0x1F83D9ABFB41BD6BULL, 0x5BE0CD19137E2179ULL +}; + +/** + * Initial state for SHA512/224 + */ +static const uint64_t H_512_224[] = { + 0x8C3D37C819544DA2ULL, 0x73E1996689DCD4D6ULL, 0x1DFAB7AE32FF9C82ULL, 0x679DD514582F9FCFULL, + 0x0F6D2B697BD44DA8ULL, 0x77E36F7304C48942ULL, 0x3F9D85A86A1D36C8ULL, 0x1112E6AD91D692A1ULL +}; + +/** + * Initial state for SHA512/256 + */ +static const uint64_t H_512_256[] = { + 0x22312194FC2BF72CULL, 0x9F555FA3C84C64C2ULL, 0x2393B86B6F53B151ULL, 0x963877195940EABDULL, + 0x96283EE2A88EFFE3ULL, 0xBE5E1E2553863992ULL, 0x2B0199FC2C85B8AAULL, 0x0EB72DDC81C52CA2ULL +}; + + +/** + * Initialise a state + * + * @parma state The state that should be initialised + * @parma algorithm The hashing algorithm + * @return Zero on success, -1 on error + */ +int +libsha2_state_initialise(struct libsha2_state *restrict state, enum libsha2_algorithm algorithm) +{ + size_t i; + + memset(state, 0, sizeof(*state)); + state->message_size = 0; + state->algorithm = algorithm; + + /* Set initial hash values. */ + switch (algorithm) { + case LIBSHA2_224: memcpy(state->h.b32, H_224, sizeof(H_224)); break; + case LIBSHA2_256: memcpy(state->h.b32, H_256, sizeof(H_256)); break; + case LIBSHA2_384: memcpy(state->h.b64, H_384, sizeof(H_384)); break; + case LIBSHA2_512: memcpy(state->h.b64, H_512, sizeof(H_512)); break; + case LIBSHA2_512_224: memcpy(state->h.b64, H_512_224, sizeof(H_512_224)); break; + case LIBSHA2_512_256: memcpy(state->h.b64, H_512_256, sizeof(H_512_256)); break; + default: + return errno = EINVAL, -1; + } + + /* Set round constants, and chunk size. */ + switch (algorithm) { + case LIBSHA2_224: + case LIBSHA2_256: + for (i = 0; i < 64; i++) + state->k.b32[i] = (uint32_t)(ROUND_CONSTANTS[i] >> 32); + state->chunk_size = 64; + break; + + default: + memcpy(state->k.b64, ROUND_CONSTANTS, sizeof(ROUND_CONSTANTS)); + state->chunk_size = 128; + break; + } + + return 0; +} diff --git a/state_output_size.c b/state_output_size.c new file mode 100644 index 0000000..d2cc5c1 --- /dev/null +++ b/state_output_size.c @@ -0,0 +1,15 @@ +/* See LICENSE file for copyright and license details. */ +#include "common.h" + + +/** + * Get the output size of the algorithm specified for a state + * + * @parma state The state + * @return The number of bytes in the output, zero on error + */ +size_t +libsha2_state_output_size(const struct libsha2_state *restrict state) +{ + return libsha2_algorithm_output_size(state->algorithm); +} diff --git a/sum_fd.c b/sum_fd.c new file mode 100644 index 0000000..381a634 --- /dev/null +++ b/sum_fd.c @@ -0,0 +1,46 @@ +/* See LICENSE file for copyright and license details. */ +#include "common.h" + + +/** + * Calculate the checksum for a file, + * the content of the file is assumed non-sensitive + * + * @param fd The file descriptor of the file + * @param algorithm The hashing algorithm + * @param hashsum Output buffer for the hash + * @return Zero on success, -1 on error + */ +int +libsha2_sum_fd(int fd, enum libsha2_algorithm algorithm, char *restrict hashsum) +{ + struct libsha2_state state; + ssize_t r; + struct stat attr; + size_t blksize = 4096; + char *restrict chunk; + + if (libsha2_state_initialise(&state, algorithm) < 0) + return -1; + + if (fstat(fd, &attr) == 0 && attr.st_blksize > 0) + blksize = (size_t)(attr.st_blksize); + + chunk = alloca(blksize); + + for (;;) { + r = read(fd, chunk, blksize); + if (r <= 0) { + if (!r) + break; + if (errno == EINTR) + continue; + return -1; + } + libsha2_update(&state, chunk, (size_t)r); + } + + libsha2_digest(&state, NULL, 0, hashsum); + return 0; +} + diff --git a/unhex.c b/unhex.c new file mode 100644 index 0000000..0dc231d --- /dev/null +++ b/unhex.c @@ -0,0 +1,26 @@ +/* See LICENSE file for copyright and license details. */ +#include "common.h" + + +/** + * Convert a hexadecimal hashsum (both lower case, upper + * case and mixed is supported) to binary representation + * + * @param output Output array, should have an allocation + * size of at least `strlen(hashsum) / 2` + * @param hashsum The hashsum to convert + */ +void +libsha2_unhex(char *restrict output, const char *restrict hashsum) +{ + size_t n = strlen(hashsum) / 2; + while (n--) { + char a = hashsum[2 * n + 0]; + char b = hashsum[2 * n + 1]; + + a = (char)((a & 15) + (a > '9' ? 9 : 0)); + b = (char)((b & 15) + (b > '9' ? 9 : 0)); + + output[n] = (char)((a << 4) | b); + } +} diff --git a/update.c b/update.c new file mode 100644 index 0000000..26eceb8 --- /dev/null +++ b/update.c @@ -0,0 +1,140 @@ +/* See LICENSE file for copyright and license details. */ +#include "common.h" + + +/** + * Unified implementation (what can unified without performance impact) + * of the chunk processing for all SHA-2 functions + * + * @param A Wordsize-dependent constant, take a look at the code + * @param B Wordsize-dependent constant, take a look at the code + * @param C Wordsize-dependent constant, take a look at the code + * @param D Wordsize-dependent constant, take a look at the code + * @param E Wordsize-dependent constant, take a look at the code + * @param F Wordsize-dependent constant, take a look at the code + * @param G Wordsize-dependent constant, take a look at the code + * @param H Wordsize-dependent constant, take a look at the code + * @param I Wordsize-dependent constant, take a look at the code + * @param J Wordsize-dependent constant, take a look at the code + * @param K Wordsize-dependent constant, take a look at the code + * @param L Wordsize-dependent constant, take a look at the code + * @param WORD_T `__typeof()` on any wordsize-dependent variable, with exact size + * @param k Round constants + * @param w Words + * @param h Hash values + * @param work_h Space for temporary hash values + */ +#define SHA2_IMPLEMENTATION(A, B, C, D, E, F, G, H, I, J, K, L, WORD_T, k, w, h, work_h)\ + memcpy(work_h, h, sizeof(work_h));\ + \ + memset(w, 0, 16 * sizeof(*(w)));\ + for (i = 0; i < 16; i++)\ + for (j = 0; j < sizeof(WORD_T); j++)\ + w[i] |= ((WORD_T)(state->chunk[(i + 1) * sizeof(WORD_T) - j - 1])) << (j << 3);\ + \ + for (i = 16; i < sizeof(k) / sizeof(*(k)); i++) {\ + w[i] = w[i - 16] + w[i - 7];\ + w[i] += ROTR(w[i - 15], A) ^ ROTR(w[i - 15], B) ^ (w[i - 15] >> (C));\ + w[i] += ROTR(w[i - 2], D) ^ ROTR(w[i - 2], E) ^ (w[i - 2] >> (F));\ + }\ + \ + for (i = 0; i < sizeof(k) / sizeof(*(k)); i++) {\ + s1 = (work_h[4] & work_h[5]) ^ (work_h[6] & ~(work_h[4]));\ + s1 += work_h[7] + k[i] + w[i];\ + s0 = (work_h[0] & work_h[1]) ^ (work_h[0] & work_h[2]) ^ (work_h[1] & work_h[2]);\ + s1 += ROTR(work_h[4], G) ^ ROTR(work_h[4], H) ^ ROTR(work_h[4], I);\ + s0 += ROTR(work_h[0], J) ^ ROTR(work_h[0], K) ^ ROTR(work_h[0], L);\ + \ + memmove(work_h + 1, work_h, 7 * sizeof(*(work_h)));\ + work_h[4] += s1;\ + work_h[0] = s1 + s0;\ + }\ + \ + for (i = 0; i < 8; i++)\ + h[i] += work_h[i] + + +/** + * Process a chunk using SHA-256 + * + * @param state The hashing state + */ +#if defined(__GNUC__) +__attribute__((__nonnull__, __nothrow__)) +#endif +static void +process256(struct libsha2_state *restrict state) +{ + uint32_t s0, s1; + size_t i, j; +#if defined(__GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wmemset-elt-size" +#endif +#define ROTR(X, N) (((X) >> (N)) | ((X) << ((sizeof(uint32_t) * 8) - (N)))) + SHA2_IMPLEMENTATION(7, 18, 3, 17, 19, 10, 6, 11, 25, 2, 13, 22, uint32_t, + state->k.b32, state->w.b32, state->h.b32, state->work_h.b32); +#undef ROTR +#if defined(__GNUC__) +# pragma GCC diagnostic pop +#endif +} + + +/** + * Process a chunk using SHA-512 + * + * @param state The hashing state + */ +#if defined(__GNUC__) +__attribute__((__nonnull__, __nothrow__)) +#endif +static void +process512(struct libsha2_state *restrict state) +{ + uint64_t s0, s1; + size_t i, j; +#define ROTR(X, N) (((X) >> (N)) | ((X) << ((sizeof(uint64_t) * 8) - (N)))) + SHA2_IMPLEMENTATION(1, 8, 7, 19, 61, 6, 14, 18, 41, 28, 34, 39, uint64_t, + state->k.b64, state->w.b64, state->h.b64, state->work_h.b64); +#undef ROTR +} + + +/** + * Absorb more of the message + * + * @param state The hashing state + * @param message The message, in bits, must be equivalent to 0 modulus 8 + * @param msglen The length of the message + */ +void +libsha2_update(struct libsha2_state *restrict state, const char *restrict message, size_t msglen) +{ + size_t n, off, mlen; + + msglen /= 8; + mlen = state->message_size / 8; + + while (msglen) { + off = mlen % state->chunk_size; + n = state->chunk_size - off; + n = n < msglen ? n : msglen; + memcpy(state->chunk + off, message, n); + if (off + n == state->chunk_size) { + switch (state->algorithm) { + case LIBSHA2_224: + case LIBSHA2_256: + process256(state); + break; + + default: + process512(state); + break; + } + } + message += n, mlen += n, msglen -= n; + } + + state->message_size = mlen * 8; +} -- cgit v1.2.3-70-g09d2