Fix OPENSSL_CONF problem for OPENSSL2 #2796
Merged
Conversation
This file contains hidden or 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
In #2727 there were workarounds introduced which sped up processing decryption of ChaCha20 and and AES-GCM by using OPENSSL2 when it is supporting such functions. However when OPENSSL2 is called and OPENSSL_CONF still points to the autogenerated file which works for `~/bin/openssl.$(uname -s).$(uname -m)` the decryption `$plaintext` will be empty which later on caused a negative value, see #2780 . This fixes #2780 by prepending `OPENSSL_CONF=''` to each OPENSSL2 instance. Also it makes `chacha20()` and `gcm-decrypt()` more robust. It is now more readable now. At other places $OPENSSL2 were prepended by `OPENSSL_CONF=''` also if there weren't any obvious errors noticed. Also now all OPENSSL2 vars will appear in /tmp/testssl.XXXXXX/environment.txt when debugging. It was also noticed that the `find_socat()` function had room for improvements, it was not set in any case when `socat was in $PATH or supplied via env SOCAT.
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.
Describe your changes
In #2727 there were workarounds introduced which sped up processing decryption of ChaCha20 and and AES-GCM by using OPENSSL2 when it is supporting such functions.
However when OPENSSL2 is called and OPENSSL_CONF still points to the autogenerated file which works for
~/bin/openssl.$(uname -s).$(uname -m)the decryption$plaintextwill be empty which later on caused a negative value, see #2780 .This fixes #2780 by prepending
OPENSSL_CONF=''to each OPENSSL2 instance. Also it makeschacha20()andgcm-decrypt()more robust. It is now more readable now. At other places $OPENSSL2 were prepended byOPENSSL_CONF=''also if there weren't any obvious errors noticed.Also now all OPENSSL2 vars will appear in /tmp/testssl.XXXXXX/environment.txt when debugging.
It was also noticed that the
find_socat()function had room for improvements, it was not set in any case when `socat was in $PATH or supplied via env SOCAT.What is your pull request about?
If it's a code change please check the boxes which are applicable
help()