| Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 1 | From 689dc20ede9768377d4032ff8c70b58269c8dc9c Mon Sep 17 00:00:00 2001 |
| 2 | From: Charlie Fenton <charlief@example.com> |
| 3 | Date: Mon, 18 Oct 2021 01:43:08 -0700 |
| 4 | Subject: [PATCH 01/10] Mac: update dependent libraries to latest: |
| 5 | c-ares-1.17.2, curl-7.79.1, freetype-2.11.0, openssl-3.0.0 Previously updated |
| 6 | to wxWidgets-3.1.5. FTGL version ftgl-2.1.3~rc5 is still the current |
| 7 | version. |
| 8 | |
| 9 | --- |
| 10 | lib/crypt.cpp | 7 +- |
| 11 | 8 files changed, 199 insertions(+), 150 deletions(-) |
| 12 | |
| 13 | diff --git a/lib/crypt.cpp b/lib/crypt.cpp |
| 14 | index 01249cfc340..9b1f69160b8 100644 |
| 15 | --- a/lib/crypt.cpp |
| 16 | +++ b/lib/crypt.cpp |
| 17 | @@ -1,6 +1,6 @@ |
| 18 | // This file is part of BOINC. |
| 19 | // http://boinc.berkeley.edu |
| 20 | -// Copyright (C) 2008 University of California |
| 21 | +// Copyright (C) 2021 University of California |
| 22 | // |
| 23 | // BOINC is free software; you can redistribute it and/or modify it |
| 24 | // under the terms of the GNU Lesser General Public License |
| 25 | @@ -672,7 +672,10 @@ int check_validity_of_cert( |
| 26 | } |
| 27 | #ifdef HAVE_OPAQUE_RSA_DSA_DH |
| 28 | RSA *rsa; |
| 29 | - rsa = EVP_PKEY_get0_RSA(pubKey); |
| 30 | + // CAUTION: In OpenSSL 3.0.0, EVP_PKEY_get0_RSA() now returns a |
| 31 | + // pointer of type "const struct rsa_st*" to an immutable value. |
| 32 | + // Do not try to modify the contents of the returned struct. |
| 33 | + rsa = (rsa_st*)EVP_PKEY_get0_RSA(pubKey); |
| 34 | if (!RSA_blinding_on(rsa, c)) { |
| 35 | #else |
| 36 | if (!RSA_blinding_on(pubKey->pkey.rsa, c)) { |