From 7e91fe6acf6552c398e100a81c0f6c561db00106 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Thu, 2 Feb 2023 00:19:57 +0300 Subject: [PATCH] GOST X.509 and TLS 1.3 support via GoGOST --- COPYING.GPLv3 | 674 +++++++++++++++++++++++ PUBKEY-PGP.asc | 34 ++ PUBKEY-SSH.pub | 1 + PUBKEY-SSH.pub.asc | 11 + README | 27 + debash | 11 + gogost-install | 28 + src/crypto/crypto.go | 9 + src/crypto/ecdh/gost.go | 95 ++++ src/crypto/tls/auth.go | 40 ++ src/crypto/tls/cipher_suites.go | 26 +- src/crypto/tls/common.go | 22 +- src/crypto/tls/conn.go | 3 + src/crypto/tls/defaults.go | 6 +- src/crypto/tls/gost.go | 191 +++++++ src/crypto/tls/gost_test.go | 174 ++++++ src/crypto/tls/handshake_client.go | 4 +- src/crypto/tls/handshake_client_tls13.go | 3 + src/crypto/tls/handshake_server.go | 6 +- src/crypto/tls/handshake_server_tls13.go | 1 + src/crypto/tls/key_schedule.go | 30 +- src/crypto/tls/tls.go | 13 +- src/crypto/x509/parser.go | 54 ++ src/crypto/x509/pkcs8.go | 75 ++- src/crypto/x509/x509.go | 113 +++- src/crypto/x509/x509_test.go | 63 +++ 26 files changed, 1702 insertions(+), 12 deletions(-) create mode 100644 COPYING.GPLv3 create mode 100644 PUBKEY-PGP.asc create mode 100644 PUBKEY-SSH.pub create mode 100644 PUBKEY-SSH.pub.asc create mode 100644 README create mode 100755 debash create mode 100755 gogost-install create mode 100644 src/crypto/ecdh/gost.go create mode 100644 src/crypto/tls/gost.go create mode 100644 src/crypto/tls/gost_test.go diff --git a/COPYING.GPLv3 b/COPYING.GPLv3 new file mode 100644 index 0000000000..9a2708d778 --- /dev/null +++ b/COPYING.GPLv3 @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/PUBKEY-PGP.asc b/PUBKEY-PGP.asc new file mode 100644 index 0000000000..b62b026db2 --- /dev/null +++ b/PUBKEY-PGP.asc @@ -0,0 +1,34 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBF9Qn0cBCADORW5ccCbaFTTSsBqeGoPo66RJd+rM0EOmJWPrG10ZX/3FAZlG ++5iBqmoUQexuK1+/qnD98ghTH2TCxle0BXPzirjuX/pGHJLaR62ps/2kXl8xypAt +5/78npdo7TlWMN7Y7gDgz25QzuBVPIQW8esJC+/4r/CSuj6NTPJOyhJs/osToQUQ +LAvJ0thSA61L8oVMToKQgkpatOV2X5em4naoUgMvsh2RpAcWJbp/C7tWL/q+oneN +OBoapJmv+Sy2QFNAzx1AEclhb5W3AhCJCqaF3QxAo3tWyUSrQXYwGLHDc4dAoY0U +cJcQ0QZwoyt0xTLuUfB8FXEgjsKtHLt6TqIHABEBAAG0KUdvIEdPU1QgVExTIDEu +MyA8Z29zdGxzMTNAY3lwaGVycHVua3MucnU+iQFXBBMBCgBBAhsDDAsKCQ0IDAcL +AwQBAgcVCgkICwMCBRYCAQMAAh4BAheAFiEErcm+WxmOi1aQqOxQbTz/fHba30IF +Al9QoLIACgkQbTz/fHba30JJmwgArWo/vmmy95vm48He36mv74n6dqCvPCyZkfL+ +aVNcSRX/08yiwgMznoxSBRzYnXmXyEEaE/nNE7ZJvzl8t2GibMP0nnHwhULayowR +blSPF+OVIK7OcOUdrnpyYTJqXf2JZH9hoEkur3U48JldBdAJ+qYteF9Jc181UH9i +Wv+ggHlgIt9R363ail7qUnEDNhuyqt11Kb2m7HvH1jYTXtwSbgsLvH+SCNqzWihH +9/cw1kIYgOp9Tr1SGZltpiM7o8D0p//2WIAM9F4NCi/YuqVZK/6LNEQxHIZU6jE+ +w3ee/f4dWiEO2N/n5Bbec8MfXb/3LbiX0PVx6PT+pAoWEVyNuYh1BBARCgAdFiEE +z2DomlkjHnbiY2QirhqBCeSYV+8FAl9QoMoACgkQrhqBCeSYV+/pcQD8C6VmHI8U +FRE/Qso1G0oEiry+2J9qE8N7VIbrV+njgwYA/R/kkLSkcgRLcIuQVrJPXyjx5IwX +HHSRAxR0w9sfiB9riHUEEBYKAB0WIQQSrTJonGYNQmln/XXLggVjIQetigUCYuo5 +WAAKCRDLggVjIQetisQxAQCH2OyxJf8hJwSwZ25k8abhhdlDhkoxr0nP3Tre30gc +vAD/QfX9gHKejMQRVDdnznpgaKUoyFJ7UTQO+W95hZobawe0KUdvIEdPU1QgVExT +IDEuMyA8Z29zdGxzMTNAY3lwaGVycHVua3Muc3U+iQFMBBMBCgA2FiEErcm+WxmO +i1aQqOxQbTz/fHba30IFAmaZOM4CGwMECwkKBwIiAgIVCgQWAgEAAh4HAheAAAoJ +EG08/3x22t9Cjf0H/1lFKOvXWLW/zAFD5e5GwEQjNCYAMOki2sc1r88EA/wq9uCn +w2uX3L8T8/+xV8/Tt69dNGe/p0cY3JlVwimnfE2Oo13dLoYBJnhp4azBMs5vFFIE +5HJVLFC6YL+kBQ+S+1udj3ght45rrIdlkyGTjeXk0su/y2kvRCVGZuUxL1C6rEll +UrHWvf0dyRbjGrDN1cI+2mDRMO/JwAkFcWYm7E9DV5EAiR6AxRe6icMgjcyt1CYY +2n/vsclVS6pkkWe5qho2zJaHlM81hgUvohGSV13Req7M6MBFSNEmvA2f200qJUmG +dfQySvayDbhXOzMJeMRL3u5cvZV/nHluLmQRmkOIdQQQFgoAHRYhBBKtMmicZg1C +aWf9dcuCBWMhB62KBQJmmTjiAAoJEMuCBWMhB62KZeoA/0SH5idBAg282DknLU0N +BpNUIlz+9XczurXojWkHoSmFAQCQIKI2VkHlw+aw4h69A1MngebCWpfI9MFpGera +jEg2AA== +=bi20 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/PUBKEY-SSH.pub b/PUBKEY-SSH.pub new file mode 100644 index 0000000000..959d19cc25 --- /dev/null +++ b/PUBKEY-SSH.pub @@ -0,0 +1 @@ +gostls13@cypherpunks.su ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILuX3gTqrFb3G2oW/osn3LIa7X5spo0MTsEIRLKVfJrq diff --git a/PUBKEY-SSH.pub.asc b/PUBKEY-SSH.pub.asc new file mode 100644 index 0000000000..1ba7bf7009 --- /dev/null +++ b/PUBKEY-SSH.pub.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQFMBAABCgA2FiEErcm+WxmOi1aQqOxQbTz/fHba30IFAmaZOdwYHGdvc3RsczEz +QGN5cGhlcnB1bmtzLnJ1AAoJEG08/3x22t9CTCMH/2t/MTrbxpRbX6HVikqB/mST +AN87kDl6b0yp4DKd1K/A9pVlFh7T5t9EXtdjqXjOzum4qqgaKBinYgTDw9nQS6sl +QDE7ahVOsTazkyYvq8ObNE6BK5459HOne1qFzNsNOkZ+9hIXXmTFcZ6t5jydLyHA +6Hwna6V11bpx03RHpGb49NUVHQfgWSqm97W7y4nesWjVrTuMTf9GU7vrAUwck+MN +FY3ZLUOK18noyTRhv90nsGeta/kb/q3w8njabOxn3vck+eG/Rj7qWiT2Y/UB7cgJ +dH0WRjrLFwI9cY02mG/EEE+S3oGI+tW4cYdWCRF0srz6QpwZWuk+3hS4aY1XDp8= +=1hX1 +-----END PGP SIGNATURE----- diff --git a/README b/README new file mode 100644 index 0000000000..fc871989c9 --- /dev/null +++ b/README @@ -0,0 +1,27 @@ +This is a fork of Go with: + +* crypto/x509 supporting GOST 34.10-2012 + X.509 certificates and PKCS#8 private keys +* crypto/tls supporting GOST TLS 1.3 + +GOST-related crypto/tls.SignatureSchemes are not enabled by default, +simply because it will fail native unittests. crypto/tls also does not +provide ability to control TLS 1.3 CipherSuite choice and GOST-related +suites are not enabled by default too. You can use tls.GOSTInstall() for +enabling all of that. + +Pay attention that: + +* GOST X.509 certificates uses reversed digest (relatively to native + gogost/gost3410 output) during signing, so you should use + gogost/gost3410.PrivateKeyReverseDigest crypto.Signer +* GOST TLS 1.3 uses both reversed digest and signature values, so you + should use gogost/gost3410.PrivateKeyReverseDigestAndSignature in that case +* GoGOST is quite slow, do not expect high performance + +Look at src/crypto/x509/x509_test.go and src/crypto/tls/gost_test.go +for example usage. + +./gogost-install script helps installing GoGOST directly into Go's +source code tree. Then build Go with ordinary steps. Some unittests, +related to dependency checks, will fail as expected. diff --git a/debash b/debash new file mode 100755 index 0000000000..be0ec5341d --- /dev/null +++ b/debash @@ -0,0 +1,11 @@ +#!/bin/sh +# Transform several .bash to be more-or-less compatible with /bin/sh. +# Tested on FreeBSD. + +find src -name "*.bash" -maxdepth 2 -exec perl -i -npe " + s%^#!/usr/bin/env bash%#!/bin/sh%; + s%^#!/bin/bash%#!/bin/sh%; + s%^bash %sh %; +" {} \+ +perl -i -npe "s/\[\[/[/g ; s/\]\]/]/g ; s/==/=/g" src/make.bash +perl -i -ne "print unless /NetBSD 7/../^$/" src/run.bash diff --git a/gogost-install b/gogost-install new file mode 100755 index 0000000000..bbba871ebd --- /dev/null +++ b/gogost-install @@ -0,0 +1,28 @@ +#!/bin/sh -ex + +PERL=${PERL:-perl} +command -v sha512 >/dev/null && SHA512="sha512" || SHA512="sha512sum --binary" + +TARBALL=gogost-6.0.2.tar.zst +[ -r $TARBALL ] || { + command -v fetch >/dev/null && DL="fetch -o" || DL="wget -O" + $DL $TARBALL.tmp http://www.gogost.cypherpunks.su/$TARBALL + mv $TARBALL.tmp $TARBALL +} +hsh=$($SHA512 <$TARBALL | { read hsh rem ; echo $hsh ; }) +[ "$hsh" = "25f4d46e51fc4edd0facdaab377a3938f5094f784463486192c3b6040ce576128a2539a2d6b8799cbedfd18f843832cc1d52dcb5f5994edebcb7aa788756ec16" ] +tar xf $TARBALL +mkdir -p src/crypto/go.cypherpunks.su/gogost +mv ${TARBALL%.tar.zst} src/crypto/go.cypherpunks.su/gogost/v6 +crypto_version=$(sed -n 's#^.*golang.org/x/crypto \(.*\)$#\1#p' > $fn + $PERL -i -npe '/"hash"/ and print "\t\"crypto\"\n"' $fn +done +find . -name "*.go" -exec $PERL -i -npe "s#go.cypherpunks.su#crypto/go.cypherpunks.su#" {} \+ +$PERL -i -ne "s#^(require golang.org/x/crypto) .*\$#\$1 $crypto_version#" go.mod +rm go.sum diff --git a/src/crypto/crypto.go b/src/crypto/crypto.go index 2774a6b681..722790f78c 100644 --- a/src/crypto/crypto.go +++ b/src/crypto/crypto.go @@ -60,6 +60,10 @@ func (h Hash) String() string { return "BLAKE2b-384" case BLAKE2b_512: return "BLAKE2b-512" + case GOSTR34112012256: + return "Streebog-256" + case GOSTR34112012512: + return "Streebog-512" default: return "unknown hash value " + strconv.Itoa(int(h)) } @@ -85,6 +89,8 @@ const ( BLAKE2b_256 // import golang.org/x/crypto/blake2b BLAKE2b_384 // import golang.org/x/crypto/blake2b BLAKE2b_512 // import golang.org/x/crypto/blake2b + GOSTR34112012256 // import go.cypherpunks.su/gogost/v6/gost34112012256 + GOSTR34112012512 // import go.cypherpunks.su/gogost/v6/gost34112012512 maxHash ) @@ -108,6 +114,9 @@ var digestSizes = []uint8{ BLAKE2b_256: 32, BLAKE2b_384: 48, BLAKE2b_512: 64, + + GOSTR34112012256: 32, + GOSTR34112012512: 64, } // Size returns the length, in bytes, of a digest resulting from the given hash diff --git a/src/crypto/ecdh/gost.go b/src/crypto/ecdh/gost.go new file mode 100644 index 0000000000..4a45a492f2 --- /dev/null +++ b/src/crypto/ecdh/gost.go @@ -0,0 +1,95 @@ +// Copyright (C) 2020-2025 Sergey Matveev +// Use of this source code is governed by GPLv3 licence. + +package ecdh + +import ( + "crypto/go.cypherpunks.su/gogost/v6/gost3410" + "crypto/internal/randutil" + "errors" + "io" + "math/big" +) + +type GOSTCurve struct { + curve *gost3410.Curve +} + +var gost256A = &GOSTCurve{gost3410.CurveIdtc26gost341012256paramSetA()} +var gost256B = &GOSTCurve{gost3410.CurveIdtc26gost341012256paramSetB()} +var gost256C = &GOSTCurve{gost3410.CurveIdtc26gost341012256paramSetC()} +var gost256D = &GOSTCurve{gost3410.CurveIdtc26gost341012256paramSetD()} +var gost512A = &GOSTCurve{gost3410.CurveIdtc26gost341012512paramSetA()} +var gost512B = &GOSTCurve{gost3410.CurveIdtc26gost341012512paramSetB()} +var gost512C = &GOSTCurve{gost3410.CurveIdtc26gost341012512paramSetC()} + +func GOST256A() Curve { return gost256A } +func GOST256B() Curve { return gost256B } +func GOST256C() Curve { return gost256C } +func GOST256D() Curve { return gost256D } +func GOST512A() Curve { return gost512A } +func GOST512B() Curve { return gost512B } +func GOST512C() Curve { return gost512C } + +func (c *GOSTCurve) GenerateKey(rand io.Reader) (*PrivateKey, error) { + key := make([]byte, c.curve.PointSize()) + randutil.MaybeReadByte(rand) + if _, err := io.ReadFull(rand, key); err != nil { + return nil, err + } + return c.NewPrivateKey(key) +} + +func (c *GOSTCurve) NewPrivateKey(key []byte) (*PrivateKey, error) { + if len(key) != c.curve.PointSize() { + return nil, errors.New("crypto/ecdh: invalid private key size") + } + return &PrivateKey{ + curve: c, + privateKey: append([]byte{}, key...), + }, nil +} + +func (c *GOSTCurve) privateKeyToPublicKey(key *PrivateKey) *PublicKey { + if key.curve != c { + panic("crypto/ecdh: internal error: converting the wrong key type") + } + prv, err := gost3410.NewPrivateKey(c.curve, key.privateKey) + if err != nil { + panic(err) + } + pub, err := prv.PublicKey() + if err != nil { + panic(err) + } + return &PublicKey{ + curve: key.curve, + publicKey: pub.Raw(), + } +} + +func (c *GOSTCurve) NewPublicKey(key []byte) (*PublicKey, error) { + if len(key) != c.curve.PointSize()*2 { + return nil, errors.New("crypto/ecdh: invalid public key") + } + return &PublicKey{ + curve: c, + publicKey: append([]byte{}, key...), + }, nil +} + +func (c *GOSTCurve) ecdh(local *PrivateKey, remote *PublicKey) ([]byte, error) { + our, err := gost3410.NewPrivateKey(c.curve, local.privateKey) + if err != nil { + panic(err) + } + their, err := gost3410.NewPublicKey(c.curve, remote.publicKey) + if err != nil { + panic(err) + } + key, err := our.KEK(their, big.NewInt(1)) + if err != nil { + return nil, err + } + return key[:len(key)/2], nil +} diff --git a/src/crypto/tls/auth.go b/src/crypto/tls/auth.go index 5bb202cd6a..7034c38294 100644 --- a/src/crypto/tls/auth.go +++ b/src/crypto/tls/auth.go @@ -15,6 +15,8 @@ import ( "fmt" "hash" "io" + + "crypto/go.cypherpunks.su/gogost/v6/gost3410" ) // verifyHandshakeSignature verifies a signature against pre-hashed @@ -54,6 +56,18 @@ func verifyHandshakeSignature(sigType uint8, pubkey crypto.PublicKey, hashFunc c if err := rsa.VerifyPSS(pubKey, hashFunc, signed, sig, signOpts); err != nil { return err } + case signatureGOST: + pubKey, ok := pubkey.(*gost3410.PublicKey) + if !ok { + return fmt.Errorf("expected GOST public key, got %T", pubkey) + } + ok, err := gost3410.PublicKeyReverseDigestAndSignature{Pub: pubKey}.VerifyDigest(signed, sig) + if err != nil { + return err + } + if !ok { + return errors.New("tls: GOST verification failure") + } default: return errors.New("internal error: unknown signature type") } @@ -105,6 +119,8 @@ func typeAndHashFromSignatureScheme(signatureAlgorithm SignatureScheme) (sigType sigType = signatureECDSA case Ed25519: sigType = signatureEd25519 + case GOSTR34102012256A, GOSTR34102012256B, GOSTR34102012256C, GOSTR34102012256D, GOSTR34102012512A, GOSTR34102012512B, GOSTR34102012512C: + sigType = signatureGOST default: return 0, 0, fmt.Errorf("unsupported signature algorithm: %v", signatureAlgorithm) } @@ -119,6 +135,10 @@ func typeAndHashFromSignatureScheme(signatureAlgorithm SignatureScheme) (sigType hash = crypto.SHA512 case Ed25519: hash = directSigning + case GOSTR34102012256A, GOSTR34102012256B, GOSTR34102012256C, GOSTR34102012256D: + hash = crypto.GOSTR34112012256 + case GOSTR34102012512A, GOSTR34102012512B, GOSTR34102012512C: + hash = crypto.GOSTR34112012512 default: return 0, 0, fmt.Errorf("unsupported signature algorithm: %v", signatureAlgorithm) } @@ -210,6 +230,25 @@ func signatureSchemesForCertificate(version uint16, cert *Certificate) []Signatu } case ed25519.PublicKey: sigAlgs = []SignatureScheme{Ed25519} + case *gost3410.PublicKey: + switch pub.C.Name { + case "id-tc26-gost-3410-12-256-paramSetA": + return []SignatureScheme{GOSTR34102012256A} + case "id-tc26-gost-3410-12-256-paramSetB": + return []SignatureScheme{GOSTR34102012256B} + case "id-tc26-gost-3410-12-256-paramSetC": + return []SignatureScheme{GOSTR34102012256C} + case "id-tc26-gost-3410-12-256-paramSetD": + return []SignatureScheme{GOSTR34102012256D} + case "id-tc26-gost-3410-12-512-paramSetA": + return []SignatureScheme{GOSTR34102012512A} + case "id-tc26-gost-3410-12-512-paramSetB": + return []SignatureScheme{GOSTR34102012512B} + case "id-tc26-gost-3410-12-512-paramSetC": + return []SignatureScheme{GOSTR34102012512C} + default: + return nil + } default: return nil } @@ -281,6 +320,7 @@ func unsupportedCertificateError(cert *Certificate) error { case *rsa.PublicKey: return fmt.Errorf("tls: certificate RSA key size too small for supported signature algorithms") case ed25519.PublicKey: + case *gost3410.PublicKey: default: return fmt.Errorf("tls: unsupported certificate key (%T)", pub) } diff --git a/src/crypto/tls/cipher_suites.go b/src/crypto/tls/cipher_suites.go index eebc66880d..7e46a2d4a7 100644 --- a/src/crypto/tls/cipher_suites.go +++ b/src/crypto/tls/cipher_suites.go @@ -20,6 +20,9 @@ import ( "runtime" _ "unsafe" // for linkname + "crypto/go.cypherpunks.su/gogost/v6/gost3412128" + "crypto/go.cypherpunks.su/gogost/v6/gost341264" + "golang.org/x/crypto/chacha20poly1305" ) @@ -65,6 +68,12 @@ func CipherSuites() []*CipherSuite { {TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", supportedOnlyTLS12, false}, {TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", supportedOnlyTLS12, false}, {TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", supportedOnlyTLS12, false}, + + {TLS_GOSTR341112_256_WITH_KUZNYECHIK_MGM_L, "TLS_GOSTR341112_256_WITH_KUZNYECHIK_MGM_L", supportedOnlyTLS13, false}, + {TLS_GOSTR341112_256_WITH_MAGMA_MGM_L, "TLS_GOSTR341112_256_WITH_MAGMA_MGM_L", supportedOnlyTLS13, false}, + {TLS_GOSTR341112_256_WITH_KUZNYECHIK_MGM_S, "TLS_GOSTR341112_256_WITH_KUZNYECHIK_MGM_S", supportedOnlyTLS13, false}, + {TLS_GOSTR341112_256_WITH_MAGMA_MGM_S, "TLS_GOSTR341112_256_WITH_MAGMA_MGM_S", supportedOnlyTLS13, false}, + {TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256", supportedOnlyTLS12, false}, {TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256", supportedOnlyTLS12, false}, } @@ -194,6 +203,7 @@ func selectCipherSuite(ids, supportedIDs []uint16, ok func(*cipherSuite) bool) * type cipherSuiteTLS13 struct { id uint16 keyLen int + ivLen int aead func(key, fixedNonce []byte) aead hash crypto.Hash } @@ -209,9 +219,14 @@ type cipherSuiteTLS13 struct { // //go:linkname cipherSuitesTLS13 var cipherSuitesTLS13 = []*cipherSuiteTLS13{ // TODO: replace with a map. - {TLS_AES_128_GCM_SHA256, 16, aeadAESGCMTLS13, crypto.SHA256}, - {TLS_CHACHA20_POLY1305_SHA256, 32, aeadChaCha20Poly1305, crypto.SHA256}, - {TLS_AES_256_GCM_SHA384, 32, aeadAESGCMTLS13, crypto.SHA384}, + {TLS_AES_128_GCM_SHA256, 16, aeadNonceLength, aeadAESGCMTLS13, crypto.SHA256}, + {TLS_CHACHA20_POLY1305_SHA256, 32, aeadNonceLength, aeadChaCha20Poly1305, crypto.SHA256}, + {TLS_AES_256_GCM_SHA384, 32, aeadNonceLength, aeadAESGCMTLS13, crypto.SHA384}, + + {TLS_GOSTR341112_256_WITH_KUZNYECHIK_MGM_L, 32, gost3412128.BlockSize, aeadGOSTR341112256WithKuznyechikMGML, crypto.GOSTR34112012256}, + {TLS_GOSTR341112_256_WITH_MAGMA_MGM_L, 32, gost341264.BlockSize, aeadGOSTR341112256WithMagmaMGML, crypto.GOSTR34112012256}, + {TLS_GOSTR341112_256_WITH_KUZNYECHIK_MGM_S, 32, gost3412128.BlockSize, aeadGOSTR341112256WithKuznyechikMGMS, crypto.GOSTR34112012256}, + {TLS_GOSTR341112_256_WITH_MAGMA_MGM_S, 32, gost341264.BlockSize, aeadGOSTR341112256WithMagmaMGMS, crypto.GOSTR34112012256}, } // cipherSuitesPreferenceOrder is the order in which we'll select (on the @@ -703,6 +718,11 @@ const ( TLS_AES_256_GCM_SHA384 uint16 = 0x1302 TLS_CHACHA20_POLY1305_SHA256 uint16 = 0x1303 + TLS_GOSTR341112_256_WITH_KUZNYECHIK_MGM_L uint16 = 0xC103 + TLS_GOSTR341112_256_WITH_MAGMA_MGM_L uint16 = 0xC104 + TLS_GOSTR341112_256_WITH_KUZNYECHIK_MGM_S uint16 = 0xC105 + TLS_GOSTR341112_256_WITH_MAGMA_MGM_S uint16 = 0xC106 + // TLS_FALLBACK_SCSV isn't a standard cipher suite but an indicator // that the client is doing version fallback. See RFC 7507. TLS_FALLBACK_SCSV uint16 = 0x5600 diff --git a/src/crypto/tls/common.go b/src/crypto/tls/common.go index 5fd92d3c63..7cd9288fbe 100644 --- a/src/crypto/tls/common.go +++ b/src/crypto/tls/common.go @@ -153,6 +153,14 @@ const ( // draft-tls-westerbaan-xyber768d00-03. Not exported, as support might be // removed in the future. x25519Kyber768Draft00 CurveID = 0x6399 // X25519Kyber768Draft00 + + GOSTCurve256A CurveID = 0x0022 + GOSTCurve256B CurveID = 0x0023 + GOSTCurve256C CurveID = 0x0024 + GOSTCurve256D CurveID = 0x0025 + GOSTCurve512A CurveID = 0x0026 + GOSTCurve512B CurveID = 0x0027 + GOSTCurve512C CurveID = 0x0028 ) // TLS 1.3 Key Share. See RFC 8446, Section 4.2.8. @@ -194,10 +202,11 @@ const ( // Signature algorithms (for internal signaling use). Starting at 225 to avoid overlap with // TLS 1.2 codepoints (RFC 5246, Appendix A.4.1), with which these have nothing to do. const ( - signaturePKCS1v15 uint8 = iota + 225 + signaturePKCS1v15 uint8 = iota + 224 signatureRSAPSS signatureECDSA signatureEd25519 + signatureGOST ) // directSigning is a standard Hash value that signals that no pre-hashing @@ -303,6 +312,9 @@ type ConnectionState struct { // testingOnlyCurveID is the selected CurveID, or zero if an RSA exchanges // is performed. testingOnlyCurveID CurveID + + // Exists only GOSTed version! ECDHE curve used during handshake. + HSCurve CurveID } // ExportKeyingMaterial returns length bytes of exported key material in a new @@ -404,6 +416,14 @@ const ( // Legacy signature and hash algorithms for TLS 1.2. PKCS1WithSHA1 SignatureScheme = 0x0201 ECDSAWithSHA1 SignatureScheme = 0x0203 + + GOSTR34102012256A SignatureScheme = 0x0709 + GOSTR34102012256B SignatureScheme = 0x070A + GOSTR34102012256C SignatureScheme = 0x070B + GOSTR34102012256D SignatureScheme = 0x070C + GOSTR34102012512A SignatureScheme = 0x070D + GOSTR34102012512B SignatureScheme = 0x070E + GOSTR34102012512C SignatureScheme = 0x070F ) // ClientHelloInfo contains information from a ClientHello message in order to diff --git a/src/crypto/tls/conn.go b/src/crypto/tls/conn.go index bdbc2bde41..d20f4c14b4 100644 --- a/src/crypto/tls/conn.go +++ b/src/crypto/tls/conn.go @@ -123,6 +123,8 @@ type Conn struct { activeCall atomic.Int32 tmp [16]byte + + hsCurve CurveID } // Access to net.Conn methods. @@ -1654,6 +1656,7 @@ func (c *Conn) connectionStateLocked() ConnectionState { state.ekm = c.ekm } state.ECHAccepted = c.echAccepted + state.HSCurve = c.hsCurve return state } diff --git a/src/crypto/tls/defaults.go b/src/crypto/tls/defaults.go index 9b28acdc2d..806dd3be79 100644 --- a/src/crypto/tls/defaults.go +++ b/src/crypto/tls/defaults.go @@ -15,12 +15,14 @@ import ( var tlskyber = godebug.New("tlskyber") +var defaultCurvePreferencesList = []CurveID{X25519, CurveP256, CurveP384, CurveP521} + func defaultCurvePreferences() []CurveID { if tlskyber.Value() == "0" { - return []CurveID{X25519, CurveP256, CurveP384, CurveP521} + return defaultCurvePreferencesList } // For now, x25519Kyber768Draft00 must always be followed by X25519. - return []CurveID{x25519Kyber768Draft00, X25519, CurveP256, CurveP384, CurveP521} + return append([]CurveID{x25519Kyber768Draft00}, defaultCurvePreferencesList...) } // defaultSupportedSignatureAlgorithms contains the signature and hash algorithms that diff --git a/src/crypto/tls/gost.go b/src/crypto/tls/gost.go new file mode 100644 index 0000000000..a23c21d9ea --- /dev/null +++ b/src/crypto/tls/gost.go @@ -0,0 +1,191 @@ +// Copyright (C) 2020-2025 Sergey Matveev +// Use of this source code is governed by GPLv3 licence. + +package tls + +import ( + "crypto/cipher" + "encoding/binary" + + "crypto/go.cypherpunks.su/gogost/v6/gost34112012256" + "crypto/go.cypherpunks.su/gogost/v6/gost3412128" + "crypto/go.cypherpunks.su/gogost/v6/gost341264" + "crypto/go.cypherpunks.su/gogost/v6/mgm" +) + +const GOSTAEADNonceSize = 8 + +type gostAEAD struct { + nonceMask []byte + tlsTree *gost34112012256.TLSTree + cipherer func([]byte) cipher.Block + aead cipher.AEAD +} + +func (g *gostAEAD) NonceSize() int { return GOSTAEADNonceSize } +func (g *gostAEAD) Overhead() int { return g.aead.Overhead() } +func (g *gostAEAD) explicitNonceLen() int { return 0 } + +func (g *gostAEAD) keyRefresh(nonce []byte) { + if len(nonce) != GOSTAEADNonceSize { + panic("64-bit nonce expected") + } + seqNum := binary.BigEndian.Uint64(nonce) + key, cached := g.tlsTree.DeriveCached(seqNum) + if cached { + return + } + cipher := g.cipherer(key) + aead, err := mgm.NewMGM(cipher, cipher.BlockSize()) + if err != nil { + panic(err) + } + g.aead = aead +} + +func (g *gostAEAD) xorNonce(nonce []byte) { + for i, b := range nonce { + g.nonceMask[len(g.nonceMask)-GOSTAEADNonceSize+i] ^= b + } +} + +func (g *gostAEAD) Seal(out, nonce, plaintext, additionalData []byte) []byte { + g.keyRefresh(nonce) + g.xorNonce(nonce) + ret := g.aead.Seal(out, g.nonceMask[:], plaintext, additionalData) + g.xorNonce(nonce) + return ret +} + +func (g *gostAEAD) Open(out, nonce, ciphertext, additionalData []byte) ([]byte, error) { + g.keyRefresh(nonce) + g.xorNonce(nonce) + ret, err := g.aead.Open(out, g.nonceMask[:], ciphertext, additionalData) + g.xorNonce(nonce) + return ret, err +} + +func aeadGOST( + blockSize int, + tlsTreeParams gost34112012256.TLSTreeParams, + cipherer func(key []byte) cipher.Block, + key, nonceMask []byte, +) aead { + if len(nonceMask) != blockSize { + panic("tls: internal error: wrong nonce length") + } + ret := gostAEAD{ + nonceMask: make([]byte, blockSize), + tlsTree: gost34112012256.NewTLSTree(tlsTreeParams, key), + cipherer: cipherer, + } + copy(ret.nonceMask, nonceMask) + ret.nonceMask[0] &= 0x7F + ret.keyRefresh([]byte{0, 0, 0, 0, 0, 0, 0, 0}) + return &ret +} + +func aeadGOSTR341112256WithKuznyechikMGML(key, nonceMask []byte) aead { + return aeadGOST( + gost3412128.BlockSize, + gost34112012256.TLSGOSTR341112256WithKuznyechikMGML, + func(key []byte) cipher.Block { return gost3412128.NewCipher(key) }, + key, nonceMask, + ) +} + +func aeadGOSTR341112256WithMagmaMGML(key, nonceMask []byte) aead { + return aeadGOST( + gost341264.BlockSize, + gost34112012256.TLSGOSTR341112256WithMagmaMGML, + func(key []byte) cipher.Block { return gost341264.NewCipher(key) }, + key, nonceMask, + ) +} + +func aeadGOSTR341112256WithKuznyechikMGMS(key, nonceMask []byte) aead { + return aeadGOST( + gost3412128.BlockSize, + gost34112012256.TLSGOSTR341112256WithKuznyechikMGMS, + func(key []byte) cipher.Block { return gost3412128.NewCipher(key) }, + key, nonceMask, + ) +} + +func aeadGOSTR341112256WithMagmaMGMS(key, nonceMask []byte) aead { + return aeadGOST( + gost341264.BlockSize, + gost34112012256.TLSGOSTR341112256WithMagmaMGMS, + func(key []byte) cipher.Block { return gost341264.NewCipher(key) }, + key, nonceMask, + ) +} + +var ( + gostSavedDefaultSignatureAlgorithms []SignatureScheme + gostSavedDefaultCipherSuites []uint16 + gostSavedDefaultCipherSuitesNoAES []uint16 + gostSavedCipherSuitesPreferenceOrder []uint16 + gostSavedCipherSuitesPreferenceOrderNoAES []uint16 + gostSavedDefaultCurvePreferences []CurveID +) + +func GOSTInstallSignatureAlgorithms(sigs []SignatureScheme) { + if gostSavedDefaultSignatureAlgorithms == nil { + gostSavedDefaultSignatureAlgorithms = defaultSupportedSignatureAlgorithms + } + defaultSupportedSignatureAlgorithms = append(sigs, gostSavedDefaultSignatureAlgorithms...) +} + +func GOSTInstallCipherSuites(suites []uint16) { + if gostSavedDefaultCipherSuites == nil { + gostSavedDefaultCipherSuites = defaultCipherSuitesTLS13 + } + if gostSavedDefaultCipherSuitesNoAES == nil { + gostSavedDefaultCipherSuitesNoAES = defaultCipherSuitesTLS13NoAES + } + if gostSavedCipherSuitesPreferenceOrder == nil { + gostSavedCipherSuitesPreferenceOrder = cipherSuitesPreferenceOrder + } + if gostSavedCipherSuitesPreferenceOrderNoAES == nil { + gostSavedCipherSuitesPreferenceOrderNoAES = cipherSuitesPreferenceOrderNoAES + } + defaultCipherSuitesTLS13 = append(suites, gostSavedDefaultCipherSuites...) + defaultCipherSuitesTLS13NoAES = append(suites, gostSavedDefaultCipherSuitesNoAES...) + cipherSuitesPreferenceOrder = append(suites, gostSavedCipherSuitesPreferenceOrder...) + cipherSuitesPreferenceOrderNoAES = append(suites, gostSavedCipherSuitesPreferenceOrderNoAES...) +} + +func GOSTInstallCurvePreferences(curves []CurveID) { + if gostSavedDefaultCurvePreferences == nil { + gostSavedDefaultCurvePreferences = defaultCurvePreferencesList + } + defaultCurvePreferencesList = append(defaultCurvePreferencesList, curves...) +} + +func GOSTInstall() { + GOSTInstallSignatureAlgorithms([]SignatureScheme{ + GOSTR34102012256A, + GOSTR34102012256B, + GOSTR34102012256C, + GOSTR34102012256D, + GOSTR34102012512A, + GOSTR34102012512B, + GOSTR34102012512C, + }) + GOSTInstallCipherSuites([]uint16{ + TLS_GOSTR341112_256_WITH_KUZNYECHIK_MGM_L, + TLS_GOSTR341112_256_WITH_MAGMA_MGM_L, + TLS_GOSTR341112_256_WITH_KUZNYECHIK_MGM_S, + TLS_GOSTR341112_256_WITH_MAGMA_MGM_S, + }) + GOSTInstallCurvePreferences([]CurveID{ + GOSTCurve256A, + GOSTCurve256B, + GOSTCurve256C, + GOSTCurve256D, + GOSTCurve512C, // Edwards is more preferable, yes + GOSTCurve512A, + GOSTCurve512B, + }) +} diff --git a/src/crypto/tls/gost_test.go b/src/crypto/tls/gost_test.go new file mode 100644 index 0000000000..30411ff0b8 --- /dev/null +++ b/src/crypto/tls/gost_test.go @@ -0,0 +1,174 @@ +// Copyright (C) 2020-2025 Sergey Matveev +// Use of this source code is governed by GPLv3 licence. + +package tls + +import ( + "crypto" + "crypto/rand" + "crypto/x509" + "crypto/x509/pkix" + "io" + "math/big" + "testing" + "time" + + "crypto/go.cypherpunks.su/gogost/v6/gost3410" +) + +func gostCertGen( + t *testing.T, + commonName string, + curve *gost3410.Curve, + sigAlgo x509.SignatureAlgorithm, +) (*x509.Certificate, []byte, crypto.PrivateKey, []byte) { + prvRaw := make([]byte, curve.PointSize()) + if _, err := io.ReadFull(rand.Reader, prvRaw); err != nil { + t.Fatal("can not read PrivateKey random", err) + } + prv, err := gost3410.NewPrivateKey(curve, prvRaw) + if err != nil { + t.Fatal("can not generate PrivateKey", err) + } + pub, err := prv.PublicKey() + if err != nil { + t.Fatal("can not generate PublicKey", err) + } + template := x509.Certificate{ + SerialNumber: big.NewInt(12345), + Subject: pkix.Name{CommonName: commonName}, + DNSNames: []string{commonName}, + NotBefore: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), + NotAfter: time.Date(2030, 1, 1, 0, 0, 0, 0, time.UTC), + SignatureAlgorithm: sigAlgo, + } + certDer, err := x509.CreateCertificate( + rand.Reader, + &template, &template, + pub, &gost3410.PrivateKeyReverseDigest{Prv: prv}, + ) + if err != nil { + t.Fatal("can not generate certificate", err) + } + cert, err := x509.ParseCertificate(certDer) + if err != nil { + t.Fatal("can not parse generated certificate", err) + } + return cert, certDer, &gost3410.PrivateKeyReverseDigestAndSignature{Prv: prv}, prvRaw +} + +func gostTLS13Handshake( + t *testing.T, + serverCurve, clientCurve *gost3410.Curve, + curveID CurveID, + cipherSuite uint16, +) { + serverName := "server.gost.example.com" + serverCert, serverCertDer, serverPrv, _ := gostCertGen( + t, serverName, serverCurve, x509.GOST256, + ) + clientCert, clientCertDer, clientPrv, _ := gostCertGen( + t, "client.gost.example.com", clientCurve, x509.GOST512, + ) + serverCAs := x509.NewCertPool() + serverCAs.AddCert(serverCert) + clientCAs := x509.NewCertPool() + clientCAs.AddCert(clientCert) + defaultCipherSuitesTLS13 = []uint16{cipherSuite} + defaultCipherSuitesTLS13NoAES = []uint16{cipherSuite} + serverConfig := &Config{ + MinVersion: VersionTLS13, + MaxVersion: VersionTLS13, + CurvePreferences: []CurveID{curveID}, + ClientAuth: RequireAndVerifyClientCert, + ClientCAs: clientCAs, + Certificates: []Certificate{{ + Certificate: [][]byte{serverCertDer}, + PrivateKey: serverPrv, + }}, + } + clientConfig := &Config{ + MinVersion: VersionTLS13, + MaxVersion: VersionTLS13, + CurvePreferences: []CurveID{curveID}, + RootCAs: serverCAs, + ServerName: serverName, + Certificates: []Certificate{{ + Certificate: [][]byte{clientCertDer}, + PrivateKey: clientPrv, + }}, + } + clientState, serverState, err := testHandshake(t, clientConfig, serverConfig) + if err != nil { + t.Fatal("handshake failed:", err) + } + if clientState.Version != VersionTLS13 || serverState.Version != VersionTLS13 { + t.Fatal("TLS 1.3 was not established") + } + if clientState.CipherSuite != cipherSuite || serverState.CipherSuite != cipherSuite { + t.Fatal("expected CipherSuite was not established") + } +} + +func TestGOSTTLS13AllParams(t *testing.T) { + defaultSupportedSignatureAlgorithmsOrig := defaultSupportedSignatureAlgorithms + defaultCipherSuitesTLS13Orig := defaultCipherSuitesTLS13 + defaultCipherSuitesTLS13NoAESOrig := defaultCipherSuitesTLS13NoAES + defer func() { + defaultSupportedSignatureAlgorithms = defaultSupportedSignatureAlgorithmsOrig + defaultCipherSuitesTLS13 = defaultCipherSuitesTLS13Orig + defaultCipherSuitesTLS13NoAES = defaultCipherSuitesTLS13NoAESOrig + }() + defaultSupportedSignatureAlgorithms = append(defaultSupportedSignatureAlgorithms, []SignatureScheme{ + GOSTR34102012256A, GOSTR34102012256B, GOSTR34102012256C, GOSTR34102012256D, + GOSTR34102012512A, GOSTR34102012512B, GOSTR34102012512C, + }...) + for _, serverCurve := range []*gost3410.Curve{ + gost3410.CurveIdtc26gost341012256paramSetA(), + gost3410.CurveIdtc26gost341012256paramSetB(), + gost3410.CurveIdtc26gost341012256paramSetC(), + gost3410.CurveIdtc26gost341012256paramSetD(), + } { + t.Log("server certificate:", serverCurve.Name) + for _, clientCurve := range []*gost3410.Curve{ + gost3410.CurveIdtc26gost341012512paramSetA(), + gost3410.CurveIdtc26gost341012512paramSetB(), + gost3410.CurveIdtc26gost341012512paramSetC(), + } { + t.Log("client certificate:", clientCurve.Name) + for _, curveID := range []CurveID{ + GOSTCurve256A, GOSTCurve256B, GOSTCurve256C, GOSTCurve256D, + GOSTCurve512A, GOSTCurve512B, GOSTCurve512C, + } { + t.Log("ECDHE:", curveID) + for _, cipherSuite := range []uint16{ + TLS_GOSTR341112_256_WITH_KUZNYECHIK_MGM_L, + TLS_GOSTR341112_256_WITH_MAGMA_MGM_L, + TLS_GOSTR341112_256_WITH_KUZNYECHIK_MGM_S, + TLS_GOSTR341112_256_WITH_MAGMA_MGM_S, + } { + t.Log("CipherSuite:", cipherSuite) + gostTLS13Handshake(t, serverCurve, clientCurve, curveID, cipherSuite) + } + } + } + } +} + +func TestGOSTTLS13Installation(t *testing.T) { + defer func() { + defaultSupportedSignatureAlgorithms = gostSavedDefaultSignatureAlgorithms + defaultCipherSuitesTLS13 = gostSavedDefaultCipherSuites + defaultCipherSuitesTLS13NoAES = gostSavedDefaultCipherSuitesNoAES + cipherSuitesPreferenceOrder = gostSavedCipherSuitesPreferenceOrder + cipherSuitesPreferenceOrderNoAES = gostSavedCipherSuitesPreferenceOrderNoAES + }() + GOSTInstall() + gostTLS13Handshake( + t, + gost3410.CurveIdtc26gost341012256paramSetA(), + gost3410.CurveIdtc26gost341012512paramSetC(), + GOSTCurve256A, + TLS_GOSTR341112_256_WITH_KUZNYECHIK_MGM_L, + ) +} diff --git a/src/crypto/tls/handshake_client.go b/src/crypto/tls/handshake_client.go index 5025657590..4208073e02 100644 --- a/src/crypto/tls/handshake_client.go +++ b/src/crypto/tls/handshake_client.go @@ -25,6 +25,8 @@ import ( "strconv" "strings" "time" + + "crypto/go.cypherpunks.su/gogost/v6/gost3410" ) type clientHandshakeState struct { @@ -1133,7 +1135,7 @@ func (c *Conn) verifyServerCertificate(certificates [][]byte) error { } switch certs[0].PublicKey.(type) { - case *rsa.PublicKey, *ecdsa.PublicKey, ed25519.PublicKey: + case *rsa.PublicKey, *ecdsa.PublicKey, ed25519.PublicKey, *gost3410.PublicKey: break default: c.sendAlert(alertUnsupportedCertificate) diff --git a/src/crypto/tls/handshake_client_tls13.go b/src/crypto/tls/handshake_client_tls13.go index db5e35d9a4..864e90d8bc 100644 --- a/src/crypto/tls/handshake_client_tls13.go +++ b/src/crypto/tls/handshake_client_tls13.go @@ -341,6 +341,7 @@ func (hs *clientHandshakeStateTLS13) processHelloRetryRequest() error { } hs.keyShareKeys = &keySharePrivateKeys{curveID: curveID, ecdhe: key} hello.keyShares = []keyShare{{group: curveID, data: key.PublicKey().Bytes()}} + c.hsCurve = curveID } if len(hello.pskIdentities) > 0 { @@ -445,6 +446,8 @@ func (hs *clientHandshakeStateTLS13) processServerHello() error { }) { c.sendAlert(alertIllegalParameter) return errors.New("tls: server selected unsupported group") + } else { + c.hsCurve = hs.serverHello.selectedGroup } if !hs.serverHello.selectedIdentityPresent { diff --git a/src/crypto/tls/handshake_server.go b/src/crypto/tls/handshake_server.go index ac3d915d17..36b5c0f74f 100644 --- a/src/crypto/tls/handshake_server.go +++ b/src/crypto/tls/handshake_server.go @@ -18,6 +18,8 @@ import ( "internal/byteorder" "io" "time" + + "crypto/go.cypherpunks.su/gogost/v6/gost3410" ) // serverHandshakeState contains details of a server handshake in progress. @@ -267,6 +269,8 @@ func (hs *serverHandshakeState) processClientHello() error { hs.ecSignOk = true case *rsa.PublicKey: hs.rsaSignOk = true + case *gost3410.PublicKey: + hs.ecSignOk = true default: c.sendAlert(alertInternalError) return fmt.Errorf("tls: unsupported signing key type (%T)", priv.Public()) @@ -932,7 +936,7 @@ func (c *Conn) processCertsFromClient(certificate Certificate) error { if len(certs) > 0 { switch certs[0].PublicKey.(type) { - case *ecdsa.PublicKey, *rsa.PublicKey, ed25519.PublicKey: + case *ecdsa.PublicKey, *rsa.PublicKey, ed25519.PublicKey, *gost3410.PublicKey: default: c.sendAlert(alertUnsupportedCertificate) return fmt.Errorf("tls: client certificate contains an unsupported public key of type %T", certs[0].PublicKey) diff --git a/src/crypto/tls/handshake_server_tls13.go b/src/crypto/tls/handshake_server_tls13.go index 503a732e05..ebce0705ef 100644 --- a/src/crypto/tls/handshake_server_tls13.go +++ b/src/crypto/tls/handshake_server_tls13.go @@ -288,6 +288,7 @@ func (hs *serverHandshakeStateTLS13) processClientHello() error { } c.serverName = hs.clientHello.serverName + c.hsCurve = selectedGroup return nil } diff --git a/src/crypto/tls/key_schedule.go b/src/crypto/tls/key_schedule.go index 1636baf79e..f980e4b43a 100644 --- a/src/crypto/tls/key_schedule.go +++ b/src/crypto/tls/key_schedule.go @@ -93,7 +93,7 @@ func (c *cipherSuiteTLS13) nextTrafficSecret(trafficSecret []byte) []byte { // trafficKey generates traffic keys according to RFC 8446, Section 7.3. func (c *cipherSuiteTLS13) trafficKey(trafficSecret []byte) (key, iv []byte) { key = c.expandLabel(trafficSecret, "key", nil, c.keyLen) - iv = c.expandLabel(trafficSecret, "iv", nil, aeadNonceLength) + iv = c.expandLabel(trafficSecret, "iv", nil, c.ivLen) return } @@ -179,6 +179,20 @@ func curveForCurveID(id CurveID) (ecdh.Curve, bool) { return ecdh.P384(), true case CurveP521: return ecdh.P521(), true + case GOSTCurve256A: + return ecdh.GOST256A(), true + case GOSTCurve256B: + return ecdh.GOST256B(), true + case GOSTCurve256C: + return ecdh.GOST256C(), true + case GOSTCurve256D: + return ecdh.GOST256D(), true + case GOSTCurve512A: + return ecdh.GOST512A(), true + case GOSTCurve512B: + return ecdh.GOST512B(), true + case GOSTCurve512C: + return ecdh.GOST512C(), true default: return nil, false } @@ -194,6 +208,20 @@ func curveIDForCurve(curve ecdh.Curve) (CurveID, bool) { return CurveP384, true case ecdh.P521(): return CurveP521, true + case ecdh.GOST256A(): + return GOSTCurve256A, true + case ecdh.GOST256B(): + return GOSTCurve256B, true + case ecdh.GOST256C(): + return GOSTCurve256C, true + case ecdh.GOST256D(): + return GOSTCurve256D, true + case ecdh.GOST512A(): + return GOSTCurve512A, true + case ecdh.GOST512B(): + return GOSTCurve512B, true + case ecdh.GOST512C(): + return GOSTCurve512C, true default: return 0, false } diff --git a/src/crypto/tls/tls.go b/src/crypto/tls/tls.go index f3089f0ed6..c7b068af78 100644 --- a/src/crypto/tls/tls.go +++ b/src/crypto/tls/tls.go @@ -26,6 +26,8 @@ import ( "net" "os" "strings" + + "crypto/go.cypherpunks.su/gogost/v6/gost3410" ) // Server returns a new TLS server side connection @@ -342,6 +344,15 @@ func X509KeyPair(certPEMBlock, keyPEMBlock []byte) (Certificate, error) { if !bytes.Equal(priv.Public().(ed25519.PublicKey), pub) { return fail(errors.New("tls: private key does not match public key")) } + case *gost3410.PublicKey: + priv, ok := cert.PrivateKey.(*gost3410.PrivateKey) + if !ok { + return fail(errors.New("tls: private key type does not match public key type")) + } + if !priv.Public().(*gost3410.PublicKey).Equal(pub) { + return fail(errors.New("tls: private key does not match public key")) + } + cert.PrivateKey = &gost3410.PrivateKeyReverseDigestAndSignature{Prv: priv} default: return fail(errors.New("tls: unknown public key algorithm")) } @@ -358,7 +369,7 @@ func parsePrivateKey(der []byte) (crypto.PrivateKey, error) { } if key, err := x509.ParsePKCS8PrivateKey(der); err == nil { switch key := key.(type) { - case *rsa.PrivateKey, *ecdsa.PrivateKey, ed25519.PrivateKey: + case *rsa.PrivateKey, *ecdsa.PrivateKey, ed25519.PrivateKey, *gost3410.PrivateKey: return key, nil default: return nil, errors.New("tls: found unknown private key type in PKCS#8 wrapping") diff --git a/src/crypto/x509/parser.go b/src/crypto/x509/parser.go index 3ba5f6a4e1..2dfe221c7d 100644 --- a/src/crypto/x509/parser.go +++ b/src/crypto/x509/parser.go @@ -26,6 +26,8 @@ import ( "unicode/utf16" "unicode/utf8" + "crypto/go.cypherpunks.su/gogost/v6/gost3410" + "golang.org/x/crypto/cryptobyte" cryptobyte_asn1 "golang.org/x/crypto/cryptobyte/asn1" ) @@ -215,6 +217,11 @@ func parseExtension(der cryptobyte.String) (pkix.Extension, error) { return ext, nil } +type GostR341012PublicKeyParameters struct { + PublicKeyParamSet asn1.ObjectIdentifier + DigestParamSet asn1.ObjectIdentifier `asn1:"optional"` +} + func parsePublicKey(keyData *publicKeyInfo) (any, error) { oid := keyData.Algorithm.Algorithm params := keyData.Algorithm.Parameters @@ -312,6 +319,53 @@ func parsePublicKey(keyData *publicKeyInfo) (any, error) { return nil, errors.New("x509: zero or negative DSA parameter") } return pub, nil + case oid.Equal(oidTc26Gost341012256): + fallthrough + case oid.Equal(oidTc26Gost341012512): + paramsData := keyData.Algorithm.Parameters.FullBytes + var publicKeyParams GostR341012PublicKeyParameters + rest, err := asn1.Unmarshal(paramsData, &publicKeyParams) + if err != nil { + return nil, errors.New("x509: failed to parse GOST parameters") + } + if len(rest) != 0 { + return nil, errors.New("x509: trailing data after GOST parameters") + } + var pubRaw []byte + s := cryptobyte.String(der) + if !s.ReadASN1Bytes(&pubRaw, cryptobyte_asn1.OCTET_STRING) { + return nil, errors.New("x509: can not decode GOST public key") + } + var curve *gost3410.Curve + switch { + case publicKeyParams.PublicKeyParamSet.Equal(oidGostR34102001CryptoProAParamSet): + curve = gost3410.CurveIdGostR34102001CryptoProAParamSet() + case publicKeyParams.PublicKeyParamSet.Equal(oidGostR34102001CryptoProBParamSet): + curve = gost3410.CurveIdGostR34102001CryptoProBParamSet() + case publicKeyParams.PublicKeyParamSet.Equal(oidGostR34102001CryptoProCParamSet): + curve = gost3410.CurveIdGostR34102001CryptoProCParamSet() + case publicKeyParams.PublicKeyParamSet.Equal(oidGostR34102001CryptoProXchAParamSet): + curve = gost3410.CurveIdGostR34102001CryptoProXchAParamSet() + case publicKeyParams.PublicKeyParamSet.Equal(oidGostR34102001CryptoProXchBParamSet): + curve = gost3410.CurveIdGostR34102001CryptoProXchBParamSet() + case publicKeyParams.PublicKeyParamSet.Equal(oidTc26Gost341012256ParamSetA): + curve = gost3410.CurveIdtc26gost341012256paramSetA() + case publicKeyParams.PublicKeyParamSet.Equal(oidTc26Gost341012256ParamSetB): + curve = gost3410.CurveIdtc26gost341012256paramSetB() + case publicKeyParams.PublicKeyParamSet.Equal(oidTc26Gost341012256ParamSetC): + curve = gost3410.CurveIdtc26gost341012256paramSetC() + case publicKeyParams.PublicKeyParamSet.Equal(oidTc26Gost341012256ParamSetD): + curve = gost3410.CurveIdtc26gost341012256paramSetD() + case publicKeyParams.PublicKeyParamSet.Equal(oidTc26Gost341012512ParamSetA): + curve = gost3410.CurveIdtc26gost341012512paramSetA() + case publicKeyParams.PublicKeyParamSet.Equal(oidTc26Gost341012512ParamSetB): + curve = gost3410.CurveIdtc26gost341012512paramSetB() + case publicKeyParams.PublicKeyParamSet.Equal(oidTc26Gost341012512ParamSetC): + curve = gost3410.CurveIdtc26gost341012512paramSetC() + default: + return nil, errors.New("x509: unknown GOST curve") + } + return gost3410.NewPublicKey(curve, pubRaw) default: return nil, errors.New("x509: unknown public key algorithm") } diff --git a/src/crypto/x509/pkcs8.go b/src/crypto/x509/pkcs8.go index 08e9da404c..7af008a7dc 100644 --- a/src/crypto/x509/pkcs8.go +++ b/src/crypto/x509/pkcs8.go @@ -13,6 +13,11 @@ import ( "encoding/asn1" "errors" "fmt" + + "golang.org/x/crypto/cryptobyte" + cryptobyte_asn1 "golang.org/x/crypto/cryptobyte/asn1" + + "crypto/go.cypherpunks.su/gogost/v6/gost3410" ) // pkcs8 reflects an ASN.1, PKCS #8 PrivateKey. See @@ -85,6 +90,37 @@ func ParsePKCS8PrivateKey(der []byte) (key any, err error) { return nil, fmt.Errorf("x509: invalid X25519 private key: %v", err) } return ecdh.X25519().NewPrivateKey(curvePrivateKey) + case privKey.Algo.Algorithm.Equal(oidTc26Gost341012256): + fallthrough + case privKey.Algo.Algorithm.Equal(oidTc26Gost341012512): + bytes := privKey.Algo.Parameters.FullBytes + var params GostR341012PublicKeyParameters + if _, err := asn1.Unmarshal(bytes, ¶ms); err != nil { + return nil, err + } + var curve *gost3410.Curve + switch { + case params.PublicKeyParamSet.Equal(oidTc26Gost341012256ParamSetA): + curve = gost3410.CurveIdtc26gost341012256paramSetA() + case params.PublicKeyParamSet.Equal(oidTc26Gost341012256ParamSetB): + curve = gost3410.CurveIdtc26gost341012256paramSetB() + case params.PublicKeyParamSet.Equal(oidTc26Gost341012256ParamSetC): + curve = gost3410.CurveIdtc26gost341012256paramSetC() + case params.PublicKeyParamSet.Equal(oidTc26Gost341012256ParamSetD): + curve = gost3410.CurveIdtc26gost341012256paramSetD() + case params.PublicKeyParamSet.Equal(oidTc26Gost341012512ParamSetA): + curve = gost3410.CurveIdtc26gost341012512paramSetA() + case params.PublicKeyParamSet.Equal(oidTc26Gost341012512ParamSetB): + curve = gost3410.CurveIdtc26gost341012512paramSetB() + case params.PublicKeyParamSet.Equal(oidTc26Gost341012512ParamSetC): + curve = gost3410.CurveIdtc26gost341012512paramSetC() + } + var keyRaw []byte + s := cryptobyte.String(privKey.PrivateKey) + if !s.ReadASN1Bytes(&keyRaw, cryptobyte_asn1.OCTET_STRING) { + return nil, errors.New("x509: can not decode GOST private key") + } + return gost3410.NewPrivateKey(curve, keyRaw) default: return nil, fmt.Errorf("x509: PKCS#8 wrapping contained private key with unknown algorithm: %v", privKey.Algo.Algorithm) @@ -94,7 +130,8 @@ func ParsePKCS8PrivateKey(der []byte) (key any, err error) { // MarshalPKCS8PrivateKey converts a private key to PKCS #8, ASN.1 DER form. // // The following key types are currently supported: *[rsa.PrivateKey], -// *[ecdsa.PrivateKey], [ed25519.PrivateKey] (not a pointer), and *[ecdh.PrivateKey]. +// *[ecdsa.PrivateKey], [ed25519.PrivateKey] (not a pointer), GOST R 34.10-2012 +// and *[ecdh.PrivateKey]. // Unsupported key types result in an error. // // This kind of key is commonly encoded in PEM blocks of type "PRIVATE KEY". @@ -166,6 +203,42 @@ func MarshalPKCS8PrivateKey(key any) ([]byte, error) { return nil, errors.New("x509: failed to marshal EC private key while building PKCS#8: " + err.Error()) } } + case *gost3410.PrivateKey: + params := GostR341012PublicKeyParameters{} + switch k.C.Name { + case "id-tc26-gost-3410-12-256-paramSetA": + privKey.Algo.Algorithm = oidTc26Gost341012256 + params.PublicKeyParamSet = oidTc26Gost341012256ParamSetA + case "id-tc26-gost-3410-12-256-paramSetB": + privKey.Algo.Algorithm = oidTc26Gost341012256 + params.PublicKeyParamSet = oidTc26Gost341012256ParamSetB + case "id-tc26-gost-3410-12-256-paramSetC": + privKey.Algo.Algorithm = oidTc26Gost341012256 + params.PublicKeyParamSet = oidTc26Gost341012256ParamSetC + case "id-tc26-gost-3410-12-256-paramSetD": + privKey.Algo.Algorithm = oidTc26Gost341012256 + params.PublicKeyParamSet = oidTc26Gost341012256ParamSetD + case "id-tc26-gost-3410-12-512-paramSetA": + privKey.Algo.Algorithm = oidTc26Gost341012512 + params.PublicKeyParamSet = oidTc26Gost341012512ParamSetA + case "id-tc26-gost-3410-12-512-paramSetB": + privKey.Algo.Algorithm = oidTc26Gost341012512 + params.PublicKeyParamSet = oidTc26Gost341012512ParamSetB + case "id-tc26-gost-3410-12-512-paramSetC": + privKey.Algo.Algorithm = oidTc26Gost341012512 + params.PublicKeyParamSet = oidTc26Gost341012512ParamSetC + } + var err error + privKey.Algo.Parameters.FullBytes, err = asn1.Marshal(params) + if err != nil { + return nil, err + } + builder := cryptobyte.NewBuilder(nil) + builder.AddASN1OctetString(k.Raw()) + privKey.PrivateKey, err = builder.Bytes() + if err != nil { + return nil, err + } default: return nil, fmt.Errorf("x509: unknown key type while marshaling PKCS#8: %T", key) diff --git a/src/crypto/x509/x509.go b/src/crypto/x509/x509.go index 50433058f7..50e42f4eea 100644 --- a/src/crypto/x509/x509.go +++ b/src/crypto/x509/x509.go @@ -49,6 +49,7 @@ import ( _ "crypto/sha256" _ "crypto/sha512" + "crypto/go.cypherpunks.su/gogost/v6/gost3410" "golang.org/x/crypto/cryptobyte" cryptobyte_asn1 "golang.org/x/crypto/cryptobyte/asn1" ) @@ -131,6 +132,63 @@ func marshalPublicKey(pub any) (publicKeyBytes []byte, publicKeyAlgorithm pkix.A } publicKeyAlgorithm.Parameters.FullBytes = paramBytes } + case *gost3410.PublicKey: + builder := cryptobyte.NewBuilder(nil) + builder.AddASN1OctetString(pub.Raw()) + publicKeyBytes, err = builder.Bytes() + if err != nil { + return + } + params := GostR341012PublicKeyParameters{} + switch pub.C.Name { + case "id-GostR3410-2001-CryptoPro-A-ParamSet": + publicKeyAlgorithm.Algorithm = oidTc26Gost341012256 + params.PublicKeyParamSet = oidGostR34102001CryptoProAParamSet + params.DigestParamSet = oidTc26Gost34112012256 + case "id-GostR3410-2001-CryptoPro-B-ParamSet": + publicKeyAlgorithm.Algorithm = oidTc26Gost341012256 + params.PublicKeyParamSet = oidGostR34102001CryptoProBParamSet + params.DigestParamSet = oidTc26Gost34112012256 + case "id-GostR3410-2001-CryptoPro-C-ParamSet": + publicKeyAlgorithm.Algorithm = oidTc26Gost341012256 + params.PublicKeyParamSet = oidGostR34102001CryptoProCParamSet + params.DigestParamSet = oidTc26Gost34112012256 + case "id-GostR3410-2001-CryptoPro-XchA-ParamSet": + publicKeyAlgorithm.Algorithm = oidTc26Gost341012256 + params.PublicKeyParamSet = oidGostR34102001CryptoProXchAParamSet + params.DigestParamSet = oidTc26Gost34112012256 + case "id-GostR3410-2001-CryptoPro-XchB-ParamSet": + publicKeyAlgorithm.Algorithm = oidTc26Gost341012256 + params.PublicKeyParamSet = oidGostR34102001CryptoProXchBParamSet + params.DigestParamSet = oidTc26Gost34112012256 + case "id-tc26-gost-3410-12-256-paramSetA": + publicKeyAlgorithm.Algorithm = oidTc26Gost341012256 + params.PublicKeyParamSet = oidTc26Gost341012256ParamSetA + case "id-tc26-gost-3410-12-256-paramSetB": + publicKeyAlgorithm.Algorithm = oidTc26Gost341012256 + params.PublicKeyParamSet = oidTc26Gost341012256ParamSetB + case "id-tc26-gost-3410-12-256-paramSetC": + publicKeyAlgorithm.Algorithm = oidTc26Gost341012256 + params.PublicKeyParamSet = oidTc26Gost341012256ParamSetC + case "id-tc26-gost-3410-12-256-paramSetD": + publicKeyAlgorithm.Algorithm = oidTc26Gost341012256 + params.PublicKeyParamSet = oidTc26Gost341012256ParamSetD + case "id-tc26-gost-3410-12-512-paramSetA": + publicKeyAlgorithm.Algorithm = oidTc26Gost341012512 + params.PublicKeyParamSet = oidTc26Gost341012512ParamSetA + case "id-tc26-gost-3410-12-512-paramSetB": + publicKeyAlgorithm.Algorithm = oidTc26Gost341012512 + params.PublicKeyParamSet = oidTc26Gost341012512ParamSetB + case "id-tc26-gost-3410-12-512-paramSetC": + publicKeyAlgorithm.Algorithm = oidTc26Gost341012512 + params.PublicKeyParamSet = oidTc26Gost341012512ParamSetC + default: + return nil, pkix.AlgorithmIdentifier{}, errors.New("x509: unsupported GOST elliptic curve") + } + publicKeyAlgorithm.Parameters.FullBytes, err = asn1.Marshal(params) + if err != nil { + panic(err) + } default: return nil, pkix.AlgorithmIdentifier{}, fmt.Errorf("x509: unsupported public key type: %T", pub) } @@ -230,6 +288,8 @@ const ( SHA384WithRSAPSS SHA512WithRSAPSS PureEd25519 + GOST256 + GOST512 ) func (algo SignatureAlgorithm) isRSAPSS() bool { @@ -267,6 +327,7 @@ const ( DSA // Only supported for parsing. ECDSA Ed25519 + GOST ) var publicKeyAlgoName = [...]string{ @@ -274,6 +335,7 @@ var publicKeyAlgoName = [...]string{ DSA: "DSA", ECDSA: "ECDSA", Ed25519: "Ed25519", + GOST: "GOST", } func (algo PublicKeyAlgorithm) String() string { @@ -346,6 +408,25 @@ var ( oidSignatureECDSAWithSHA512 = asn1.ObjectIdentifier{1, 2, 840, 10045, 4, 3, 4} oidSignatureEd25519 = asn1.ObjectIdentifier{1, 3, 101, 112} + oidTc26Gost341012256 = asn1.ObjectIdentifier{1, 2, 643, 7, 1, 1, 1, 1} + oidTc26Gost341012512 = asn1.ObjectIdentifier{1, 2, 643, 7, 1, 1, 1, 2} + oidTc26Gost34112012256 = asn1.ObjectIdentifier{1, 2, 643, 7, 1, 1, 2, 2} + oidTc26Gost34112012512 = asn1.ObjectIdentifier{1, 2, 643, 7, 1, 1, 2, 3} + oidTc26Gost341012256Signature = asn1.ObjectIdentifier{1, 2, 643, 7, 1, 1, 3, 2} + oidTc26Gost341012512Signature = asn1.ObjectIdentifier{1, 2, 643, 7, 1, 1, 3, 3} + oidGostR34102001CryptoProAParamSet = asn1.ObjectIdentifier{1, 2, 643, 2, 2, 35, 1} + oidGostR34102001CryptoProBParamSet = asn1.ObjectIdentifier{1, 2, 643, 2, 2, 35, 2} + oidGostR34102001CryptoProCParamSet = asn1.ObjectIdentifier{1, 2, 643, 2, 2, 35, 3} + oidGostR34102001CryptoProXchAParamSet = asn1.ObjectIdentifier{1, 2, 643, 2, 2, 36, 0} + oidGostR34102001CryptoProXchBParamSet = asn1.ObjectIdentifier{1, 2, 643, 2, 2, 36, 1} + oidTc26Gost341012256ParamSetA = asn1.ObjectIdentifier{1, 2, 643, 7, 1, 2, 1, 1, 1} + oidTc26Gost341012256ParamSetB = asn1.ObjectIdentifier{1, 2, 643, 7, 1, 2, 1, 1, 2} + oidTc26Gost341012256ParamSetC = asn1.ObjectIdentifier{1, 2, 643, 7, 1, 2, 1, 1, 3} + oidTc26Gost341012256ParamSetD = asn1.ObjectIdentifier{1, 2, 643, 7, 1, 2, 1, 1, 4} + oidTc26Gost341012512ParamSetA = asn1.ObjectIdentifier{1, 2, 643, 7, 1, 2, 1, 2, 1} + oidTc26Gost341012512ParamSetB = asn1.ObjectIdentifier{1, 2, 643, 7, 1, 2, 1, 2, 2} + oidTc26Gost341012512ParamSetC = asn1.ObjectIdentifier{1, 2, 643, 7, 1, 2, 1, 2, 3} + oidSHA256 = asn1.ObjectIdentifier{2, 16, 840, 1, 101, 3, 4, 2, 1} oidSHA384 = asn1.ObjectIdentifier{2, 16, 840, 1, 101, 3, 4, 2, 2} oidSHA512 = asn1.ObjectIdentifier{2, 16, 840, 1, 101, 3, 4, 2, 3} @@ -383,6 +464,8 @@ var signatureAlgorithmDetails = []struct { {ECDSAWithSHA384, "ECDSA-SHA384", oidSignatureECDSAWithSHA384, emptyRawValue, ECDSA, crypto.SHA384, false}, {ECDSAWithSHA512, "ECDSA-SHA512", oidSignatureECDSAWithSHA512, emptyRawValue, ECDSA, crypto.SHA512, false}, {PureEd25519, "Ed25519", oidSignatureEd25519, emptyRawValue, Ed25519, crypto.Hash(0) /* no pre-hashing */, false}, + {GOST256, "GOST256", oidTc26Gost341012256Signature, emptyRawValue, GOST, crypto.GOSTR34112012256, false}, + {GOST512, "GOST512", oidTc26Gost341012512Signature, emptyRawValue, GOST, crypto.GOSTR34112012512, false}, } var emptyRawValue = asn1.RawValue{} @@ -491,6 +574,9 @@ var ( // id-Ed25519 OBJECT IDENTIFIER ::= { 1 3 101 112 } oidPublicKeyX25519 = asn1.ObjectIdentifier{1, 3, 101, 110} oidPublicKeyEd25519 = asn1.ObjectIdentifier{1, 3, 101, 112} + + oidPublicKeyGOST256 = oidTc26Gost341012256 + oidPublicKeyGOST512 = oidTc26Gost341012512 ) // getPublicKeyAlgorithmFromOID returns the exposed PublicKeyAlgorithm @@ -506,6 +592,10 @@ func getPublicKeyAlgorithmFromOID(oid asn1.ObjectIdentifier) PublicKeyAlgorithm return ECDSA case oid.Equal(oidPublicKeyEd25519): return Ed25519 + case oid.Equal(oidPublicKeyGOST256): + return GOST + case oid.Equal(oidPublicKeyGOST512): + return GOST } return UnknownPublicKeyAlgorithm } @@ -954,6 +1044,18 @@ func checkSignature(algo SignatureAlgorithm, signed, signature []byte, publicKey return errors.New("x509: Ed25519 verification failure") } return + case *gost3410.PublicKey: + if pubKeyAlgo != GOST { + return signaturePublicKeyAlgoMismatchError(pubKeyAlgo, pub) + } + ok, err := gost3410.PublicKeyReverseDigest{Pub: pub}.VerifyDigest(signed, signature) + if err != nil { + return err + } + if !ok { + return errors.New("x509: GOST verification failure") + } + return err } return ErrUnsupportedAlgorithm } @@ -1475,8 +1577,17 @@ func signingParamsForKey(key crypto.Signer, sigAlgo SignatureAlgorithm) (Signatu pubType = Ed25519 defaultAlgo = PureEd25519 + case *gost3410.PublicKey: + pubType = GOST + switch pub.C.PointSize() { + case 256 / 8: + defaultAlgo = GOST256 + case 512 / 8: + defaultAlgo = GOST512 + } + default: - return 0, ai, errors.New("x509: only RSA, ECDSA and Ed25519 keys supported") + return 0, ai, errors.New("x509: only RSA, ECDSA, Ed25519 and GOST keys supported") } if sigAlgo == 0 { diff --git a/src/crypto/x509/x509_test.go b/src/crypto/x509/x509_test.go index a9483b7091..9a25bca5dd 100644 --- a/src/crypto/x509/x509_test.go +++ b/src/crypto/x509/x509_test.go @@ -36,6 +36,8 @@ import ( "strings" "testing" "time" + + "crypto/go.cypherpunks.su/gogost/v6/gost3410" ) func TestParsePKCS1PrivateKey(t *testing.T) { @@ -611,6 +613,19 @@ func TestCreateSelfSignedCertificate(t *testing.T) { t.Fatalf("Failed to generate Ed25519 key: %s", err) } + gost341012256PrivRaw := make([]byte, 32) + if _, err = io.ReadFull(random, gost341012256PrivRaw); err != nil { + t.Fatalf("Failed to read random for GOST private key: %s", err) + } + gost341012256Priv, err := gost3410.NewPrivateKey( + gost3410.CurveIdtc26gost341012256paramSetA(), + gost341012256PrivRaw, + ) + if err != nil { + t.Fatalf("Failed to create GOST private key: %s", err) + } + gost341012256Pub := gost341012256Priv.Public() + tests := []struct { name string pub, priv any @@ -625,6 +640,7 @@ func TestCreateSelfSignedCertificate(t *testing.T) { {"ECDSA/RSAPSS", &ecdsaPriv.PublicKey, testPrivateKey, false, SHA256WithRSAPSS}, {"RSAPSS/ECDSA", &testPrivateKey.PublicKey, ecdsaPriv, false, ECDSAWithSHA384}, {"Ed25519", ed25519Pub, ed25519Priv, true, PureEd25519}, + {"GOST256A", gost341012256Pub, &gost3410.PrivateKeyReverseDigest{Prv: gost341012256Priv}, true, GOST256}, } testExtKeyUsage := []ExtKeyUsage{ExtKeyUsageClientAuth, ExtKeyUsageServerAuth} @@ -4086,3 +4102,50 @@ func TestRejectCriticalSKI(t *testing.T) { t.Fatalf("ParseCertificate() unexpected error: %v, want: %s", err, expectedErr) } } + +const gost256Tc26Certificate = ` +-----BEGIN CERTIFICATE----- +MIIC6DCCAlSgAwIBAgIBATAKBggqhQMHAQEDAzBWMSkwJwYJKoZIhvcNAQkBFhpH +b3N0UjM0MTAtMjAxMkBleGFtcGxlLmNvbTEpMCcGA1UEAxMgR29zdFIzNDEwLTIw +MTIgKDUxMiBiaXQpIGV4YW1wbGUwHhcNMTMxMDA0MDczNjA0WhcNMzAxMDAxMDcz +NjA0WjBWMSkwJwYJKoZIhvcNAQkBFhpHb3N0UjM0MTAtMjAxMkBleGFtcGxlLmNv +bTEpMCcGA1UEAxMgR29zdFIzNDEwLTIwMTIgKDUxMiBiaXQpIGV4YW1wbGUwgaow +IQYIKoUDBwEBAQIwFQYJKoUDBwECAQICBggqhQMHAQECAwOBhAAEgYATGQ9VCiM5 +FRGCQ8MEz2F1dANqhaEuywa8CbxOnTvaGJpFQVXQwkwvLFAKh7hk542vOEtxpKtT +CXfGf84nRhMH/Q9bZeAc2eO/yhxrsQhTBufa1Fuou2oe/jUOaG6RAtUUvRzhNTpp +RGGl1+EIY2vzzUua9j9Ol/gAoy/LNKQIfqOBwDCBvTAdBgNVHQ4EFgQUPcbTRXJZ +nHtjj+eBP7b5lcTMekIwCwYDVR0PBAQDAgHGMA8GA1UdEwQIMAYBAf8CAQEwfgYD +VR0BBHcwdYAUPcbTRXJZnHtjj+eBP7b5lcTMekKhWqRYMFYxKTAnBgkqhkiG9w0B +CQEWGkdvc3RSMzQxMC0yMDEyQGV4YW1wbGUuY29tMSkwJwYDVQQDEyBHb3N0UjM0 +MTAtMjAxMiAoNTEyIGJpdCkgZXhhbXBsZYIBATAKBggqhQMHAQEDAwOBgQBObS7o +ppPTXzHyVR1DtPa8b57nudJzI4czhsfeX5HDntOq45t9B/qSs8dC6eGxbhHZ9zCO +SFtxWYdmg0au8XI9Xb8vTC1qdwWID7FFjMWDNQZb6lYh/J+8F2xKylvB5nIlRZqO +o3eUNFkNyHJwQCk2WoOlO16zwGk2tdKH4KmD5w== +-----END CERTIFICATE-----` + +func TestGOST256TC26SelfSigned(t *testing.T) { + der, _ := pem.Decode([]byte(gost256Tc26Certificate)) + if der == nil { + t.Fatalf("Failed to find PEM block") + } + + cert, err := ParseCertificate(der.Bytes) + if err != nil { + t.Fatalf("Failed to parse: %s", err) + } + + if cert.PublicKeyAlgorithm != GOST { + t.Fatalf("Parsed key algorithm was not GOST256") + } + parsedKey, ok := cert.PublicKey.(*gost3410.PublicKey) + if !ok { + t.Fatalf("Parsed key was not an GOST key: %s", err) + } + if len(parsedKey.Raw()) != 64*2 { + t.Fatalf("Invalid GOST key") + } + + if err = cert.CheckSignatureFrom(cert); err != nil { + t.Fatalf("Signature check failed: %s", err) + } +} -- 2.48.1