Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Address issue #369 #454

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Address issue #369 #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
262b71b
Fix some typos on the downloads page (fix some 404s).
Quuxplusone Aug 11, 2020
be4d81e
Create a "client-nopass.pem" for use with Python requests, and add it…
Quuxplusone Aug 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ certs-test:
cp certs/sets/current/gen/crt/ca-untrusted-root.crt common/certs
cp certs/sets/current/gen/crt/client.p12 common/certs/${TEST_DOMAIN}-client.p12
cp certs/sets/current/gen/crt/client.pem common/certs/${TEST_DOMAIN}-client.pem
cp certs/sets/current/gen/crt/client-nopass.pem common/certs/${TEST_DOMAIN}-client-nopass.pem

.PHONY: certs-prod
certs-prod:
Expand All @@ -51,6 +52,7 @@ certs-prod:
cp certs/sets/current/gen/crt/ca-untrusted-root.crt common/certs
cp certs/sets/current/gen/crt/client.p12 common/certs/${PROD_DOMAIN}-client.p12
cp certs/sets/current/gen/crt/client.pem common/certs/${PROD_DOMAIN}-client.pem
cp certs/sets/current/gen/crt/client-nopass.pem common/certs/${PROD_DOMAIN}-client-nopass.pem

.PHONY: clean-certs
clean-certs:
Expand Down
3 changes: 3 additions & 0 deletions certs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ $(O)/gen/crt/client.p12: $(O)/gen/crt/client.crt $(O)/gen/key/client.key
./tool gen-pkcs12-p12 $@ $(D) $^
$(O)/gen/crt/client.pem: $(O)/gen/crt/client.p12
./tool pkcs12-convert-p12-pem $@ $(D) $^
$(O)/gen/crt/client-nopass.pem: $(O)/gen/crt/client.p12
./tool pkcs12-convert-p12-pem-nopass $@ $(D) $^
CHAINS_PROD += $(O)/gen/crt/client.pem
CHAINS_PROD += $(O)/gen/crt/client-nopass.pem

################################
$(O)/gen/key/ca-untrusted-root.key:
Expand Down
7 changes: 7 additions & 0 deletions certs/tool
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,13 @@ pkcs12-convert-p12-pem)
-passout "pass:$DOMAIN" \
-in $1
;;
pkcs12-convert-p12-pem-nopass)
openssl pkcs12 \
-out $OUT \
-clcerts \
-passin "pass:$DOMAIN" \
-in $1
;;
self-sign)
openssl x509 -req -CAcreateserial \
-out $OUT \
Expand Down
13 changes: 9 additions & 4 deletions domains/misc/badssl.com/download/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h2>Client Certificates</h2>
<table>
<thead>
<td>Download</td>
<td>Password</td>
<td>Passphrase</td>
<td>Format</td>
</thead>
<tbody>
Expand All @@ -36,6 +36,11 @@ <h2>Client Certificates</h2>
<td><b><code>{{ site.domain }}</code></b></td>
<td>PEM</td>
</tr>
<tr>
<td><a href="/certs/{{ site.domain }}-client-nopass.pem">{{ site.domain }}-client-nopass.pem</a></td>
<td>&mdash;</td>
<td>PEM</td>
</tr>
</tbody>
</table>
</div>
Expand All @@ -45,14 +50,14 @@ <h2>Installation Instructions</h2>
<div class="group">
<ul>
<li>
macOS: drag <code><a href="/certs/client.p12">client.p12</a></code> into Keychain Access.
macOS: drag <code><a href="/certs/{{ site.domain }}-client.p12">{{ site.domain }}-client.p12</a></code> into Keychain Access.
</li>
<li>
Firefox: import <code><a href="/certs/client.p12">client.p12</a></code> into the Your Certificates
Firefox: import <code><a href="/certs/{{ site.domain }}-client.p12">{{ site.domain }}-client.p12</a></code> into the Your Certificates
section of the Certificate Manager.
</li>
<li>
YubiKeys: import <code><a href="/certs/client.pem">client.pem</a></code> using the following command:<br><br>
YubiKeys: import <code><a href="/certs/{{ site.domain }}-client.pem">{{ site.domain }}-client.pem</a></code> using the following command:<br><br>
<code>yubico-piv-tool -a verify-pin -s 9a -a import-key -a import-cert -i {{ site.domain }}-client.pem</code>
</li>
</ul>
Expand Down