From patchwork Mon Apr 10 17:49:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 749163 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w1yQF6MRDz9sNZ for ; Tue, 11 Apr 2017 03:50:29 +1000 (AEST) Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v3AHoOSX021042 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 10 Apr 2017 17:50:24 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id v3AHoNJ0012783 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 10 Apr 2017 17:50:24 GMT Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1cxdSJ-0000lK-A8; Mon, 10 Apr 2017 10:50:23 -0700 Received: from aserv0022.oracle.com ([141.146.126.234]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1cxdRe-0000bp-Ti for fedfs-utils-devel@oss.oracle.com; Mon, 10 Apr 2017 10:49:42 -0700 Received: from aserp1030.oracle.com (aserp1030.oracle.com [141.146.126.68]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id v3AHngmY005299 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 10 Apr 2017 17:49:42 GMT Received: from userp2040.oracle.com (userp2040.oracle.com [156.151.31.90]) by aserp1030.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v3AHnfaO025785 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Mon, 10 Apr 2017 17:49:42 GMT Authentication-Results: aserp1030.oracle.com; dkim=pass reason="2048-bit key" header.d=gmail.com header.i=@gmail.com header.b=I6PQFI7p Received: from pps.filterd (userp2040.oracle.com [127.0.0.1]) by userp2040.oracle.com (8.16.0.20/8.16.0.20) with SMTP id v3AHmRtg015841 for ; Mon, 10 Apr 2017 17:49:41 GMT Authentication-Results: oracle.com; spf=pass smtp.mailfrom=chucklever@gmail.com Received: from mail-io0-f193.google.com (mail-io0-f193.google.com [209.85.223.193]) by userp2040.oracle.com with ESMTP id 29r9qmke6r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 10 Apr 2017 17:49:41 +0000 Received: by mail-io0-f193.google.com with SMTP id t68so5143642iof.2 for ; Mon, 10 Apr 2017 10:49:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:from:to:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=LUBdzzJNInzOeM1Wl/lNDHpIQ3NyMg20IQ5eNcuzOfI=; b=RerxwRJVNw7dslY5VEoP2EEtcYNlO5YdtlWd5Y94BaHbnzMUptlrV0kfkAlRBdXOVO 0Kp7yWh8kmTA3RSoKyRcpf2sGvW9Q/mbwLdbfaUf6yMo+FdpjYgnlhDVHdm256DUonIg f2pmk2bobljWav8Mr1urOejYCF6jw6YpoKhYdzLlYHnfpCHFvONoM/dDdLi13ijb8yIa iC9nFwKVh7odzmz0YvrnBgdMK4J+YhAUA9yFmAs4Un1zFDII29B/ewm9SHLgCTUNSbZC vYjuIvg6b2+obvTVhocYCDF5ERlCGYHDpK7u6LSwHkSHIMGg7OwkuH72ntc9G0Djdfos 47Eg== X-Gm-Message-State: AN3rC/5TJ4MZY1r0ZG8svmPgQxQMpya9YCvgUwQyBI6ZVGl5DvmR7SwNRupDzsQGQrqfNg== X-Received: by 10.36.215.129 with SMTP id y123mr13151201itg.17.1491846579876; Mon, 10 Apr 2017 10:49:39 -0700 (PDT) Received: from lebasque.1015granger.net (c-68-46-169-226.hsd1.mi.comcast.net. [68.46.169.226]) by smtp.gmail.com with ESMTPSA id d188sm123174itc.1.2017.04.10.10.49.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Apr 2017 10:49:39 -0700 (PDT) From: Chuck Lever To: fedfs-utils-devel@oss.oracle.com Date: Mon, 10 Apr 2017 13:49:38 -0400 Message-ID: <149184657884.81255.5265454899843415583.stgit@lebasque.1015granger.net> In-Reply-To: <149184647866.81255.2187475370959194203.stgit@lebasque.1015granger.net> References: <149184647866.81255.2187475370959194203.stgit@lebasque.1015granger.net> User-Agent: StGit/0.17.1-24-g0acc MIME-Version: 1.0 X-PDR: PASS X-ServerName: mail-io0-f193.google.com X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 redirect=_spf.google.com X-Proofpoint-Virus-Version: vendor=nai engine=5800 definitions=8494 signatures=668451 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=13 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1704100141 Subject: [fedfs-utils] [PATCH 1/2] openssl-1.1 update fixes X-BeenThere: fedfs-utils-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: fedfs-utils Developers List-Id: fedfs-utils Developers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: fedfs-utils-devel-bounces@oss.oracle.com Errors-To: fedfs-utils-devel-bounces@oss.oracle.com X-Source-IP: userv0022.oracle.com [156.151.31.74] From: Ian Kent Changing OpenSSL to version 1.1 changes the API in some cases. The two functions excluded here do nothing and have been deprecated or removed in OpenSSL 1.1. Signed-off-by: Ian Kent --- src/libnsdb/connsec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libnsdb/connsec.c b/src/libnsdb/connsec.c index bb81eee..8bbf306 100644 --- a/src/libnsdb/connsec.c +++ b/src/libnsdb/connsec.c @@ -44,7 +44,9 @@ nsdb_connsec_crypto_startup(void) { xlog(D_CALL, "%s", __func__); +#if OPENSSL_VERSION_NUMBER < 0x10100000L CRYPTO_malloc_init(); +#endif ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); ENGINE_load_builtin_engines(); @@ -62,7 +64,9 @@ nsdb_connsec_crypto_shutdown(void) EVP_cleanup(); ENGINE_cleanup(); CRYPTO_cleanup_all_ex_data(); +#if OPENSSL_VERSION_NUMBER < 0x10100000L ERR_remove_thread_state(NULL); +#endif ERR_free_strings(); }