From 5888cbc5d989319f7a39d1145a853026d1dee269 Mon Sep 17 00:00:00 2001 From: Hiroyuki Wada Date: Mon, 20 May 2019 01:28:59 +0900 Subject: [PATCH] Add pem-body and pem-one-line option Add LICENSE file --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 4 +- main.go | 72 ++++++++++++++++--- 3 files changed, 265 insertions(+), 12 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README.md b/README.md index fa88542..6ef489b 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,9 @@ no Key ID is specified: neither pre-defined nor random one. * `--format`: Out JSON with format * `--jwks`: Generate as JWKS too -* `--pem`: Generate as PEM too (with PKCS#1) +* `--pem`: Generate as PEM too +* `--pem-body`: Generate as PEM too (only body without LF) +* `--pem-one-line`: Generate as PEM too (with one-line style) ## Examples diff --git a/main.go b/main.go index 3026c04..729a5ad 100644 --- a/main.go +++ b/main.go @@ -31,6 +31,7 @@ import ( "golang.org/x/crypto/ed25519" "io" "os" + "regexp" "gopkg.in/alecthomas/kingpin.v2" "gopkg.in/square/go-jose.v2" @@ -49,12 +50,14 @@ var ( string(jose.RSA1_5), string(jose.RSA_OAEP), string(jose.RSA_OAEP_256), string(jose.ECDH_ES), string(jose.ECDH_ES_A128KW), string(jose.ECDH_ES_A192KW), string(jose.ECDH_ES_A256KW), ) - bits = app.Flag("bits", "Key size in bits").Int() - kid = app.Flag("kid", "Key ID").String() - kidRand = app.Flag("kid-rand", "Generate random Key ID").Bool() - jwks = app.Flag("jwks", "Generate as JWKS too").Bool() - pemOut = app.Flag("pem", "Generate as PEM too").Bool() - format = app.Flag("format", "Format JSON").Bool() + bits = app.Flag("bits", "Key size in bits").Int() + kid = app.Flag("kid", "Key ID").String() + kidRand = app.Flag("kid-rand", "Generate random Key ID").Bool() + jwks = app.Flag("jwks", "Generate as JWKS too").Bool() + pemOut = app.Flag("pem", "Generate as PEM too").Bool() + pemBody = app.Flag("pem-body", "Generate as PEM body too").Bool() + pemOneLine = app.Flag("pem-one-line", "Generate as PEM with one-line too").Bool() + format = app.Flag("format", "Out JSON with format").Bool() ) // KeygenSig generates keypair for corresponding SignatureAlgorithm. @@ -162,6 +165,20 @@ func pemBlockForKey(priv crypto.PrivateKey) ([]byte, error) { return buf.Bytes(), nil } +func toBody(b []byte) []byte { + s := string(b) + rep := regexp.MustCompile("(?m)^\\-{5}.*\\-{5}$") + rep2 := regexp.MustCompile("\\n") + s = rep.ReplaceAllString(s, "") + return []byte(rep2.ReplaceAllString(s, "")) +} + +func toOneLine(b []byte) []byte { + s := string(b) + rep := regexp.MustCompile("\\n") + return []byte(rep.ReplaceAllString(s, "\\n")) +} + func pemBlockForPublicKey(pubKey crypto.PublicKey) ([]byte, error) { var pemBlock *pem.Block switch k := pubKey.(type) { @@ -267,9 +284,9 @@ func main() { var privPEM []byte var pubPEM []byte - if *pemOut { + if *pemOut || *pemBody || *pemOneLine { privPEM, err = pemBlockForKey(privKey) - app.FatalIfError(err, "can't Marshal private key with to PEM(PKCS#1)") + app.FatalIfError(err, "can't Marshal private key with to PEM") pubPEM, err = pemBlockForPublicKey(pubKey) app.FatalIfError(err, "can't Marshal public key to PEM") } @@ -293,6 +310,20 @@ func main() { fmt.Printf("==> pem_%s.pem <==\n", *alg) fmt.Println(string(privPEM)) } + + if *pemBody { + fmt.Printf("==> pem-body-%s-pub.pem <==\n", *alg) + fmt.Println(string(toBody(pubPEM))) + fmt.Printf("==> pem-body-%s.pem <==\n", *alg) + fmt.Println(string(toBody(privPEM))) + } + + if *pemOneLine { + fmt.Printf("==> pem-one-line-%s-pub.pem <==\n", *alg) + fmt.Println(string(toOneLine(pubPEM))) + fmt.Printf("==> pem-one-line-%s.pem <==\n", *alg) + fmt.Println(string(toOneLine(privPEM))) + } } else { // JWK Thumbprint (RFC7638) is not used for key id because of // lack of canonical representation. @@ -316,12 +347,31 @@ func main() { if *pemOut { fname = fmt.Sprintf("pem_%s_%s_%s", *use, *alg, *kid) - pfname := fmt.Sprintf("pem_pkcs#1_%s_%s_%s", *use, *alg, *kid) err = writeNewFile(fname+"-pub.pem", pubPEM, 0444) app.FatalIfError(err, "can't write public key with PEM to file %s-pub.pem", fname) fmt.Printf("Written public key with PEM to %s-pub.pem\n", fname) - err = writeNewFile(pfname+".pem", privPEM, 0400) - app.FatalIfError(err, "cant' write private key with PEM(PKCS#1) to file %s.pem", fname) + err = writeNewFile(fname+".pem", privPEM, 0400) + app.FatalIfError(err, "cant' write private key with PEM to file %s.pem", fname) + fmt.Printf("Written private key to %s.pem\n", fname) + } + + if *pemBody { + fname = fmt.Sprintf("pem-body_%s_%s_%s", *use, *alg, *kid) + err = writeNewFile(fname+"-pub.pem", toBody(pubPEM), 0444) + app.FatalIfError(err, "can't write public key with PEM to file %s-pub.pem", fname) + fmt.Printf("Written public key with PEM to %s-pub.pem\n", fname) + err = writeNewFile(fname+".pem", toBody(privPEM), 0400) + app.FatalIfError(err, "cant' write private key with PEM to file %s.pem", fname) + fmt.Printf("Written private key to %s.pem\n", fname) + } + + if *pemOneLine { + fname = fmt.Sprintf("pem-one-line_%s_%s_%s", *use, *alg, *kid) + err = writeNewFile(fname+"-pub.pem", toOneLine(pubPEM), 0444) + app.FatalIfError(err, "can't write public key with PEM to file %s-pub.pem", fname) + fmt.Printf("Written public key with PEM to %s-pub.pem\n", fname) + err = writeNewFile(fname+".pem", toOneLine(privPEM), 0400) + app.FatalIfError(err, "cant' write private key with PEM to file %s.pem", fname) fmt.Printf("Written private key to %s.pem\n", fname) } }