Skip to content

Commit

Permalink
Merge branch 'TinCanTech-sign-req-allow-custom-x509'
Browse files Browse the repository at this point in the history
Signed-off-by: Richard T Bonhomme <[email protected]>
  • Loading branch information
TinCanTech committed Oct 13, 2024
2 parents fa887bb + 5795020 commit 9d57c91
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Easy-RSA 3 ChangeLog

3.2.2 (TBD)

* sign-req: Allow custom X509 Types (2ee08cc) (#1238)
* Remove redundant file index.txt.attr (da3c249) (#1233)

3.2.1 (2024-09-13)
Expand Down
12 changes: 9 additions & 3 deletions easyrsa3/easyrsa
Original file line number Diff line number Diff line change
Expand Up @@ -2390,7 +2390,11 @@ sign_req() {
: # All known types plus CA for sub-ca
;;
*)
user_error "Type is not recognised: '$crt_type'"
warn "\
Unrecognised x509-type: '$crt_type'

In order to sign a custom X509 Type certificate, there must be a
corresponding SSL configuration file in the 'x509-type' folder."
esac

# Check argument sanity:
Expand Down Expand Up @@ -4866,6 +4870,7 @@ write_x509_type_tmp() {
write_legacy_file_v2 "$1" "$write_x509_file_tmp" || \
die "write_x509_type_tmp - write $1"


verbose ": write_x509_type_tmp: $1 COMPLETE"
} # => write_x509_type_tmp()

Expand Down Expand Up @@ -5490,8 +5495,9 @@ EasyRSA Tools version is out of date:
verbose "Missing: easyrsa-tools.lib"
tools_error_txt="Missing: easyrsa-tools.lib

Use of command '$cmd' requires Easy-RSA tools library, source:
* https://github.com/OpenVPN/easy-rsa/dev/easyrsa-tools.lib
Use of command '$cmd' requires Easy-RSA tools library.
Source: https://github.com/OpenVPN/easy-rsa/dev/easyrsa-tools.lib
Download: https://raw.githubusercontent.com/OpenVPN/easy-rsa/refs/heads/master/dev/easyrsa-tools.lib

Place a copy of easyrsa-tools.lib in a standard system location."
return 1
Expand Down

0 comments on commit 9d57c91

Please sign in to comment.