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