From 8bd97d21a74c3761a9a91b0cb9ba4caee8d3e18c Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 14 Oct 2017 11:12:02 +0200 Subject: Change license, change style, and remove crap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- .gitignore | 8 +- COPYING | 17 - DEPENDENCIES | 22 +- LICENSE | 670 +----------------------------- Makefile | 216 +--------- README | 2 - TODO | 2 - dist/archlinux/stable/.gitignore | 6 - dist/archlinux/stable/PKGBUILD | 26 -- dist/archlinux/stable/sha3sum.install | 20 - doc/fdl.texinfo | 505 ---------------------- doc/sha3sum.texinfo | 239 ----------- doc/xsum.texman | 80 ---- src/common.c | 761 ++++++++++++++++------------------ src/common.h | 53 +-- src/completion | 40 -- src/keccak-224sum.c | 33 +- src/keccak-256sum.c | 33 +- src/keccak-384sum.c | 33 +- src/keccak-512sum.c | 33 +- src/keccaksum.c | 31 +- src/rawshake256sum.c | 33 +- src/rawshake512sum.c | 33 +- src/sha3-224sum.c | 33 +- src/sha3-256sum.c | 33 +- src/sha3-384sum.c | 33 +- src/sha3-512sum.c | 33 +- src/shake256sum.c | 33 +- src/shake512sum.c | 33 +- xsum.texman | 80 ++++ 30 files changed, 569 insertions(+), 2605 deletions(-) delete mode 100644 COPYING delete mode 100644 TODO delete mode 100644 dist/archlinux/stable/.gitignore delete mode 100644 dist/archlinux/stable/PKGBUILD delete mode 100644 dist/archlinux/stable/sha3sum.install delete mode 100644 doc/fdl.texinfo delete mode 100644 doc/sha3sum.texinfo delete mode 100644 doc/xsum.texman delete mode 100644 src/completion create mode 100644 xsum.texman diff --git a/.gitignore b/.gitignore index 4a1d36d..6bbe7bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,7 @@ -_/ obj/ bin/ -\#*\# -.* -!.git* *~ -*.swo -*.swp -*.bak +*\#* *.o *.out *.so diff --git a/COPYING b/COPYING deleted file mode 100644 index 93b529d..0000000 --- a/COPYING +++ /dev/null @@ -1,17 +0,0 @@ -sha3sum – SHA-3 (Keccak) checksum calculator - -Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - -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 . - diff --git a/DEPENDENCIES b/DEPENDENCIES index ff58e58..554e6e4 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -1,29 +1,19 @@ RUNTIME DEPENDENCIES: - libkeccak - argparser libc + libkeccak BUILD DEPENDENCIES: - libkeccak - argparser - libc - auto-auto-complete (opt-out, for shell tab-completion) - texman (opt-in, for man pages) - sed (opt-in, for man pages) - texinfo (opt-out, for info, pdf, dvi and ps manuals) - texlive-core (opt-in, for pdf, dvi and ps manuals) + coreutils gcc + libc + libkeccak make - coreutils + sed DEPENDENCY SOURCES: - libkeccak https://github.com/maandree/libkeccak - argparser https://github.com/maandree/argparser - auto-auto-complete https://github.com/maandree/auto-auto-complete - texman https://github.com/maandree/texman - + libkeccak https://github.com/maandree/libkeccak diff --git a/LICENSE b/LICENSE index dba13ed..15b6932 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. +© 2013, 2014, 2015, 2017 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 index 4937fc3..e34673c 100644 --- a/Makefile +++ b/Makefile @@ -1,33 +1,11 @@ -# Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) -# -# Copying and distribution of this file, with or without modification, -# are permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. This file is offered as-is, -# without any warranty. -# -# [GNU All Permissive License] - - -# The package path prefix, if you want to install to another root, set DESTDIR to that root -PREFIX = /usr -# The command path excluding prefix -BIN = /bin -# The resource path excluding prefix -DATA = /share -# The command path including prefix -BINDIR = $(PREFIX)$(BIN) -# The resource path including prefix -DATADIR = $(PREFIX)$(DATA) -# The generic documentation path including prefix +PREFIX = /usr/local +BINDIR = $(PREFIX)/bin +DATADIR = $(PREFIX)/share DOCDIR = $(DATADIR)/doc -# The man page documentation path including prefix MANDIR = $(DATADIR)/man -# The info manual documentation path including prefix INFODIR = $(DATADIR)/info -# The license base path including prefix LICENSEDIR = $(DATADIR)/licenses -# The name of the package as it should be installed PKGNAME = sha3sum @@ -69,11 +47,8 @@ shake512sum = SHAKE512 -.PHONY: default -default: command shell info - .PHONY: all -all: command shell doc +all: command man .PHONY: command @@ -88,80 +63,17 @@ obj/%.o: src/%.c src/*.h $(CC) $(FLAGS) $(COPTIMISE) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) -.PHONY: shell -shell: bash zsh fish - -.PHONY: bash -bash: $(foreach C,$(CMDS),bin/$(C).bash) - -.PHONY: zsh -zsh: $(foreach C,$(CMDS),bin/$(C).zsh) - -.PHONY: fish -fish: $(foreach C,$(CMDS),bin/$(C).fish) - -bin/%.bash: src/completion - @mkdir -p bin - auto-auto-complete bash --output $@ --source $< command=$* - -bin/%.zsh: src/completion - @mkdir -p bin - auto-auto-complete zsh --output $@ --source $< command=$* - -bin/%.fish: src/completion - @mkdir -p bin - auto-auto-complete fish --output $@ --source $< command=$* - - -.PHONY: doc -doc: man info pdf dvi ps .PHONY: man man: $(foreach C,$(CMDS),bin/$(C).1) -bin/%.1: doc/xsum.texman +bin/%.1: xsum.texman @mkdir -p bin cat $< | sed -e 's/xsum/$*/g' -e 's/XSUM/$($*)/g' | texman > $@ -.PHONY: info -info: bin/sha3sum.info -bin/%.info: doc/%.texinfo doc/fdl.texinfo - @mkdir -p obj/info bin - cd obj/info ; makeinfo ../../$< - mv obj/info/$*.info bin/$*.info - -.PHONY: pdf -pdf: bin/sha3sum.pdf -bin/%.pdf: doc/%.texinfo doc/fdl.texinfo - @mkdir -p obj/pdf bin - cd obj/pdf/ ; yes X | texi2pdf ../../$< - mv obj/pdf/$*.pdf bin/$*.pdf - -.PHONY: dvi -dvi: bin/sha3sum.dvi -bin/%.dvi: doc/%.texinfo doc/fdl.texinfo - @mkdir -p obj/dvi bin - cd obj/dvi ; yes X | $(TEXI2DVI) ../../$< - mv obj/dvi/$*.dvi bin/$*.dvi - -.PHONY: ps -ps: bin/sha3sum.ps -bin/%.ps: doc/%.texinfo doc/fdl.texinfo - @mkdir -p obj/ps bin - cd obj/ps ; yes X | texi2pdf --ps ../../$< - mv obj/ps/$*.ps bin/$*.ps - - - .PHONY: install -install: install-base install-shell install-info - -.PHONY: install-all -install-all: install-base install-shell install-doc - -.PHONY: install-base -install-base: install-command install-copyright +install: install-command install-copyright install-man .PHONY: install-command @@ -186,12 +98,7 @@ install-%sum: bin/%sum .PHONY: install-copyright -install-copyright: install-copying install-license - -.PHONY: install-copying -install-copying: - install -dm755 -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)" - install -m644 -- COPYING "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/COPYING" +install-copyright: install-license .PHONY: install-license install-license: @@ -199,85 +106,6 @@ install-license: install -m644 -- LICENSE "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/LICENSE" -.PHONY: install-shell -install-shell: install-bash install-fish install-zsh - -.PHONY: install-keccak-shell -install-keccak-shell: install-keccak-bash install-keccak-fish install-keccak-zsh - -.PHONY: install-sha3-shell -install-sha3-shell: install-sha3-bash install-sha3-fish install-sha3-zsh - -.PHONY: install-rawshake-shell -install-rawshake-shell: install-rawshake-bash install-rawshake-fish install-rawshake-zsh - -.PHONY: install-shake-shell -install-shake-shell: install-shake-bash install-shake-fish install-shake-zsh - -.PHONY: install-bash -install-bash: install-keccak-bash install-sha3-bash install-rawshake-bash install-shake-bash - -.PHONY: install-fish -install-fish: install-keccak-fish install-sha3-fish install-rawshake-fish install-shake-fish - -.PHONY: install-zsh -install-zsh: install-keccak-zsh install-sha3-zsh install-rawshake-zsh install-shake-zsh - -.PHONY: install-keccak-bash -install-keccak-bash: $(foreach C,$(KECCAK_CMDS),install-$(C)-bash) - -.PHONY: install-keccak-fish -install-keccak-fish: $(foreach C,$(KECCAK_CMDS),install-$(C)-fish) - -.PHONY: install-keccak-zsh -install-keccak-zsh: $(foreach C,$(KECCAK_CMDS),install-$(C)-zsh) - -.PHONY: install-sha3-bash -install-sha3-bash: $(foreach C,$(SHA3_CMDS),install-$(C)-bash) - -.PHONY: install-sha3-fish -install-sha3-fish: $(foreach C,$(SHA3_CMDS),install-$(C)-fish) - -.PHONY: install-sha3-zsh -install-sha3-zsh: $(foreach C,$(SHA3_CMDS),install-$(C)-zsh) - -.PHONY: install-rawshake-bash -install-rawshake-bash: $(foreach C,$(RAWSHAKE_CMDS),install-$(C)-bash) - -.PHONY: install-rawshake-fish -install-rawshake-fish: $(foreach C,$(RAWSHAKE_CMDS),install-$(C)-fish) - -.PHONY: install-rawshake-zsh -install-rawshake-zsh: $(foreach C,$(RAWSHAKE_CMDS),install-$(C)-zsh) - -.PHONY: install-shake-bash -install-shake-bash: $(foreach C,$(SHAKE_CMDS),install-$(C)-bash) - -.PHONY: install-shake-fish -install-shake-fish: $(foreach C,$(SHAKE_CMDS),install-$(C)-fish) - -.PHONY: install-shake-zsh -install-shake-zsh: $(foreach C,$(SHAKE_CMDS),install-$(C)-zsh) - -.PHONY: install-%sum-bash -install-%sum-bash: bin/$*sum.bash - install -dm755 -- "$(DESTDIR)$(DATADIR)/bash-completion/completions" - install -m644 -- $< "$(DESTDIR)$(DATADIR)/bash-completion/completions/$*sum" - -.PHONY: install-%sum-fish -install-%sum-fish: bin/$*sum.fish - install -dm755 -- "$(DESTDIR)$(DATADIR)/fish/completions" - install -m644 -- $< "$(DESTDIR)$(DATADIR)/fish/completions/$*sum.fish" - -.PHONY: install-%sum-zsh -install-%sum-zsh: bin/$*sum.zsh - install -dm755 -- "$(DESTDIR)$(DATADIR)/zsh/site-functions" - install -m644 -- $< "$(DESTDIR)$(DATADIR)/zsh/site-functions/_$*sum" - - -.PHONY: install-doc -install-doc: install-man install-info install-pdf install-dvi install-ps - .PHONY: install-man install-man: install-keccak-man install-sha3-man install-rawshake-man install-shake-man @@ -298,46 +126,16 @@ install-%sum-man: bin/%sum.1 install -dm755 -- "$(DESTDIR)$(MANDIR)/man1" install -m644 -- $< "$(DESTDIR)$(MANDIR)/man1/$*sum.1" -.PHONY: install-info -install-info: bin/sha3sum.info - install -dm755 -- "$(DESTDIR)$(INFODIR)" - install -m644 -- $< "$(DESTDIR)$(INFODIR)/$(PKGNAME).info" - -.PHONY: install-pdf -install-pdf: bin/sha3sum.pdf - install -dm755 -- "$(DESTDIR)$(DOCDIR)" - install -m644 -- $< "$(DESTDIR)$(DOCDIR)/$(PKGNAME).pdf" - -.PHONY: install-dvi -install-dvi: bin/sha3sum.dvi - install -dm755 -- "$(DESTDIR)$(DOCDIR)" - install -m644 -- $< "$(DESTDIR)$(DOCDIR)/$(PKGNAME).dvi" - -.PHONY: install-ps -install-ps: bin/sha3sum.ps - install -dm755 -- "$(DESTDIR)$(DOCDIR)" - install -m644 -- $< "$(DESTDIR)$(DOCDIR)/$(PKGNAME).ps" - .PHONY: uninstall uninstall: -rm -- $(foreach C,$(CMDS),"$(DESTDIR)$(BINDIR)/$(C)") - -rm -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/COPYING" -rm -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/LICENSE" -rmdir -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)" - -rm -- $(foreach C,$(CMDS),"$(DESTDIR)$(DATADIR)/bash-completion/completions/$(C)") - -rm -- $(foreach C,$(CMDS),"$(DESTDIR)$(DATADIR)/fish/completions/$(C).fish") - -rm -- $(foreach C,$(CMDS),"$(DESTDIR)$(DATADIR)/zsh/site-functions/_$(C)") -rm -- $(foreach C,$(CMDS),"$(DESTDIR)$(MANDIR)/man1/$(C).1") - -rm -- "$(DESTDIR)$(INFODIR)/$(PKGNAME).info" - -rm -- "$(DESTDIR)$(DOCDIR)/$(PKGNAME).pdf" - -rm -- "$(DESTDIR)$(DOCDIR)/$(PKGNAME).dvi" - -rm -- "$(DESTDIR)$(DOCDIR)/$(PKGNAME).ps" - .PHONY: clean clean: -rm -r bin obj - diff --git a/README b/README index e39f68f..9b8207b 100644 --- a/README +++ b/README @@ -79,8 +79,6 @@ SEE ALSO sha1sum(1), sha224sum(1), sha256sum(1), sha384sum(1), sha512sum(1) - Full documentation available locally via: info '(sha3sum)' - PERFORMANCE Performance comparison on a 1 GiB file (yes, that is quite large) with /dev/urandom data: diff --git a/TODO b/TODO deleted file mode 100644 index b4ec010..0000000 --- a/TODO +++ /dev/null @@ -1,2 +0,0 @@ -Try double- or triple-buffer file-reading and hashing and separate it to two threads. - diff --git a/dist/archlinux/stable/.gitignore b/dist/archlinux/stable/.gitignore deleted file mode 100644 index 9ad619b..0000000 --- a/dist/archlinux/stable/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -* -!/.git* -*~ -!/PKGBUILD -!/sha3sum.install - diff --git a/dist/archlinux/stable/PKGBUILD b/dist/archlinux/stable/PKGBUILD deleted file mode 100644 index b6cf1b5..0000000 --- a/dist/archlinux/stable/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> - -pkgname=sha3sum -pkgver=1.0 -pkgrel=1 -pkgdesc="Keccak-family checksum calculator, including SHA-3" -arch=(i686 x86_64) -url="https://github.com/maandree/sha3sum" -license=('AGPL3') -depends=(libkeccak argparser glibc) -makedepends=(libkeccak argparser glibc auto-auto-complete texman sed texinfo) -install=sha3sum.install -source=($url/archive/$pkgver.tar.gz) -sha256sums=(d4f4729f6065c489d6ed95e1c997e1bda4308ba37ebb3eb8a666fef17d4fc22f) - - -build() { - cd "$srcdir/$pkgname-$pkgver" - make PREFIX=/usr command shell info man -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make PREFIX=/usr DESTDIR="$pkgdir" install-base install-shell install-info install-man -} - diff --git a/dist/archlinux/stable/sha3sum.install b/dist/archlinux/stable/sha3sum.install deleted file mode 100644 index 3ab5d32..0000000 --- a/dist/archlinux/stable/sha3sum.install +++ /dev/null @@ -1,20 +0,0 @@ -_file="sha3sum" - -infodir="usr/share/info" -file="${_file}.info" - - -post_install() { - [[ -x "usr/bin/install-info" ]] || return 0 - install-info -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null -} - -post_upgrade() { - post_install "$1" -} - -pre_remove() { - [[ -x "usr/bin/install-info" ]] || return 0 - install-info --delete -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null -} - diff --git a/doc/fdl.texinfo b/doc/fdl.texinfo deleted file mode 100644 index cb71f05..0000000 --- a/doc/fdl.texinfo +++ /dev/null @@ -1,505 +0,0 @@ -@c The GNU Free Documentation License. -@center Version 1.3, 3 November 2008 - -@c This file is intended to be included within another document, -@c hence no sectioning command or @node. - -@display -Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. -@uref{http://fsf.org/} - -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. -@end display - -@enumerate 0 -@item -PREAMBLE - -The purpose of this License is to make a manual, textbook, or other -functional and useful document @dfn{free} in the sense of freedom: to -assure everyone the effective freedom to copy and redistribute it, -with or without modifying it, either commercially or noncommercially. -Secondarily, this License preserves for the author and publisher a way -to get credit for their work, while not being considered responsible -for modifications made by others. - -This License is a kind of ``copyleft'', which means that derivative -works of the document must themselves be free in the same sense. It -complements the GNU General Public License, which is a copyleft -license designed for free software. - -We have designed this License in order to use it for manuals for free -software, because free software needs free documentation: a free -program should come with manuals providing the same freedoms that the -software does. But this License is not limited to software manuals; -it can be used for any textual work, regardless of subject matter or -whether it is published as a printed book. We recommend this License -principally for works whose purpose is instruction or reference. - -@item -APPLICABILITY AND DEFINITIONS - -This License applies to any manual or other work, in any medium, that -contains a notice placed by the copyright holder saying it can be -distributed under the terms of this License. Such a notice grants a -world-wide, royalty-free license, unlimited in duration, to use that -work under the conditions stated herein. The ``Document'', below, -refers to any such manual or work. Any member of the public is a -licensee, and is addressed as ``you''. You accept the license if you -copy, modify or distribute the work in a way requiring permission -under copyright law. - -A ``Modified Version'' of the Document means any work containing the -Document or a portion of it, either copied verbatim, or with -modifications and/or translated into another language. - -A ``Secondary Section'' is a named appendix or a front-matter section -of the Document that deals exclusively with the relationship of the -publishers or authors of the Document to the Document's overall -subject (or to related matters) and contains nothing that could fall -directly within that overall subject. (Thus, if the Document is in -part a textbook of mathematics, a Secondary Section may not explain -any mathematics.) The relationship could be a matter of historical -connection with the subject or with related matters, or of legal, -commercial, philosophical, ethical or political position regarding -them. - -The ``Invariant Sections'' are certain Secondary Sections whose titles -are designated, as being those of Invariant Sections, in the notice -that says that the Document is released under this License. If a -section does not fit the above definition of Secondary then it is not -allowed to be designated as Invariant. The Document may contain zero -Invariant Sections. If the Document does not identify any Invariant -Sections then there are none. - -The ``Cover Texts'' are certain short passages of text that are listed, -as Front-Cover Texts or Back-Cover Texts, in the notice that says that -the Document is released under this License. A Front-Cover Text may -be at most 5 words, and a Back-Cover Text may be at most 25 words. - -A ``Transparent'' copy of the Document means a machine-readable copy, -represented in a format whose specification is available to the -general public, that is suitable for revising the document -straightforwardly with generic text editors or (for images composed of -pixels) generic paint programs or (for drawings) some widely available -drawing editor, and that is suitable for input to text formatters or -for automatic translation to a variety of formats suitable for input -to text formatters. A copy made in an otherwise Transparent file -format whose markup, or absence of markup, has been arranged to thwart -or discourage subsequent modification by readers is not Transparent. -An image format is not Transparent if used for any substantial amount -of text. A copy that is not ``Transparent'' is called ``Opaque''. - -Examples of suitable formats for Transparent copies include plain -ASCII without markup, Texinfo input format, La@TeX{} input -format, SGML or XML using a publicly available -DTD, and standard-conforming simple HTML, -PostScript or PDF designed for human modification. Examples -of transparent image formats include PNG, XCF and -JPG. Opaque formats include proprietary formats that can be -read and edited only by proprietary word processors, SGML or -XML for which the DTD and/or processing tools are -not generally available, and the machine-generated HTML, -PostScript or PDF produced by some word processors for -output purposes only. - -The ``Title Page'' means, for a printed book, the title page itself, -plus such following pages as are needed to hold, legibly, the material -this License requires to appear in the title page. For works in -formats which do not have any title page as such, ``Title Page'' means -the text near the most prominent appearance of the work's title, -preceding the beginning of the body of the text. - -The ``publisher'' means any person or entity that distributes copies -of the Document to the public. - -A section ``Entitled XYZ'' means a named subunit of the Document whose -title either is precisely XYZ or contains XYZ in parentheses following -text that translates XYZ in another language. (Here XYZ stands for a -specific section name mentioned below, such as ``Acknowledgements'', -``Dedications'', ``Endorsements'', or ``History''.) To ``Preserve the Title'' -of such a section when you modify the Document means that it remains a -section ``Entitled XYZ'' according to this definition. - -The Document may include Warranty Disclaimers next to the notice which -states that this License applies to the Document. These Warranty -Disclaimers are considered to be included by reference in this -License, but only as regards disclaiming warranties: any other -implication that these Warranty Disclaimers may have is void and has -no effect on the meaning of this License. - -@item -VERBATIM COPYING - -You may copy and distribute the Document in any medium, either -commercially or noncommercially, provided that this License, the -copyright notices, and the license notice saying this License applies -to the Document are reproduced in all copies, and that you add no other -conditions whatsoever to those of this License. You may not use -technical measures to obstruct or control the reading or further -copying of the copies you make or distribute. However, you may accept -compensation in exchange for copies. If you distribute a large enough -number of copies you must also follow the conditions in section 3. - -You may also lend copies, under the same conditions stated above, and -you may publicly display copies. - -@item -COPYING IN QUANTITY - -If you publish printed copies (or copies in media that commonly have -printed covers) of the Document, numbering more than 100, and the -Document's license notice requires Cover Texts, you must enclose the -copies in covers that carry, clearly and legibly, all these Cover -Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on -the back cover. Both covers must also clearly and legibly identify -you as the publisher of these copies. The front cover must present -the full title with all words of the title equally prominent and -visible. You may add other material on the covers in addition. -Copying with changes limited to the covers, as long as they preserve -the title of the Document and satisfy these conditions, can be treated -as verbatim copying in other respects. - -If the required texts for either cover are too voluminous to fit -legibly, you should put the first ones listed (as many as fit -reasonably) on the actual cover, and continue the rest onto adjacent -pages. - -If you publish or distribute Opaque copies of the Document numbering -more than 100, you must either include a machine-readable Transparent -copy along with each Opaque copy, or state in or with each Opaque copy -a computer-network location from which the general network-using -public has access to download using public-standard network protocols -a complete Transparent copy of the Document, free of added material. -If you use the latter option, you must take reasonably prudent steps, -when you begin distribution of Opaque copies in quantity, to ensure -that this Transparent copy will remain thus accessible at the stated -location until at least one year after the last time you distribute an -Opaque copy (directly or through your agents or retailers) of that -edition to the public. - -It is requested, but not required, that you contact the authors of the -Document well before redistributing any large number of copies, to give -them a chance to provide you with an updated version of the Document. - -@item -MODIFICATIONS - -You may copy and distribute a Modified Version of the Document under -the conditions of sections 2 and 3 above, provided that you release -the Modified Version under precisely this License, with the Modified -Version filling the role of the Document, thus licensing distribution -and modification of the Modified Version to whoever possesses a copy -of it. In addition, you must do these things in the Modified Version: - -@enumerate A -@item -Use in the Title Page (and on the covers, if any) a title distinct -from that of the Document, and from those of previous versions -(which should, if there were any, be listed in the History section -of the Document). You may use the same title as a previous version -if the original publisher of that version gives permission. - -@item -List on the Title Page, as authors, one or more persons or entities -responsible for authorship of the modifications in the Modified -Version, together with at least five of the principal authors of the -Document (all of its principal authors, if it has fewer than five), -unless they release you from this requirement. - -@item -State on the Title page the name of the publisher of the -Modified Version, as the publisher. - -@item -Preserve all the copyright notices of the Document. - -@item -Add an appropriate copyright notice for your modifications -adjacent to the other copyright notices. - -@item -Include, immediately after the copyright notices, a license notice -giving the public permission to use the Modified Version under the -terms of this License, in the form shown in the Addendum below. - -@item -Preserve in that license notice the full lists of Invariant Sections -and required Cover Texts given in the Document's license notice. - -@item -Include an unaltered copy of this License. - -@item -Preserve the section Entitled ``History'', Preserve its Title, and add -to it an item stating at least the title, year, new authors, and -publisher of the Modified Version as given on the Title Page. If -there is no section Entitled ``History'' in the Document, create one -stating the title, year, authors, and publisher of the Document as -given on its Title Page, then add an item describing the Modified -Version as stated in the previous sentence. - -@item -Preserve the network location, if any, given in the Document for -public access to a Transparent copy of the Document, and likewise -the network locations given in the Document for previous versions -it was based on. These may be placed in the ``History'' section. -You may omit a network location for a work that was published at -least four years before the Document itself, or if the original -publisher of the version it refers to gives permission. - -@item -For any section Entitled ``Acknowledgements'' or ``Dedications'', Preserve -the Title of the section, and preserve in the section all the -substance and tone of each of the contributor acknowledgements and/or -dedications given therein. - -@item -Preserve all the Invariant Sections of the Document, -unaltered in their text and in their titles. Section numbers -or the equivalent are not considered part of the section titles. - -@item -Delete any section Entitled ``Endorsements''. Such a section -may not be included in the Modified Version. - -@item -Do not retitle any existing section to be Entitled ``Endorsements'' or -to conflict in title with any Invariant Section. - -@item -Preserve any Warranty Disclaimers. -@end enumerate - -If the Modified Version includes new front-matter sections or -appendices that qualify as Secondary Sections and contain no material -copied from the Document, you may at your option designate some or all -of these sections as invariant. To do this, add their titles to the -list of Invariant Sections in the Modified Version's license notice. -These titles must be distinct from any other section titles. - -You may add a section Entitled ``Endorsements'', provided it contains -nothing but endorsements of your Modified Version by various -parties---for example, statements of peer review or that the text has -been approved by an organization as the authoritative definition of a -standard. - -You may add a passage of up to five words as a Front-Cover Text, and a -passage of up to 25 words as a Back-Cover Text, to the end of the list -of Cover Texts in the Modified Version. Only one passage of -Front-Cover Text and one of Back-Cover Text may be added by (or -through arrangements made by) any one entity. If the Document already -includes a cover text for the same cover, previously added by you or -by arrangement made by the same entity you are acting on behalf of, -you may not add another; but you may replace the old one, on explicit -permission from the previous publisher that added the old one. - -The author(s) and publisher(s) of the Document do not by this License -give permission to use their names for publicity for or to assert or -imply endorsement of any Modified Version. - -@item -COMBINING DOCUMENTS - -You may combine the Document with other documents released under this -License, under the terms defined in section 4 above for modified -versions, provided that you include in the combination all of the -Invariant Sections of all of the original documents, unmodified, and -list them all as Invariant Sections of your combined work in its -license notice, and that you preserve all their Warranty Disclaimers. - -The combined work need only contain one copy of this License, and -multiple identical Invariant Sections may be replaced with a single -copy. If there are multiple Invariant Sections with the same name but -different contents, make the title of each such section unique by -adding at the end of it, in parentheses, the name of the original -author or publisher of that section if known, or else a unique number. -Make the same adjustment to the section titles in the list of -Invariant Sections in the license notice of the combined work. - -In the combination, you must combine any sections Entitled ``History'' -in the various original documents, forming one section Entitled -``History''; likewise combine any sections Entitled ``Acknowledgements'', -and any sections Entitled ``Dedications''. You must delete all -sections Entitled ``Endorsements.'' - -@item -COLLECTIONS OF DOCUMENTS - -You may make a collection consisting of the Document and other documents -released under this License, and replace the individual copies of this -License in the various documents with a single copy that is included in -the collection, provided that you follow the rules of this License for -verbatim copying of each of the documents in all other respects. - -You may extract a single document from such a collection, and distribute -it individually under this License, provided you insert a copy of this -License into the extracted document, and follow this License in all -other respects regarding verbatim copying of that document. - -@item -AGGREGATION WITH INDEPENDENT WORKS - -A compilation of the Document or its derivatives with other separate -and independent documents or works, in or on a volume of a storage or -distribution medium, is called an ``aggregate'' if the copyright -resulting from the compilation is not used to limit the legal rights -of the compilation's users beyond what the individual works permit. -When the Document is included in an aggregate, this License does not -apply to the other works in the aggregate which are not themselves -derivative works of the Document. - -If the Cover Text requirement of section 3 is applicable to these -copies of the Document, then if the Document is less than one half of -the entire aggregate, the Document's Cover Texts may be placed on -covers that bracket the Document within the aggregate, or the -electronic equivalent of covers if the Document is in electronic form. -Otherwise they must appear on printed covers that bracket the whole -aggregate. - -@item -TRANSLATION - -Translation is considered a kind of modification, so you may -distribute translations of the Document under the terms of section 4. -Replacing Invariant Sections with translations requires special -permission from their copyright holders, but you may include -translations of some or all Invariant Sections in addition to the -original versions of these Invariant Sections. You may include a -translation of this License, and all the license notices in the -Document, and any Warranty Disclaimers, provided that you also include -the original English version of this License and the original versions -of those notices and disclaimers. In case of a disagreement between -the translation and the original version of this License or a notice -or disclaimer, the original version will prevail. - -If a section in the Document is Entitled ``Acknowledgements'', -``Dedications'', or ``History'', the requirement (section 4) to Preserve -its Title (section 1) will typically require changing the actual -title. - -@item -TERMINATION - -You may not copy, modify, sublicense, or distribute the Document -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense, or distribute it is void, and -will automatically terminate your rights under this License. - -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, receipt of a copy of some or all of the same material does -not give you any rights to use it. - -@item -FUTURE REVISIONS OF THIS LICENSE - -The Free Software Foundation may publish new, revised versions -of the GNU Free Documentation 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. See -@uref{http://www.gnu.org/copyleft/}. - -Each version of the License is given a distinguishing version number. -If the Document specifies that a particular numbered version of this -License ``or any later version'' applies to it, you have the option of -following the terms and conditions either of that specified version or -of any later version that has been published (not as a draft) by the -Free Software Foundation. If the Document does not specify a version -number of this License, you may choose any version ever published (not -as a draft) by the Free Software Foundation. If the Document -specifies that a proxy can decide which future versions of this -License can be used, that proxy's public statement of acceptance of a -version permanently authorizes you to choose that version for the -Document. - -@item -RELICENSING - -``Massive Multiauthor Collaboration Site'' (or ``MMC Site'') means any -World Wide Web server that publishes copyrightable works and also -provides prominent facilities for anybody to edit those works. A -public wiki that anybody can edit is an example of such a server. A -``Massive Multiauthor Collaboration'' (or ``MMC'') contained in the -site means any set of copyrightable works thus published on the MMC -site. - -``CC-BY-SA'' means the Creative Commons Attribution-Share Alike 3.0 -license published by Creative Commons Corporation, a not-for-profit -corporation with a principal place of business in San Francisco, -California, as well as future copyleft versions of that license -published by that same organization. - -``Incorporate'' means to publish or republish a Document, in whole or -in part, as part of another Document. - -An MMC is ``eligible for relicensing'' if it is licensed under this -License, and if all works that were first published under this License -somewhere other than this MMC, and subsequently incorporated in whole -or in part into the MMC, (1) had no cover texts or invariant sections, -and (2) were thus incorporated prior to November 1, 2008. - -The operator of an MMC Site may republish an MMC contained in the site -under CC-BY-SA on the same site at any time before August 1, 2009, -provided the MMC is eligible for relicensing. - -@end enumerate - -@page -@heading ADDENDUM: How to use this License for your documents - -To use this License in a document you have written, include a copy of -the License in the document and put the following copyright and -license notices just after the title page: - -@smallexample -@group - Copyright (C) @var{year} @var{your name}. - Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.3 - or any later version published by the Free Software Foundation; - with no Invariant Sections, no Front-Cover Texts, and no Back-Cover - Texts. A copy of the license is included in the section entitled ``GNU - Free Documentation License''. -@end group -@end smallexample - -If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, -replace the ``with@dots{}Texts.''@: line with this: - -@smallexample -@group - with the Invariant Sections being @var{list their titles}, with - the Front-Cover Texts being @var{list}, and with the Back-Cover Texts - being @var{list}. -@end group -@end smallexample - -If you have Invariant Sections without Cover Texts, or some other -combination of the three, merge those two alternatives to suit the -situation. - -If your document contains nontrivial examples of program code, we -recommend releasing these examples in parallel under your choice of -free software license, such as the GNU General Public License, -to permit their use in free software. - -@c Local Variables: -@c ispell-local-pdict: "ispell-dict" -@c End: diff --git a/doc/sha3sum.texinfo b/doc/sha3sum.texinfo deleted file mode 100644 index 595c725..0000000 --- a/doc/sha3sum.texinfo +++ /dev/null @@ -1,239 +0,0 @@ -\input texinfo @c -*-texinfo-*- - -@c %**start of header -@setfilename sha3sum.info -@settitle sha3sum -@afourpaper -@documentencoding UTF-8 -@documentlanguage en -@finalout -@c %**end of header - - -@dircategory Utilities -@direntry -* sha3sum: (sha3sum). SHA-3 and Keccak checksum utility -@end direntry - - -@copying -Copyright @copyright{} 2014 Mattias Andrée - -@quotation -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.3 or -any later version published by the Free Software Foundation; with no -Invariant Sections, with no Front-Cover Texts, and with no Back-Cover -Texts. A copy of the license is included in the section entitled -``GNU Free Documentation License''. -@end quotation -@end copying - -@ifnottex -@node Top -@top sha3sum -- SHA-3 and Keccak checksum utility -@insertcopying -@end ifnottex - -@titlepage -@title sha3sum -@subtitle SHA-3 and Keccak checksum utility -@author by Mattias Andrée (maandree) - -@page -@c @center `' -@vskip 0pt plus 1filll -@insertcopying -@end titlepage - -@contents - - - -@menu -* Overview:: Brief overview of @command{sha3sum}. -* Invoking:: Invocation of @command{sha3sum}. -* GNU Free Documentation License:: Copying and sharing this manual. -@end menu - - - -@node Overview -@chapter Overview - -@command{sha3sum} is a collection of utilities -around Keccak and its close derivatives SHA-3, -SHAKE and RawSHAKE for calculating checksums -and verifying the integrity of files. - -@command{sha3sum} is based on the library -@command{libkeccak} which is not optimised for -any particular microarchitecture. If you find -a library optimised for your microarchitecture, -not too much work should be required to make it -@command{libkeccak}-compatible, if it isn't -already; or alternatively, make @command{sha3sum} -compatible with that library. - - - -@node Invoking -@chapter Invoking - -@command{sha3sum} include a collection of -similar utilities: - -@table @command -@item keccak-224sum -Calculates Keccak-224 checksums, -which is Keccak[r=1152,c=448,n=224]. - -@item keccak-256sum -Calculates Keccak-256 checksums, -which is Keccak[r=1088,c=512,n=256]. - -@item keccak-384sum -Calculates Keccak-384 checksums, -which is Keccak[r=832,c=768,n=384]. - -@item keccak-512sum -Calculates Keccak-512 checksums, -which is Keccak[r=576,c=1024,n=512]. - -@item keccaksum -Calculates Keccak[] checksums, -which is Keccak[r=1024,c=576,n=512]. - -@item sha3-224sum -Calculates SHA3-224 checksums. - -@item sha3-256sum -Calculates SHA3-256 checksums. - -@item sha3-384sum -Calculates SHA3-384 checksums. - -@item sha3-512sum -Calculates SHA3-512 checksums. - -@item rawshake256sum -Calculates RawSHAKE-256 checksums. - -@item rawshake512sum -Calculates RawSHAKE-512 checksums. - -@item shake256sum -Calculates SHAKE-256 checksums. - -@item shake512sum -Calculates SHAKE-512 checksums. -@end table - -The @command{sha3sum} utilities recognises the -following options, and takes any number -of files. - -@table @option -@item -- -Parse all following arguments as filenames. - -@item ++ -Parse the next argument as a filename. - -@item -h -@itemx --help -Display a summary of options. - -@item -u -@itemx --upper -@itemx --uppercase -@itemx --upper-case -Output the checksums in upper case hexadecimal. - -@item -l -@itemx --lower -@itemx --lowercase -@itemx --lower-case -Output the checksums in lower case hexadecimal. - -@item -b -@itemx --binary -Output the checksums in binary format. When this -is selected, no filenames or checksum delimiters -are included in the output. Thus using this for -more than one file will require some work. - -@item -x -@itemx --hex -@itemx --hex-input -Input files are in hexadecimal rather than binary. - -@item -c -@itemx --check -Read checksums from the file and check them against -the files on your systems. The input files files -should be formated as the output of the -@command{sha3sum} utilities when @option{--check} -is not used, or similarly. This is not going to work -if any of the filenames in the input files starts -with a regular blank space or horizontal tab space, -or if they contain a line feed, carriage return or -form feed. - -@item -v -@itemx --verbose -Print extra information. -@end table - -If no file is selected, or when @file{-} is used, -standard input will be used. - -The utilities also support checking the parameters -for the hash algorithm. These options are however -only intended to be used with @command{keccaksum} -unless stated otherwise. - -@table @option -@item -R -@itemx --bitrate -@itemx --rate RATE -Change the rate. - -@item -C -@itemx --capacity CAPACITY -Change the capacity. - -@item -N -@itemx -O -@itemx --output-size -@itemx --output SIZE -Change the output size. - -This should @emph{always} be specified when using -@command{rawshake256sum}, @command{rawshake512sum}, -@command{shake256sum} and @command{shake512sum}. - -@item -S -@itemx -B -@itemx --state-size -@itemx --state SIZE -Change the state size. - -@item -W -@itemx --word-size -@itemx --word SIZE -Change the word size. - -@item -Z -@itemx --squeezes COUNT -Change the number of squeezes that is performed. -@end table - - - -@node GNU Free Documentation License -@appendix GNU Free Documentation License -@include fdl.texinfo - -@bye - diff --git a/doc/xsum.texman b/doc/xsum.texman deleted file mode 100644 index 216b758..0000000 --- a/doc/xsum.texman +++ /dev/null @@ -1,80 +0,0 @@ -@c -*- texinfo -*- -@texman{xsum}{1}{November 14 2014} - -@section Name -xsum - compute and check XSUM message digests - -@section Synopsis -@b{xsum} [option...] [--] [file...] - -@section Description -Print or check XSUM checksums. If no file -or when the file is -, read standard input. - -@item @b{-h}, @b{--help} -Display option summary. - -@item @b{-u}, @b{--upper}, @b{--uppercase}, @b{--upper-case} -Output checksums in upper-case hexadecimal representation. (default) - -@item @b{-l}, @b{--lower}, @b{--lowercase}, @b{--lower-case} -Output checksums in lower-case hexadecimal representation. - -@item @b{-b}, @b{--binary} -Output checksums in binary representation. This suppresses -the filenames and checksum delimiters. Only the checksums -are printed. - -@item @b{-x}, @b{--hex}, @b{--hex-input} -Convert input files from hexadecimal for to binary form -before calculating the checksums. - -@item @b{-c}, @b{--check} -Read XSUM sums from the file and check them against -the files on your systems. The input files files -should be formated as the output of this program, or -similarly. This is not going to work if any of the -filenames in the input files starts with a regular -blank space or horizontal tab space, or if they -contain a line feed, carriage return or form feed. - -@item @b{-v}, @b{--verbose} -Print the hashing parameters. - -@item The following options change the hashing parameters: - -@item @b{-R}, @b{--bitrate}, @b{--rate} RATE -Change the rate. - -@item @b{-C}, @b{--capacity} CAPACITY -Change the capacity. - -@item @b{-N}, @b{-O}, @b{--output-size}, @b{--output} SIZE -Change the output size. - -@item @b{-S}, @b{-B}, @b{--state-size}, @b{--state} SIZE -Change the state size. - -@item @b{-W}, @b{--word-size}, @b{--word} SIZE -Change the word size. - -@item @b{-Z}, @b{--squeezes} COUNT -Change the number of squeezes that is performed. - - -@section Author - -Written by Mattias Andrée. - - -@section Note - -All commands in the sha3sum package allow changing -the hashing parameters. However it is only intended -to be used with @b{keccaksum}, or if you know what you -are doing; apart from @b{--output} which is intended -to @emph{always} be used with @b{shake256sum}, -@b{shake512sum}, @b{rawshake256sum} and @b{rawshake512sum}. - -@bye - diff --git a/src/common.c b/src/common.c index 2e168f4..580ca72 100644 --- a/src/common.c +++ b/src/common.c @@ -1,65 +1,48 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * 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 . - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" -#include +#include +#include #include #include -#include #include +#include #include #include -#include -#include +#include #ifndef STDIN_PATH # ifndef DEVDIR -# define DEVDIR "/dev" +# define DEVDIR "/dev" # endif -# define STDIN_PATH DEVDIR "/stdin" +# define STDIN_PATH DEVDIR"/stdin" #endif -#define USER_ERROR(string) \ - (fprintf(stderr, "%s: %s.\n", execname, string), 1) +#define USER_ERROR(string)\ + (fprintf(stderr, "%s: %s.\n", execname, string), 1) -#define ADD(arg, desc, ...) \ - (arg ? args_add_option(args_new_argumented(NULL, arg, 0, __VA_ARGS__, NULL), desc) \ - : args_add_option(args_new_argumentless(NULL, 0, __VA_ARGS__, NULL), desc)) +#define ADD(arg, desc, ...)\ + (arg ? args_add_option(args_new_argumented(NULL, arg, 0, __VA_ARGS__, NULL), desc)\ + : args_add_option(args_new_argumentless(NULL, 0, __VA_ARGS__, NULL), desc)) -#define LAST(arg) \ - (args_opts_get(arg)[args_opts_get_count(arg) - 1]) +#define LAST(arg)\ + (args_opts_get(arg)[args_opts_get_count(arg) - 1]) /** * Storage for binary hash */ -static char* restrict hashsum = NULL; +static char *restrict hashsum = NULL; /** * Storage for hexadecimal hash */ -static char* restrict hexsum = NULL; +static char *restrict hexsum = NULL; /** * Storage for binary version of expected checksum @@ -74,7 +57,7 @@ static int bad_found = 0; /** * `argv[0]` from `main` */ -static char* execname; +static char *execname; @@ -90,44 +73,42 @@ static char* execname; * at least `(spec->output / 8) * sizeof(char)`, may be `NULL` * @return Zero on success, -1 on error */ -__attribute__((nonnull(2, 3))) -static int generalised_sum_fd_hex(int fd, libkeccak_state_t* restrict state, - const libkeccak_spec_t* restrict spec, - const char* restrict suffix, char* restrict hash) +static int +generalised_sum_fd_hex(int fd, libkeccak_state_t *restrict state, + const libkeccak_spec_t *restrict spec, + const char *restrict suffix, char *restrict hash) { - ssize_t got; - struct stat attr; - size_t blksize = 4096, r_ptr = 0, w_ptr = 0; - char* restrict chunk; - char even = 1, buf = 0, c; - - if (libkeccak_state_initialise(state, spec) < 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) return -1; - if (got == 0) break; - while (r_ptr < (size_t)got) - { - if (c = chunk[r_ptr++], c <= ' ') - continue; - buf = (buf << 4) | ((c & 15) + (c > '9' ? 9 : 0)); - if ((even ^= 1)) - chunk[w_ptr++] = buf; + ssize_t got; + struct stat attr; + size_t blksize = 4096, r_ptr = 0, w_ptr = 0; + char *restrict chunk; + char even = 1, buf = 0, c; + + if (libkeccak_state_initialise(state, spec) < 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) return -1; + if (!got) break; + while (r_ptr < (size_t)got) { + if (c = chunk[r_ptr++], c <= ' ') + continue; + buf = (buf << 4) | ((c & 15) + (c > '9' ? 9 : 0)); + if ((even ^= 1)) + chunk[w_ptr++] = buf; + } + if (libkeccak_fast_update(state, chunk, w_ptr) < 0) + return -1; } - if (libkeccak_fast_update(state, chunk, w_ptr) < 0) - return -1; - } - - return libkeccak_fast_digest(state, NULL, 0, 0, suffix, hash); + + return libkeccak_fast_digest(state, NULL, 0, 0, suffix, hash); } @@ -138,49 +119,50 @@ static int generalised_sum_fd_hex(int fd, libkeccak_state_t* restrict state, * @param spec See `libkeccak_degeneralise_spec` * @return Zero on success, an appropriate exit value on error */ -static int make_spec(libkeccak_generalised_spec_t* restrict gspec, libkeccak_spec_t* restrict spec) +static int +make_spec(libkeccak_generalised_spec_t *restrict gspec, libkeccak_spec_t *restrict spec) { - int r; - + int r; + #define TEST(CASE, STR) case LIBKECCAK_GENERALISED_SPEC_ERROR_##CASE: return USER_ERROR(STR) - if (r = libkeccak_degeneralise_spec(gspec, spec), r) - switch (r) - { - TEST (STATE_NONPOSITIVE, "the state size must be positive"); - TEST (STATE_TOO_LARGE, "the state size is too large, may not exceed 1600"); - TEST (STATE_MOD_25, "the state size must be a multiple of 25"); - TEST (WORD_NONPOSITIVE, "the word size must be positive"); - TEST (WORD_TOO_LARGE, "the word size is too large, may not exceed 64"); - TEST (STATE_WORD_INCOHERENCY, "the state size must be exactly 25 times the word size"); - TEST (CAPACITY_NONPOSITIVE, "the capacity must be positive"); - TEST (CAPACITY_MOD_8, "the capacity must be a multiple of 8"); - TEST (BITRATE_NONPOSITIVE, "the rate must be positive"); - TEST (BITRATE_MOD_8, "the rate must be a multiple of 8"); - TEST (OUTPUT_NONPOSITIVE, "the output size must be positive"); - default: - return USER_ERROR("unknown error in algorithm parameters"); - } + if (r = libkeccak_degeneralise_spec(gspec, spec), r) { + switch (r) { + TEST (STATE_NONPOSITIVE, "the state size must be positive"); + TEST (STATE_TOO_LARGE, "the state size is too large, may not exceed 1600"); + TEST (STATE_MOD_25, "the state size must be a multiple of 25"); + TEST (WORD_NONPOSITIVE, "the word size must be positive"); + TEST (WORD_TOO_LARGE, "the word size is too large, may not exceed 64"); + TEST (STATE_WORD_INCOHERENCY, "the state size must be exactly 25 times the word size"); + TEST (CAPACITY_NONPOSITIVE, "the capacity must be positive"); + TEST (CAPACITY_MOD_8, "the capacity must be a multiple of 8"); + TEST (BITRATE_NONPOSITIVE, "the rate must be positive"); + TEST (BITRATE_MOD_8, "the rate must be a multiple of 8"); + TEST (OUTPUT_NONPOSITIVE, "the output size must be positive"); + default: + return USER_ERROR("unknown error in algorithm parameters"); + } + } #undef TEST - + #define TEST(CASE, STR) case LIBKECCAK_SPEC_ERROR_##CASE: return USER_ERROR(STR) - if (r = libkeccak_spec_check(spec), r) - switch (r) - { - TEST (BITRATE_NONPOSITIVE, "the rate size must be positive"); - TEST (BITRATE_MOD_8, "the rate must be a multiple of 8"); - TEST (CAPACITY_NONPOSITIVE, "the capacity must be positive"); - TEST (CAPACITY_MOD_8, "the capacity must be a multiple of 8"); - TEST (OUTPUT_NONPOSITIVE, "the output size must be positive"); - TEST (STATE_TOO_LARGE, "the state size is too large, may not exceed 1600"); - TEST (STATE_MOD_25, "the state size must be a multiple of 25"); - TEST (WORD_NON_2_POTENT, "the word size must be a power of 2"); - TEST (WORD_MOD_8, "the word size must be a multiple of 8"); - default: - return USER_ERROR("unknown error in algorithm parameters"); - } + if (r = libkeccak_spec_check(spec), r) { + switch (r) { + TEST (BITRATE_NONPOSITIVE, "the rate size must be positive"); + TEST (BITRATE_MOD_8, "the rate must be a multiple of 8"); + TEST (CAPACITY_NONPOSITIVE, "the capacity must be positive"); + TEST (CAPACITY_MOD_8, "the capacity must be a multiple of 8"); + TEST (OUTPUT_NONPOSITIVE, "the output size must be positive"); + TEST (STATE_TOO_LARGE, "the state size is too large, may not exceed 1600"); + TEST (STATE_MOD_25, "the state size must be a multiple of 25"); + TEST (WORD_NON_2_POTENT, "the word size must be a power of 2"); + TEST (WORD_MOD_8, "the word size must be a multiple of 8"); + default: + return USER_ERROR("unknown error in algorithm parameters"); + } + } #undef TEST - - return 0; + + return 0; } @@ -194,36 +176,35 @@ static int make_spec(libkeccak_generalised_spec_t* restrict gspec, libkeccak_spe * @param hex Whether to use hexadecimal input rather than binary * @return Zero on success, an appropriate exit value on error */ -static int hash(const char* restrict filename, const libkeccak_spec_t* restrict spec, - long squeezes, const char* restrict suffix, int hex) +static int +hash(const char *restrict filename, const libkeccak_spec_t *restrict spec, + long squeezes, const char *restrict suffix, int hex) { - libkeccak_state_t state; - size_t length; - int r, fd; - - length = (size_t)((spec->output + 7) / 8); - - if (hashsum == NULL) - if (hashsum = malloc(length * sizeof(char)), hashsum == NULL) - return perror(execname), 2; - - if (hexsum == NULL) - if (hexsum = malloc((length * 2 + 1) * sizeof(char)), hexsum == NULL) - return perror(execname), 2; - - if (fd = open(strcmp(filename, "-") ? filename : STDIN_PATH, O_RDONLY), fd < 0) - return r = (errno != ENOENT), perror(execname), r + 1; - - if ((hex == 0 ? libkeccak_generalised_sum_fd : generalised_sum_fd_hex) - (fd, &state, spec, suffix, squeezes > 1 ? NULL : hashsum)) - return perror(execname), close(fd), libkeccak_state_fast_destroy(&state), 2; - close(fd); - - if (squeezes > 2) libkeccak_fast_squeeze(&state, squeezes - 2); - if (squeezes > 1) libkeccak_squeeze(&state, hashsum); - libkeccak_state_fast_destroy(&state); - - return 0; + libkeccak_state_t state; + size_t length; + int r, fd; + + length = (size_t)((spec->output + 7) / 8); + + if (!hashsum && (hashsum = malloc(length * sizeof(char)), !hashsum)) + return perror(execname), 2; + + if (!hexsum && (hexsum = malloc((length * 2 + 1) * sizeof(char)), !hexsum)) + return perror(execname), 2; + + if (fd = open(strcmp(filename, "-") ? filename : STDIN_PATH, O_RDONLY), fd < 0) + return r = (errno != ENOENT), perror(execname), r + 1; + + if ((hex == 0 ? libkeccak_generalised_sum_fd : generalised_sum_fd_hex) + (fd, &state, spec, suffix, squeezes > 1 ? NULL : hashsum)) + return perror(execname), close(fd), libkeccak_state_fast_destroy(&state), 2; + close(fd); + + if (squeezes > 2) libkeccak_fast_squeeze(&state, squeezes - 2); + if (squeezes > 1) libkeccak_squeeze(&state, hashsum); + libkeccak_state_fast_destroy(&state); + + return 0; } @@ -239,28 +220,28 @@ static int hash(const char* restrict filename, const libkeccak_spec_t* restrict * @param correct_hash The expected checksum (any form of hexadecimal) * @return Zero on success, an appropriate exit value on error */ -static int check(const libkeccak_spec_t* restrict spec, long squeezes, const char* restrict suffix, - int hex, const char* restrict filename, const char* restrict correct_hash) +static int +check(const libkeccak_spec_t *restrict spec, long squeezes, const char *restrict suffix, + int hex, const char *restrict filename, const char *restrict correct_hash) { - size_t length = (size_t)((spec->output + 7) / 8); - int r; - - if (access(filename, F_OK)) - { - bad_found = 1; - printf("%s: %s\n", filename, "Missing"); - return 0; - } - - if ((r = hash(filename, spec, squeezes, suffix, hex))) - return r; - - libkeccak_unhex(correct_binary, correct_hash); - if ((r = memcmp(correct_binary, hashsum, length))) - bad_found = 1; - printf("%s: %s\n", filename, !r ? "OK" : "Fail"); - - return 0; + size_t length = (size_t)((spec->output + 7) / 8); + int r; + + if (access(filename, F_OK)) { + bad_found = 1; + printf("%s: %s\n", filename, "Missing"); + return 0; + } + + if ((r = hash(filename, spec, squeezes, suffix, hex))) + return r; + + libkeccak_unhex(correct_binary, correct_hash); + if ((r = memcmp(correct_binary, hashsum, length))) + bad_found = 1; + printf("%s: %s\n", filename, !r ? "OK" : "Fail"); + + return 0; } @@ -275,144 +256,128 @@ static int check(const libkeccak_spec_t* restrict spec, long squeezes, const cha * @param hex Whether to use hexadecimal input rather than binary * @return Zero on success, an appropriate exit value on error */ -static int check_checksums(const char* restrict filename, const libkeccak_spec_t* restrict spec, - long squeezes, const char* restrict suffix, int representation, int hex) +static int +check_checksums(const char *restrict filename, const libkeccak_spec_t *restrict spec, + long squeezes, const char *restrict suffix, int representation, int hex) { - struct stat attr; - size_t blksize = 4096; - size_t size = 4096; - size_t ptr = 0; - ssize_t got; - char* buf = NULL; - char* new; - int fd = -1, rc = 2, stage, r; - size_t hash_start = 0, hash_end = 0; - size_t file_start = 0, file_end = 0; - char* hash; - char* file; - size_t hash_n; - - if (fd = open(strcmp(filename, "-") ? filename : STDIN_PATH, O_RDONLY), fd < 0) - goto pfail; - - if (fstat(fd, &attr) == 0) - { - if (attr.st_blksize > 0) blksize = (size_t)(attr.st_blksize); - if (attr.st_size > 0) size = (size_t)(attr.st_size); - } - - size = size > blksize ? size : blksize; - if (buf = malloc(size), buf == NULL) - goto pfail; - - for (;;) - { - if (ptr + blksize < size) - { - if (new = realloc(buf, size <<= 1), new == NULL) - goto pfail; - buf = new; - } - - got = read(fd, buf + ptr, blksize); - if (got < 0) goto pfail; - else if (got == 0) break; - else ptr += (size_t)got; - } - if (ptr == size) - { - if (new = realloc(buf, size + 1), new == NULL) - goto pfail; - buf = new; - } - size = ptr; - close(fd), fd = -1; - buf[size++] = '\n'; - - for (ptr = 0, stage = 0; ptr < size; ptr++) - { - char c = buf[ptr]; - if (stage == 0) - { - if (('0' <= c) && (c <= '9')); - else if (('a' <= c) && (c <= 'f')); - else if (('A' <= c) && (c <= 'F')); - else if ((c == ' ') || (c == '\t')) - hash_end = ptr, stage++; - else if ((c == '\n') || (c == '\f') || (c == '\r')) - hash_end = ptr, stage = 3; - else - { - rc = USER_ERROR("file is malformated"); - goto fail; - } + struct stat attr; + size_t blksize = 4096; + size_t size = 4096; + size_t ptr = 0; + ssize_t got; + char *buf = NULL; + char *new; + int fd = -1, rc = 2, stage, r; + size_t hash_start = 0, hash_end = 0; + size_t file_start = 0, file_end = 0; + char *hash; + char *file; + size_t hash_n; + char c; + + if (fd = open(strcmp(filename, "-") ? filename : STDIN_PATH, O_RDONLY), fd < 0) + goto pfail; + + if (fstat(fd, &attr) == 0) { + if (attr.st_blksize > 0) blksize = (size_t)(attr.st_blksize); + if (attr.st_size > 0) size = (size_t)(attr.st_size); } - else if (stage == 1) - { - if ((c == '\n') || (c == '\f') || (c == '\r')) - stage = 3; - else if ((c != ' ') && (c != '\t')) - file_start = ptr, stage++; + + size = size > blksize ? size : blksize; + if (buf = malloc(size), buf == NULL) + goto pfail; + + for (;;) { + if (ptr + blksize < size) { + if (new = realloc(buf, size <<= 1), new == NULL) + goto pfail; + buf = new; + } + + got = read(fd, buf + ptr, blksize); + if (got < 0) goto pfail; + else if (got == 0) break; + else ptr += (size_t)got; } - else if (stage == 2) - { - if ((c == '\n') || (c == '\f') || (c == '\r')) - file_end = ptr, stage++; + if (ptr == size) { + if (new = realloc(buf, size + 1), new == NULL) + goto pfail; + buf = new; } - - if (stage == 3) - { - if ((hash_start == hash_end) != (file_start == file_end)) - { - rc = USER_ERROR("file is malformated"); - goto fail; - } - if (hash_start != hash_end) - { - hash = buf + hash_start; - file = buf + file_start; - hash_n = hash_end - hash_start; - buf[hash_end] = '\0'; - buf[file_end] = '\0'; - if (hash_n % 2) - { - rc = USER_ERROR("file is malformated"); - goto fail; - } - if (hash_n / 2 != (size_t)((spec->output + 7) / 8)) - { - rc = USER_ERROR("algorithm parameter mismatch"); - goto fail; + size = ptr; + close(fd), fd = -1; + buf[size++] = '\n'; + + for (ptr = 0, stage = 0; ptr < size; ptr++) { + c = buf[ptr]; + if (stage == 0) { + if (('0' <= c) && (c <= '9')); + else if (('a' <= c) && (c <= 'f')); + else if (('A' <= c) && (c <= 'F')); + else if ((c == ' ') || (c == '\t')) { + hash_end = ptr, stage++; + } else if ((c == '\n') || (c == '\f') || (c == '\r')) { + hash_end = ptr, stage = 3; + } else { + rc = USER_ERROR("file is malformated"); + goto fail; + } + } else if (stage == 1) { + if ((c == '\n') || (c == '\f') || (c == '\r')) + stage = 3; + else if ((c != ' ') && (c != '\t')) + file_start = ptr, stage++; + } else if (stage == 2) { + if ((c == '\n') || (c == '\f') || (c == '\r')) + file_end = ptr, stage++; } - if ((r = check(spec, squeezes, suffix, hex, file, hash))) - { - rc = r; - goto fail; + + if (stage == 3) { + if ((hash_start == hash_end) != (file_start == file_end)) { + rc = USER_ERROR("file is malformated"); + goto fail; + } + if (hash_start != hash_end) { + hash = buf + hash_start; + file = buf + file_start; + hash_n = hash_end - hash_start; + buf[hash_end] = '\0'; + buf[file_end] = '\0'; + if (hash_n % 2) { + rc = USER_ERROR("file is malformated"); + goto fail; + } + if (hash_n / 2 != (size_t)((spec->output + 7) / 8)) { + rc = USER_ERROR("algorithm parameter mismatch"); + goto fail; + } + if ((r = check(spec, squeezes, suffix, hex, file, hash))) { + rc = r; + goto fail; + } + } + stage = 0; + hash_start = hash_end = file_start = file_end = ptr + 1; } - } - stage = 0; - hash_start = hash_end = file_start = file_end = ptr + 1; } - } - - if (stage) - { - rc = USER_ERROR("file is malformated"); - goto fail; - } - - free(buf); - return 0; - - pfail: - perror(execname); - fail: - free(buf); - if (fd >= 0) - close(fd); - return rc; - - (void) representation; + + if (stage) { + rc = USER_ERROR("file is malformated"); + goto fail; + } + + free(buf); + return 0; + +pfail: + perror(execname); +fail: + free(buf); + if (fd >= 0) + close(fd); + return rc; + + (void) representation; } @@ -428,50 +393,46 @@ static int check_checksums(const char* restrict filename, const libkeccak_spec_t * @param hex Whether to use hexadecimal input rather than binary * @return Zero on success, an appropriate exit value on error */ -static int print_checksum(const char* restrict filename, const libkeccak_spec_t* restrict spec, - long squeezes, const char* restrict suffix, int representation, int hex) +static int +print_checksum(const char *restrict filename, const libkeccak_spec_t *restrict spec, + long squeezes, const char *restrict suffix, int representation, int hex) { - size_t length = (size_t)((spec->output + 7) / 8); - int r; - - if ((r = hash(filename, spec, squeezes, suffix, hex))) - return r; - - if (representation == REPRESENTATION_UPPER_CASE) - { - libkeccak_behex_upper(hexsum, hashsum, length); - printf("%s %s\n", hexsum, filename); - } - else if (representation == REPRESENTATION_LOWER_CASE) - { - libkeccak_behex_lower(hexsum, hashsum, length); - printf("%s %s\n", hexsum, filename); - } - else - { - size_t ptr = 0; - ssize_t wrote; - fflush(stdout); - while (length - ptr) - { - wrote = write(STDOUT_FILENO, hashsum, length - ptr); - if (wrote <= 0) - return perror(execname), 2; - ptr += (size_t)wrote; + size_t length = (size_t)((spec->output + 7) / 8); + int r; + size_t ptr = 0; + ssize_t wrote; + + if ((r = hash(filename, spec, squeezes, suffix, hex))) + return r; + + if (representation == REPRESENTATION_UPPER_CASE) { + libkeccak_behex_upper(hexsum, hashsum, length); + printf("%s %s\n", hexsum, filename); + } else if (representation == REPRESENTATION_LOWER_CASE) { + libkeccak_behex_lower(hexsum, hashsum, length); + printf("%s %s\n", hexsum, filename); + } else { + fflush(stdout); + while (length - ptr) { + wrote = write(STDOUT_FILENO, hashsum, length - ptr); + if (wrote <= 0) + return perror(execname), 2; + ptr += (size_t)wrote; + } } - } - - return 0; + + return 0; } /** * Cleanup allocations */ -static inline void cleanup(void) +static inline void +cleanup(void) { - free(hashsum), hashsum = NULL; - free(hexsum), hexsum = NULL; + free(hashsum), hashsum = NULL; + free(hexsum), hexsum = NULL; } @@ -484,82 +445,82 @@ static inline void cleanup(void) * @param suffix Message suffix * @return An appropriate exit value */ -int run(int argc, char* argv[], libkeccak_generalised_spec_t* restrict gspec, const char* restrict suffix) +int +run(int argc, char *argv[], libkeccak_generalised_spec_t *restrict gspec, const char *restrict suffix) { - int r, verbose = 0, presentation = REPRESENTATION_UPPER_CASE, hex = 0, check = 0; - long squeezes = 1; - size_t i; - libkeccak_spec_t spec; - int (*fun)(const char* restrict filename, const libkeccak_spec_t* restrict spec, - long squeezes, const char* restrict suffix, int representation, int hex); - - execname = *argv; - - ADD(NULL, "Display option summary", "-h", "--help"); - ADD("RATE", "Select rate", "-R", "--bitrate", "--rate"); - ADD("CAPACITY", "Select capacity", "-C", "--capacity"); - ADD("SIZE", "Select output size", "-N", "-O", "--output-size", "--output"); - ADD("SIZE", "Select state size", "-S", "-B", "--state-size", "--state"); - ADD("SIZE", "Select word size", "-W", "--word-size", "--word"); - ADD("COUNT", "Select squeeze count", "-Z", "--squeezes"); - ADD(NULL, "Use upper-case output", "-u", "--upper", "--uppercase", "--upper-case"); - ADD(NULL, "Use lower-case output", "-l", "--lower", "--lowercase", "--lower-case"); - ADD(NULL, "Use binary output", "-b", "--binary"); - ADD(NULL, "Use hexadecimal input", "-x", "--hex", "--hex-input"); - ADD(NULL, "Check checksums", "-c", "--check"); - ADD(NULL, "Be verbose", "-v", "--verbose"); - /* --check has been added because the sha1sum, sha256sum &c have it, - * but I ignore the other crap, mostly because not all implemention - * have them and binary vs text mode is stupid. */ - - args_parse(argc, argv); - - if (args_opts_used("-h")) return args_help(0), args_dispose(), 0; - if (args_opts_used("-R")) gspec->bitrate = atol(LAST("-R")); - if (args_opts_used("-C")) gspec->capacity = atol(LAST("-C")); - if (args_opts_used("-N")) gspec->output = atol(LAST("-N")); - if (args_opts_used("-S")) gspec->state_size = atol(LAST("-S")); - if (args_opts_used("-W")) gspec->word_size = atol(LAST("-W")); - if (args_opts_used("-Z")) squeezes = atol(LAST("-Z")); - if (args_opts_used("-u")) presentation = REPRESENTATION_UPPER_CASE; - if (args_opts_used("-l")) presentation = REPRESENTATION_LOWER_CASE; - if (args_opts_used("-b")) presentation = REPRESENTATION_BINARY; - if (args_opts_used("-x")) hex = 1; - if (args_opts_used("-c")) check = 1; - if (args_opts_used("-v")) verbose = 1; - - fun = check ? check_checksums : print_checksum; - - if ((r = make_spec(gspec, &spec))) - goto done; - - if (squeezes <= 0) - { - r = USER_ERROR("the squeeze count most be positive"); - goto done; - } - - if (verbose) - { - fprintf(stderr, "rate: %li\n", gspec->bitrate); - fprintf(stderr, "capacity: %li\n", gspec->capacity); - fprintf(stderr, "output size: %li\n", gspec->output); - fprintf(stderr, "state size: %li\n", gspec->state_size); - fprintf(stderr, "word size: %li\n", gspec->word_size); - fprintf(stderr, "squeezes: %li\n", squeezes); - fprintf(stderr, "suffix: %s\n", suffix ? suffix : ""); - } - - if (args_files_count == 0) - r = fun("-", &spec, squeezes, suffix, presentation, hex); - else - for (i = 0; i < (size_t)args_files_count; i++) - if ((r = fun(args_files[i], &spec, squeezes, suffix, presentation, hex))) - break; - - done: - args_dispose(); - cleanup(); - return r ? r : bad_found; + int r, verbose = 0, presentation = REPRESENTATION_UPPER_CASE, hex = 0, check = 0; + long squeezes = 1; + size_t i; + libkeccak_spec_t spec; + int (*fun)(const char *restrict filename, const libkeccak_spec_t *restrict spec, + long squeezes, const char *restrict suffix, int representation, int hex); + + execname = *argv; + + ADD(NULL, "Display option summary", "-h", "--help"); + ADD("RATE", "Select rate", "-R", "--bitrate", "--rate"); + ADD("CAPACITY", "Select capacity", "-C", "--capacity"); + ADD("SIZE", "Select output size", "-N", "-O", "--output-size", "--output"); + ADD("SIZE", "Select state size", "-S", "-B", "--state-size", "--state"); + ADD("SIZE", "Select word size", "-W", "--word-size", "--word"); + ADD("COUNT", "Select squeeze count", "-Z", "--squeezes"); + ADD(NULL, "Use upper-case output", "-u", "--upper", "--uppercase", "--upper-case"); + ADD(NULL, "Use lower-case output", "-l", "--lower", "--lowercase", "--lower-case"); + ADD(NULL, "Use binary output", "-b", "--binary"); + ADD(NULL, "Use hexadecimal input", "-x", "--hex", "--hex-input"); + ADD(NULL, "Check checksums", "-c", "--check"); + ADD(NULL, "Be verbose", "-v", "--verbose"); + /* --check has been added because the sha1sum, sha256sum &c have it, + * but I ignore the other crap, mostly because not all implemention + * have them and binary vs text mode is stupid. */ + + args_parse(argc, argv); + + if (args_opts_used("-h")) return args_help(0), args_dispose(), 0; + if (args_opts_used("-R")) gspec->bitrate = atol(LAST("-R")); + if (args_opts_used("-C")) gspec->capacity = atol(LAST("-C")); + if (args_opts_used("-N")) gspec->output = atol(LAST("-N")); + if (args_opts_used("-S")) gspec->state_size = atol(LAST("-S")); + if (args_opts_used("-W")) gspec->word_size = atol(LAST("-W")); + if (args_opts_used("-Z")) squeezes = atol(LAST("-Z")); + if (args_opts_used("-u")) presentation = REPRESENTATION_UPPER_CASE; + if (args_opts_used("-l")) presentation = REPRESENTATION_LOWER_CASE; + if (args_opts_used("-b")) presentation = REPRESENTATION_BINARY; + if (args_opts_used("-x")) hex = 1; + if (args_opts_used("-c")) check = 1; + if (args_opts_used("-v")) verbose = 1; + + fun = check ? check_checksums : print_checksum; + + if ((r = make_spec(gspec, &spec))) + goto done; + + if (squeezes <= 0) { + r = USER_ERROR("the squeeze count most be positive"); + goto done; + } + + if (verbose) { + fprintf(stderr, "rate: %li\n", gspec->bitrate); + fprintf(stderr, "capacity: %li\n", gspec->capacity); + fprintf(stderr, "output size: %li\n", gspec->output); + fprintf(stderr, "state size: %li\n", gspec->state_size); + fprintf(stderr, "word size: %li\n", gspec->word_size); + fprintf(stderr, "squeezes: %li\n", squeezes); + fprintf(stderr, "suffix: %s\n", suffix ? suffix : ""); + } + + if (args_files_count == 0) { + r = fun("-", &spec, squeezes, suffix, presentation, hex); + } else { + for (i = 0; i < (size_t)args_files_count; i++) + if ((r = fun(args_files[i], &spec, squeezes, suffix, presentation, hex))) + break; + } + +done: + args_dispose(); + cleanup(); + return r ? r : bad_found; } diff --git a/src/common.h b/src/common.h index 8246e6c..e3182dc 100644 --- a/src/common.h +++ b/src/common.h @@ -1,32 +1,9 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * 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 . - */ -#ifndef SHA3SUM_COMMON_H -#define SHA3SUM_COMMON_H 1 - - +/* See LICENSE file for copyright and license details. */ #include #include - -#define libkeccak_spec_keccak libkeccak_spec_sha3 -#define LIBKECCAK_KECCAK_SUFFIX "" - +#define libkeccak_spec_keccak libkeccak_spec_sha3 +#define LIBKECCAK_KECCAK_SUFFIX "" /** @@ -36,29 +13,27 @@ * @param prog The name of program, must be a string literal * @param suffix The message suffix */ -#define RUN(algo, prog, suffix) \ - (args_init(algo " checksum calculator", \ - prog " [options...] [--] [files...]", NULL, \ - NULL, 1, 0, args_standard_abbreviations), \ - run(argc, argv, &spec, suffix)) - +#define RUN(algo, prog, suffix)\ + (args_init(algo " checksum calculator",\ + prog " [options...] [--] [files...]", NULL,\ + NULL, 1, 0, args_standard_abbreviations),\ + run(argc, argv, &spec, suffix)) /** * Print the checksum in binary */ -#define REPRESENTATION_BINARY 0 +#define REPRESENTATION_BINARY 0 /** * Print the checksum in upper case hexadecimal */ -#define REPRESENTATION_UPPER_CASE 1 +#define REPRESENTATION_UPPER_CASE 1 /** * Print the checksum in lower case hexadecimal */ -#define REPRESENTATION_LOWER_CASE 2 - +#define REPRESENTATION_LOWER_CASE 2 /** @@ -70,8 +45,4 @@ * @param suffix Message suffix * @return An appropriate exit value */ -int run(int argc, char* argv[], libkeccak_generalised_spec_t* restrict gspec, const char* restrict suffix); - - -#endif - +int run(int argc, char *argv[], libkeccak_generalised_spec_t *restrict gspec, const char *restrict suffix); diff --git a/src/completion b/src/completion deleted file mode 100644 index 6da52a7..0000000 --- a/src/completion +++ /dev/null @@ -1,40 +0,0 @@ -; sha3sum – SHA-3 (Keccak) checksum calculator -; -; Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) -; -; 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 . - - -((value command) - - (multiple unargumented - ((options -h --help) (complete --help) (desc 'Display option summary')) - ((options -u --upper --uppercase --upper-case) (complete --upper-case) (desc 'Use upper-case output')) - ((options -l --lower --lowercase --lower-case) (complete --lower-case) (desc 'Use lower-case output')) - ((options -b --binary) (complete --binary) (desc 'Use binary output')) - ((options -x --hex --hex-input) (complete --hex-input) (desc 'Use hexadecimal input')) - ((options -c --check) (complete --check) (desc 'Check checksums')) - ((options -v --verbose) (complete --verbose) (desc 'Be verbose')) - ) - - (multiple argumented - ((options -R --bitrate --rate) (complete --rate) (arg RATE) (files -0) (desc 'Select rate')) - ((options -C --capacity) (complete --capacity) (arg CAPACITY) (files -0) (desc 'Select capacity')) - ((options -N -O --output-size --output) (complete --output-size) (arg SIZE) (files -0) (desc 'Select output size')) - ((options -S -B --state-size --state) (complete --state-size) (arg SIZE) (files -0) (desc 'Select state size')) - ((options -W --word-size --word) (complete --word-size) (arg SIZE) (files -0) (desc 'Select word size')) - ((options -Z --squeezes) (complete --squeezes) (arg COUNT) (files -0) (desc 'Select squeeze count')) - ) -) - diff --git a/src/keccak-224sum.c b/src/keccak-224sum.c index 147ff77..f7d3095 100644 --- a/src/keccak-224sum.c +++ b/src/keccak-224sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * 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 . - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_keccak((libkeccak_spec_t*)&spec, 224); - return RUN("Keccak", "keccak-224sum", LIBKECCAK_KECCAK_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_keccak((libkeccak_spec_t *)&spec, 224); + return RUN("Keccak", "keccak-224sum", LIBKECCAK_KECCAK_SUFFIX); } - diff --git a/src/keccak-256sum.c b/src/keccak-256sum.c index ae13efb..f4f78ac 100644 --- a/src/keccak-256sum.c +++ b/src/keccak-256sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * 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 . - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_keccak((libkeccak_spec_t*)&spec, 256); - return RUN("Keccak", "keccak-256sum", LIBKECCAK_KECCAK_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_keccak((libkeccak_spec_t *)&spec, 256); + return RUN("Keccak", "keccak-256sum", LIBKECCAK_KECCAK_SUFFIX); } - diff --git a/src/keccak-384sum.c b/src/keccak-384sum.c index 16a7e8e..3a6e3a0 100644 --- a/src/keccak-384sum.c +++ b/src/keccak-384sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * 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 . - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_keccak((libkeccak_spec_t*)&spec, 384); - return RUN("Keccak", "keccak-384sum", LIBKECCAK_KECCAK_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_keccak((libkeccak_spec_t *)&spec, 384); + return RUN("Keccak", "keccak-384sum", LIBKECCAK_KECCAK_SUFFIX); } - diff --git a/src/keccak-512sum.c b/src/keccak-512sum.c index 1ddd872..6ba1041 100644 --- a/src/keccak-512sum.c +++ b/src/keccak-512sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * 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 . - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_keccak((libkeccak_spec_t*)&spec, 512); - return RUN("Keccak", "keccak-512sum", LIBKECCAK_KECCAK_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_keccak((libkeccak_spec_t *)&spec, 512); + return RUN("Keccak", "keccak-512sum", LIBKECCAK_KECCAK_SUFFIX); } - diff --git a/src/keccaksum.c b/src/keccaksum.c index 62c9c6e..8fc10a8 100644 --- a/src/keccaksum.c +++ b/src/keccaksum.c @@ -1,29 +1,10 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * 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 . - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - return RUN("Keccak", "keccaksum", LIBKECCAK_KECCAK_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + return RUN("Keccak", "keccaksum", LIBKECCAK_KECCAK_SUFFIX); } - diff --git a/src/rawshake256sum.c b/src/rawshake256sum.c index 7bd0100..6d6e19a 100644 --- a/src/rawshake256sum.c +++ b/src/rawshake256sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * 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 . - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_rawshake((libkeccak_spec_t*)&spec, 256, 256); - return RUN("RawSHAKE", "rawshake256sum", LIBKECCAK_RAWSHAKE_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_rawshake((libkeccak_spec_t *)&spec, 256, 256); + return RUN("RawSHAKE", "rawshake256sum", LIBKECCAK_RAWSHAKE_SUFFIX); } - diff --git a/src/rawshake512sum.c b/src/rawshake512sum.c index cefb71d..be1d8ac 100644 --- a/src/rawshake512sum.c +++ b/src/rawshake512sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * 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 . - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_rawshake((libkeccak_spec_t*)&spec, 512, 512); - return RUN("RawSHAKE", "rawshake512sum", LIBKECCAK_RAWSHAKE_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_rawshake((libkeccak_spec_t *)&spec, 512, 512); + return RUN("RawSHAKE", "rawshake512sum", LIBKECCAK_RAWSHAKE_SUFFIX); } - diff --git a/src/sha3-224sum.c b/src/sha3-224sum.c index 2ce1255..15fac82 100644 --- a/src/sha3-224sum.c +++ b/src/sha3-224sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * 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 . - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_sha3((libkeccak_spec_t*)&spec, 224); - return RUN("SHA-3", "sha3-224sum", LIBKECCAK_SHA3_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_sha3((libkeccak_spec_t *)&spec, 224); + return RUN("SHA-3", "sha3-224sum", LIBKECCAK_SHA3_SUFFIX); } - diff --git a/src/sha3-256sum.c b/src/sha3-256sum.c index ec01211..2273785 100644 --- a/src/sha3-256sum.c +++ b/src/sha3-256sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * 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 . - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_sha3((libkeccak_spec_t*)&spec, 256); - return RUN("SHA-3", "sha3-256sum", LIBKECCAK_SHA3_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_sha3((libkeccak_spec_t *)&spec, 256); + return RUN("SHA-3", "sha3-256sum", LIBKECCAK_SHA3_SUFFIX); } - diff --git a/src/sha3-384sum.c b/src/sha3-384sum.c index ecac0ab..2c18df7 100644 --- a/src/sha3-384sum.c +++ b/src/sha3-384sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * 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 . - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_sha3((libkeccak_spec_t*)&spec, 384); - return RUN("SHA-3", "sha3-384sum", LIBKECCAK_SHA3_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_sha3((libkeccak_spec_t *)&spec, 384); + return RUN("SHA-3", "sha3-384sum", LIBKECCAK_SHA3_SUFFIX); } - diff --git a/src/sha3-512sum.c b/src/sha3-512sum.c index c547c6c..a5b40e3 100644 --- a/src/sha3-512sum.c +++ b/src/sha3-512sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * 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 . - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_sha3((libkeccak_spec_t*)&spec, 512); - return RUN("SHA-3", "sha3-512sum", LIBKECCAK_SHA3_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_sha3((libkeccak_spec_t *)&spec, 512); + return RUN("SHA-3", "sha3-512sum", LIBKECCAK_SHA3_SUFFIX); } - diff --git a/src/shake256sum.c b/src/shake256sum.c index 1645a53..7ab6cc6 100644 --- a/src/shake256sum.c +++ b/src/shake256sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * 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 . - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_shake((libkeccak_spec_t*)&spec, 256, 256); - return RUN("SHAKE", "shake256sum", LIBKECCAK_SHAKE_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_shake((libkeccak_spec_t *)&spec, 256, 256); + return RUN("SHAKE", "shake256sum", LIBKECCAK_SHAKE_SUFFIX); } - diff --git a/src/shake512sum.c b/src/shake512sum.c index 6cac04b..3e24ddb 100644 --- a/src/shake512sum.c +++ b/src/shake512sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * 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 . - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_shake((libkeccak_spec_t*)&spec, 512, 512); - return RUN("SHAKE", "shake512sum", LIBKECCAK_SHAKE_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_shake((libkeccak_spec_t *)&spec, 512, 512); + return RUN("SHAKE", "shake512sum", LIBKECCAK_SHAKE_SUFFIX); } - diff --git a/xsum.texman b/xsum.texman new file mode 100644 index 0000000..216b758 --- /dev/null +++ b/xsum.texman @@ -0,0 +1,80 @@ +@c -*- texinfo -*- +@texman{xsum}{1}{November 14 2014} + +@section Name +xsum - compute and check XSUM message digests + +@section Synopsis +@b{xsum} [option...] [--] [file...] + +@section Description +Print or check XSUM checksums. If no file +or when the file is -, read standard input. + +@item @b{-h}, @b{--help} +Display option summary. + +@item @b{-u}, @b{--upper}, @b{--uppercase}, @b{--upper-case} +Output checksums in upper-case hexadecimal representation. (default) + +@item @b{-l}, @b{--lower}, @b{--lowercase}, @b{--lower-case} +Output checksums in lower-case hexadecimal representation. + +@item @b{-b}, @b{--binary} +Output checksums in binary representation. This suppresses +the filenames and checksum delimiters. Only the checksums +are printed. + +@item @b{-x}, @b{--hex}, @b{--hex-input} +Convert input files from hexadecimal for to binary form +before calculating the checksums. + +@item @b{-c}, @b{--check} +Read XSUM sums from the file and check them against +the files on your systems. The input files files +should be formated as the output of this program, or +similarly. This is not going to work if any of the +filenames in the input files starts with a regular +blank space or horizontal tab space, or if they +contain a line feed, carriage return or form feed. + +@item @b{-v}, @b{--verbose} +Print the hashing parameters. + +@item The following options change the hashing parameters: + +@item @b{-R}, @b{--bitrate}, @b{--rate} RATE +Change the rate. + +@item @b{-C}, @b{--capacity} CAPACITY +Change the capacity. + +@item @b{-N}, @b{-O}, @b{--output-size}, @b{--output} SIZE +Change the output size. + +@item @b{-S}, @b{-B}, @b{--state-size}, @b{--state} SIZE +Change the state size. + +@item @b{-W}, @b{--word-size}, @b{--word} SIZE +Change the word size. + +@item @b{-Z}, @b{--squeezes} COUNT +Change the number of squeezes that is performed. + + +@section Author + +Written by Mattias Andrée. + + +@section Note + +All commands in the sha3sum package allow changing +the hashing parameters. However it is only intended +to be used with @b{keccaksum}, or if you know what you +are doing; apart from @b{--output} which is intended +to @emph{always} be used with @b{shake256sum}, +@b{shake512sum}, @b{rawshake256sum} and @b{rawshake512sum}. + +@bye + -- cgit v1.2.3-70-g09d2