Move SSL config file creation and/or expansion to write_easyrsa_ssl_cnf_tmp()
#1154
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Richard T Bonhomme <[email protected]>
This change moves the expansion of openssl-easyrsa.cnf to the same code where the file is either found or created. The high level requirements are: * OpenSSL does not require exanding the SSL config file. * LibreSSL requires expanding the SSL config file. * EASYRSA_FORCE_SAFE_SSL forces expanding the SSL config file. The specific requirements are: 1. Expanding openssl-easyrsa.cnf MUST be done after EASYRSA_REQ_CN is set. Thus, it cannot be done Globally, one time, at the start of execution. This is required by commands: build-ca, gen-req and sign-req. Change: Create the required OpenSSL:Unexpanded / LibreSSL:Expanded SSL config file for the commands above, after setting EASYRSA_REQ_CN. 2. check_serial_unique(): $check_serial (SSL command: ca) does not require an SSL config file, the error message for it being 'missing' is ignored. Change: check_serial_unique(), call $EASYRSA_OPENSSL directly. 3. verify_file() does require openssl-easyrsa.cnf - Follow-up change. Other changes are: * verify_working_env(): Do not create openssl-easyrsa.cnf temp-file. * Minor comments and verbose message improvements Signed-off-by: Richard T Bonhomme <[email protected]>
This guarantees that a working EasyRSA SSL config file exists and that both $EASYRSA_SSL_CONF and $OPENSSL_CONF are set to that file. If the initial file has been user, or by EasyRSA internally, edited then that file is used, in place. With these expanson rules applied: This file will be OpenSSL:Un-expanded, LibreSSL:Expanded or expanded by global option --force-safe-ssl or $EASYRSA_FORCE_SAFE_SSL. If the file in place is absent or recognised by SHA256 hash then it will be replaced by here-doc expansion, including SSL Lib expansion as required. The effected code here is verify_file(), which now calls $EASYRSA_OPENSSL directly. Submitting to $OPENSSL_CONF place, or error. Improve comments in the code. Signed-off-by: Richard T Bonhomme <[email protected]>
Signed-off-by: Richard T Bonhomme <[email protected]>
|
Superseded-by: #1163 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.