.gitignore

@@ -25,7 +25,3 @@ build/Release
 # Deployed apps should consider commenting this line out:
 # see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
 node_modules
-
-# IntelliJ
-.idea
-*.iml

LICENSE

@@ -1,38 +1,198 @@
-Copyright 2014 AJ ONeal
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-This is open source software; you can redistribute it and/or modify it under the
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-terms of either:
 
-   a) the "MIT License"
+   1. Definitions.
-   b) the "Apache-2.0 License"
 
-MIT License
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
-   Permission is hereby granted, free of charge, to any person obtaining a copy
+      "Licensor" shall mean the copyright owner or entity authorized by
-   of this software and associated documentation files (the "Software"), to deal
+      the copyright owner that is granting the License.
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
 
-   The above copyright notice and this permission notice shall be included in all
+      "Legal Entity" shall mean the union of the acting entity and all
-   copies or substantial portions of the Software.
+      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.
 
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+      "You" (or "Your") shall mean an individual or Legal Entity
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+      exercising permissions granted by this License.
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
 
-Apache-2.0 License Summary
+      "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
+       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,

README.md

@@ -10,7 +10,7 @@ See
 [the explanation](https://github.com/coolaj86/node-ssl-root-cas/wiki/Painless-Self-Signed-Certificates-in-node.js) for
 the many details.
 
-Also, you may be interested in [coolaj86/nodejs-ssl-trusted-peer-example](https://git.coolaj86.com/coolaj86/nodejs-ssl-trusted-peer-example).
+Also, you may be interested in [coolaj86/nodejs-ssl-trusted-peer-example](https://github.com/coolaj86/nodejs-ssl-trusted-peer-example).
 
 Test for yourself
 ---
@@ -28,7 +28,7 @@ example
 ### Get the repo
 
 ```bash
-git clone https://git.coolaj86.com/coolaj86/nodejs-self-signed-certificate-example.git
+git clone git@github.com:coolaj86/nodejs-self-signed-certificate-example.git
 pushd nodejs-self-signed-certificate-example
 npm install
 ```
@@ -125,74 +125,6 @@ So instead of trying to work through eleventeen brazillion errors
 about self-signed certs, you can just create an authority and then
 add the authority to your chain (viola, now it's trusted).
 
-Client Authentication
-====
-
-In the example above, the server trusts the client without the need for the client to be authenticated.
-So, a common enhancement to the example above would be to add client authentication.
-To add client authentication, it's necessary to generate a client key and have it signed by the CA defined above.
-Execute `make-client-key-certificate.sh` to generate key and certificate.
-To use generated key and certificate, `key`, `cert` and `passphrase` TLS options need to be added, e.g.:
-
-```
-var ca = fs.readFileSync(path.join(__dirname, 'certs', 'client', 'chain.pem'));
-var key = fs.readFileSync(path.join(__dirname, 'certs', 'client-auth', 'privkey.pem'));
-var passphrase = 'secret';
-var cert = fs.readFileSync(path.join(__dirname, 'certs', 'client-auth', 'cert.pem'));
-
-var options = {
-  host: hostname
-, port: port
-, path: '/'
-, ca: ca
-, key: key
-, passphrase: passphrase
-, cert: cert
-};
-```
-
-Generating Java Key Stores
-====
-
-If the server component is written in Java, the server needs to be plugged with a Java KeyStore containing security certificates.
-In the example above, the `fullchain.pem` file needs to be converted into a Java KeyStore file.
-To create a Java KeyStore file, the JDK needs to be installed and have `keytool` utility in the path.
-To do that, please follow these instructions:
-
-    $ mkdir certs/java/server
-    $ openssl pkcs12 \
-      -export \
-      -inkey certs/server/privkey.pem \
-      -in certs/server/fullchain.pem \
-      -name test \
-      -out certs/java/server/keystore_server.p12
-    $ keytool \
-      -importkeystore \
-      -srckeystore certs/java/server/keystore_server.p12 \
-      -srcstoretype pkcs12 \
-      -destkeystore certs/java/server/keystore_server.jks
-
-Trust Store for Client Authentication
-----
-
-If using client authentication, it is necessary for the server to trust to the client.
-To do that, it's necessary for a trust store to be created that contains the client's public key.
-Such a trust store can be created using these steps:
-
-    $ rsync -a certs/ca/my-root-ca.crt.pem certs/client-auth/chain.pem
-    $ cat certs/client-auth/cert.pem certs/client-auth/chain.pem > certs/client-auth/fullchain.pem
-    $ openssl pkcs12
-      \-export
-      \-inkey certs/client-auth/privkey.pem
-      \-in certs/client-auth/fullchain.pem
-      \-name test
-      \-out certs/infinispan/trustore_server.p12
-    $ keytool
-      \-importkeystore
-      \-srckeystore certs/infinispan/trustore_server.p12
-      \-srcstoretype pkcs12
-      \-destkeystore certs/infinispan/trustore_server.jks
-
 Other SSL Resources
 =========
 
@@ -200,9 +132,8 @@ Zero-Config clone 'n' run (tm) Repos:
 
 
 * [node.js HTTPS SSL Example](https://github.com/coolaj86/nodejs-ssl-example)
-* [node.js HTTPS SSL Self-Signed Certificate Example](https://git.coolaj86.com/coolaj86/nodejs-self-signed-certificate-example)
+* [node.js HTTPS SSL Self-Signed Certificate Example](https://github.com/coolaj86/nodejs-self-signed-certificate-example)
 * [node.js HTTPS SSL Trusted Peer Client Certificate Example](https://github.com/coolaj86/nodejs-ssl-trusted-peer-example)
-* [node.js HTTPS SSL module for Loopback](https://www.npmjs.com/package/loopback-ssl)
 * [SSL Root CAs](https://github.com/coolaj86/node-ssl-root-cas)
 
 Articles

make-client-key-and-certificate.sh

@@ -1,38 +0,0 @@
-#!/bin/bash
-FQDN=$1
-
-# make directories to work from
-mkdir -p certs/{client-auth}
-
-# Generate a client private key
-openssl genrsa \
-  -passout pass:secret \
-  -out certs/client-auth/privkey.pem \
-  2048
-
-
-# Create a request from your Device, which your Root CA will sign
-openssl req -new \
-  -key certs/client-auth/privkey.pem \
-  -out certs/tmp/client-csr.pem \
-  -subj "/C=US/ST=Utah/L=Provo/O=ACME Tech Inc/CN=${FQDN}"
-
-# Sign the request from Device with your Root CA
-openssl x509 \
-  -req -in certs/tmp/client-csr.pem \
-  -CA certs/ca/my-root-ca.crt.pem \
-  -CAkey certs/ca/my-root-ca.key.pem \
-  -CAcreateserial \
-  -out certs/client-auth/cert.pem \
-  -days 500
-
-# Create a public key, for funzies
-# see https://gist.github.com/coolaj86/f6f36efce2821dfb046d
-openssl rsa \
-  -in certs/server/privkey.pem \
-  -pubout -out certs/client/pubkey.pem
-
-# Put things in their proper place
-rsync -a certs/ca/my-root-ca.crt.pem certs/server/chain.pem
-rsync -a certs/ca/my-root-ca.crt.pem certs/client/chain.pem
-cat certs/server/cert.pem certs/server/chain.pem > certs/server/fullchain.pem

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodejs-self-signed-certificate-example",
-  "version": "1.1.2",
+  "version": "1.1.0",
   "description": "The end off all your self-sign certificate woes (in node.js at least)",
   "main": "serve.js",
   "scripts": {
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://git.coolaj86.com/coolaj86/nodejs-self-signed-certificate-example.git"
+    "url": "git://github.com/coolaj86/nodejs-self-signed-certificate-example.git"
   },
   "keywords": [
     "nodejs",
@@ -24,9 +24,9 @@
   "author": "AJ ONeal <awesome@coolaj86.com> (https://coolaj86.com)",
   "license": "Apache-2",
   "bugs": {
-    "url": "https://git.coolaj86.com/coolaj86/nodejs-self-signed-certificate-example/issues"
+    "url": "https://github.com/coolaj86/nodejs-self-signed-certificate-example/issues"
   },
-  "homepage": "https://git.coolaj86.com/coolaj86/nodejs-self-signed-certificate-example",
+  "homepage": "https://github.com/coolaj86/nodejs-self-signed-certificate-example",
   "dependencies": {
   }
 }