1256 Commits

Author SHA1 Message Date
Richard T Bonhomme
96b3d38847
Move show_host() to cleanup() and move detect_host() after options
Move show_host() to cleanup() and only call it when die() was called.
This allows for confirm() Aborted to exit without extended error data.

Move detect_host after options processing. Allows for use of options.
eg: --verbose

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-25 21:09:24 +01:00
Richard T Bonhomme
14ebbe2bf6
Use correct input file x509-types/ca
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-25 20:47:21 +01:00
Richard T Bonhomme
44d69ca2fe
typ0: Replace single TAB with SPACE
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-24 18:05:16 +01:00
Richard T Bonhomme
4f9e32fc7c
Opt. --subca-len: basicConstraints CA extension, Append 'pathlen:N'
When signing a request for an intermediate CA using --subca-len=N:

For a Sub-CA, the current method to apply 'pathlen:N' to CA basicConstraints
over-writes all user set basicConstraints.

Replace that with an awk script which reads the current x509-types/ca file;
selects the last occurence of 'basicConstraints' (As does OpenSSL) and then
prints that line, with ", pathlen:$EASYRSA_SUBCA_LEN" appended, into the
temporary x509-types/ca file.

If no CA basicConstraint is found then exit with an error. Reason:

Easy-RSA default CA basicConstrain will always be defined. If that is changed
by the user, who then attempts to use Easy-RSA to append 'pathlen' then that
is an error. Easy-RSA must not insert a default when the default has been
deliberately removed.

Closes: #691 - Original bug report.
Closes: #692 - First use of awk as a solution. [Credit]

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-24 15:37:37 +01:00
Richard T Bonhomme
027a3e432f
Merge branch 'TinCanTech-build-full-cleanup'
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-23 14:23:10 +01:00
Richard T Bonhomme
6d0038497e
Merge branch 'build-full-cleanup' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-build-full-cleanup
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-23 14:22:23 +01:00
Richard T Bonhomme
5978a211bf
build_full: Remove sign_req() subshell and do full cleanup
build-x-full uses a subshell to detect errors and cleanup the files
if an error occurs.  This does not work if Ctrl-C is pressed during
the confirmation yes/no dialog.

Replace the subshell with an indicator, $on_error_build_full_cleanup,
to force cleanup() to remove the CSR, key and certificate files when
an error occurs or user presses Ctrl-C.

Closes: #680

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-23 13:58:45 +01:00
Richard T Bonhomme
513c5be97a
Merge branch 'TinCanTech-final-ChangeLog-v311'
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-21 22:38:51 +01:00
Richard T Bonhomme
0ee06591c2
Merge branch 'final-ChangeLog-v311' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-final-ChangeLog-v311
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-21 22:37:52 +01:00
Richard T Bonhomme
4b7b7516b4
ChangeLog: Final update for v3.1.1
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-21 22:29:28 +01:00
Richard T Bonhomme
36f4880cf9
Merge branch 'TinCanTech-doc-renew-revoke-update'
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-21 21:55:35 +01:00
Richard T Bonhomme
9e908bcef9
Merge branch 'doc-renew-revoke-update' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-doc-renew-revoke-update
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-21 21:54:45 +01:00
Richard T Bonhomme
17ded6f52e
Doc-Update: Note that all changes were included with Easy-RSA v3.1.1
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-21 21:49:19 +01:00
Richard T Bonhomme
4535c66259
Merge branch 'TinCanTech-status-old-renew'
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-21 21:39:09 +01:00
Richard T Bonhomme
8e3f928fff
Merge branch 'status-old-renew' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-status-old-renew
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-21 21:38:20 +01:00
Richard T Bonhomme
0fed20bf9e
Merge branch 'TinCanTech-ca-x509-types-files'
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-21 21:36:52 +01:00
Richard T Bonhomme
b6748d9fdc
Merge branch 'ca-x509-types-files' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-ca-x509-types-files
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-21 21:36:03 +01:00
Richard T Bonhomme
bceab3ee74
Merge branch 'TinCanTech-add-rebuild'
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-21 21:34:25 +01:00
Richard T Bonhomme
1582656254
Merge branch 'add-rebuild' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-add-rebuild
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-21 21:33:16 +01:00
Richard T Bonhomme
0f7c74d1ca
Status Report 'show-renew': Include renewed certs from /cert_by_serial
Expand 'show-renew' to include certs which have been renewed the old way.
These are stored in 'renewed/certs_by_serial' and require 'rewind-renew'
before they can be revoked.

Also, introduce option '-v|--verbose' to make all status reports (only)
more verbose.

In this particular use case, verbose message detail expected serialNumber
mismatches, which can then be verified.  The previous code returned with
out an error, even though the test suggests that an error had occurred.

This verbosity for reports helps to verify that the report is correct.

Manually tested on a PKI with a mix of v1/v2 style renews.

Closese: 699

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-21 20:35:24 +01:00
Richard T Bonhomme
993f504b09
ChangeLog: 'Always ensure X509-types files exist (#581 #696)'
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-20 22:26:33 +01:00
Richard T Bonhomme
748c19be21
build-ca: Check x509-types 'ca' and 'COMMON' files exist
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-20 22:05:53 +01:00
Richard T Bonhomme
5736250a91
Merge branch 'TinCanTech-ca-x509-types-checks'
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-20 20:32:22 +01:00
Richard T Bonhomme
7a4c3df91a
Merge branch 'ca-x509-types-checks' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-ca-x509-types-checks
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-20 20:31:31 +01:00
Richard T Bonhomme
0f50f5c788
Error messages: Minor text-only improvements
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-19 13:33:06 +01:00
Richard T Bonhomme
9524d3361d
Error messages: Minor text improvements
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-19 13:22:44 +01:00
Richard T Bonhomme
27c9905aa4
X509-types: Always check SSL config file for EasyRSA insert-markers
Since EasyRSA version 3.1 there is a NEW insert-marker for X509 type 'ca'.

* New insert-marker: '^#%CA_X509_TYPES_EXTRA_EXTS%' [BRE]

This is only required to build a new CA or Sub-CA. However, without this
check, an old version of openssl-easyrsa.cnf will silently FAIL to include
the X509 types for 'ca' and 'COMMON', when builing a new CA.

EasyRSA 'init-pki soft' does leave 'openssl-easyrsa.cnf' in place, which
means that this is a known possible failure.

For consistency, check for All EasyRSA insert-markers, when used.

* Standard insert-markers: '^#%EXTRA_EXTS%' and '^#%COPY_EXTS%' [BRE]

Tested manually.

Closes: #693

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-18 17:32:08 +01:00
Richard T Bonhomme
d99bef68e1
Merge branch 'TinCanTech-doc-renew'
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-15 21:10:13 +01:00
Richard T Bonhomme
932eea78d4
Merge branch 'doc-renew' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-doc-renew
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-15 21:09:38 +01:00
Richard T Bonhomme
b44035c225
Documentation: Add EasyRSA-Renew-and-Revoke.md
Document the various EasyRSA version differences of renewal and revocation.

Closes: #626

Authors comment:
It has taken good luck, hard work and co-operation to save
EasyRSA "renewal and revocation".

I am pleased to have provided the solution presented here.

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-15 20:27:55 +01:00
Eric F Crist
43fb5990d8
update OpenSSL to 3.0.5
Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2022-09-14 19:28:55 -05:00
Richard T Bonhomme
6317779ff9
Rename 'renew' to 'rebuild' - Introduce 'renew' version 3
The old 'renew' always created a new private key at the CA signing side.
This forces the entity private key to be exposed, unnecessarily.

Only certificates expire, therefore, only certificates can be renewed.

For those reasons, the old 'renew' has been renamed to 'rebuild'.

The new 'renew' creates a new certificate only from the existing CSR.
The existing CSR will always exist, allowing a certificate to be renewed
indefinitely.

Both 'rebuild' and 'renew' use the renewed/ folders to temporarily store
the old certificate, where it can be revoked with 'revoke-renewed' command.

Manually tested.

Closes: #684

Notes:
* renew version 1 did not have a command to revoke old certificates.
* renew version 2 allowed old certificates to be revoked via command
  'revoke-renewed'.
* renew version 3 only renews the certificate.

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-13 13:54:11 +01:00
Richard T Bonhomme
d7aa481587
Merge branch 'TinCanTech-remove-renew-req'
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-09 19:03:44 +01:00
Richard T Bonhomme
19c4ddbc62
Merge branch 'remove-renew-req' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-remove-renew-req
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-09 19:00:23 +01:00
Richard T Bonhomme
2850fbb009
Remove renew-req
Phase-2: #684

Supersedes: #616

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-09 14:20:30 +01:00
Richard T Bonhomme
77172864c0
Merge branch 'TinCanTech-renew-req-nopass'
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-08 22:05:25 +01:00
Richard T Bonhomme
8a1d825901
Merge branch 'renew-req-nopass' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-renew-req-nopass
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-08 22:04:30 +01:00
Richard T Bonhomme
3c9513f406
renew-req: Add command option 'nopass'
Closes: #681

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-08 21:54:24 +01:00
Richard T Bonhomme
8ebb013339
Option --keep-tmp: Do not remove sign_req() extentions temp file
The extentions temp-file is part of the session temp-dir and is otherwise
removed by cleanup() on successful completion.

Part-of: #667
Closes: #676

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-08 14:11:53 +01:00
Richard T Bonhomme
46d43aabbb
ChangeLog: Re-enable use of '--vars=FILE init-pki' #640 (Revert #566)
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-08 12:59:40 +01:00
Richard T Bonhomme
d29dfea2ad
Merge branch 'TinCanTech-batch-gen-req'
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-08 12:25:21 +01:00
Richard T Bonhomme
caaafdb932
Merge branch 'batch-gen-req' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-batch-gen-req
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-08 12:24:29 +01:00
Richard T Bonhomme
fe3cced16c
Option --req-cn: Restore original behavior from v30x series
Due to my previous misunderstanding of the intended use of --req-cn,
it is no longer possible to set commonName for command gen-req.
Ref: #524  #456

This commit restores v30x series behavior:
* --req-cn can only be used in batch mode.
* --req-cn can only be used by commands build-ca and gen-req.
* SSL layer prompts are restored to original behavior.

Important: The use of internal batch mode is no longer required
for command sign_req(), when called by build_full(). This code
has been disabled but remains in place.  This is a considerable
change under the hood but there is no user observable difference.

Also, minor improvements to help and EasyRSA-Advanced.md

Tested manually and thoroughly.

Closes: #668

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-08 11:42:56 +01:00
Richard T Bonhomme
917d078045
Merge branch 'TinCanTech-keep-temp-files'
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-02 16:32:31 +01:00
Richard T Bonhomme
7174602844
Merge branch 'keep-temp-files' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-keep-temp-files
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-02 16:31:14 +01:00
Richard T Bonhomme
1dfd7307d5
ChangeLog: Add --keep-tmp
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-02 15:41:57 +01:00
Richard T Bonhomme
b90798387f
Options: Typo, rename --keep-temp to --keep-tmp
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-02 15:35:31 +01:00
Richard T Bonhomme
48e7d0a593
Merge branch 'TinCanTech-expand-days'
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-01 21:28:37 +01:00
Richard T Bonhomme
df6b8bf1a1
Merge branch 'expand-days' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-expand-days
Minor help output change: Remove useless 'N/A'

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-01 21:25:19 +01:00
Richard T Bonhomme
a9c2ef9a67
help: Refactor/simplify 'help' output conditionals.
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2022-09-01 20:41:54 +01:00