spice: Fix compilation without deprecated OpenSSL APIs #10461
Closed
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: Rosen Penev <rosenp@gmail.com>
|
Whoops. Updated based on upstream feedback. |
yousong
reviewed
Nov 9, 2019
| SSL_CTX_set_options(reds->ctx, ssl_options); | ||
| +#if OPENSSL_VERSION_NUMBER < 0x1010000FL | ||
| SSL_CTX_set_ecdh_auto(reds->ctx, 1); | ||
| +#endif |
There was a problem hiding this comment.
This hunk is not present in the upstream patch.
|
That hunk was fixed upstream but not in the released version.
In other news, this patch was accepted upstream.
…On Sat, Nov 9, 2019, 02:18 Yousong Zhou ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In libs/spice/patches/010-openssl-deprecated.patch
<#10461 (comment)>:
> ++#else
++static inline gpointer openssl_global_init(gpointer arg)
++{
++ return NULL;
++}
++#endif
+
+ static int reds_init_ssl(RedsState *reds)
+ {
+@@ -2784,7 +2787,9 @@ static int reds_init_ssl(RedsState *reds)
+ }
+
+ SSL_CTX_set_options(reds->ctx, ssl_options);
++#if OPENSSL_VERSION_NUMBER < 0x1010000FL
+ SSL_CTX_set_ecdh_auto(reds->ctx, 1);
++#endif
This hunk is not present in the upstream patch.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#10461?email_source=notifications&email_token=AAWITWOG5WUJX6DF3MLPCDTQS2E6VA5CNFSM4JIYKHTKYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCK72ZEQ#pullrequestreview-314551442>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAWITWMQUDZZIPM2Z2SDW5TQS2E6VANCNFSM4JIYKHTA>
.
|
|
Applied in c0d5c29 by using upstream patches. Thanks for your time. |
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.
Signed-off-by: Rosen Penev rosenp@gmail.com
Maintainer: @yousong
Compile tested: ath79
Fixes: #10451