Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l9MoX-0001jG-FS for pgsql-hackers@arkaria.postgresql.org; Tue, 09 Feb 2021 06:47:57 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1l9MoW-0007Sz-4o for pgsql-hackers@arkaria.postgresql.org; Tue, 09 Feb 2021 06:47:56 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l9MoV-0007Ss-Tc for pgsql-hackers@lists.postgresql.org; Tue, 09 Feb 2021 06:47:55 +0000 Received: from out5-smtp.messagingengine.com ([66.111.4.29]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l9MoP-0002iA-Ot for pgsql-hackers@lists.postgresql.org; Tue, 09 Feb 2021 06:47:54 +0000 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 91DC85C01F0; Tue, 9 Feb 2021 01:47:48 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Tue, 09 Feb 2021 01:47:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paquier.xyz; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm3; bh=0I9pLrcFx2mHWkhOROl/ZyIS/ni 68GHXUFqmugauuOM=; b=1uhOr330FzCuKxrbO5zlTrXxRL17hzMhoP8ZO247+fX 3iDQsyHReFvqvzJ9oSqxWN2ytSxTV9thOMMMd7881PnzkMastk4CojZJregY3TOg TKF90sXnS5x7ze6VwcvFBlAGAHM0mNUYyMYqZflvDPAcQPAToP/3+yA+lrjzdaPT 02chlDUAFEmfQs3WO0cZvBiqwNvoXedlgKR/haHhXirzv/N/H3VuabeSlfAbpcJt WfZipauABz6hVF4KFVU66iS1QpwL/1auj4gPIX9E+ncvIoQrREABytYPI6ofmFl9 weavbKN3QeH2AxZSdFT0cWrPJzsgmCiCyyb0atutG8g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=0I9pLr cFx2mHWkhOROl/ZyIS/ni68GHXUFqmugauuOM=; b=DCUfpItrbSKf1X4VO6mbRk 74LeVTPm6lpQJBtxNisQo9gi6ZCgRhv3YE+5/7v8+3Fwv0uGHg4TwpAvDPli54xs aoj3fkyuuz5v+hVAL4YEsQGJVUPjwJoUhaBUOdHHfkQouIxcL94Qaw8b5+/J28fL SPbWwjgmk/KCH+wmjS2KXmsC7EEzaCi6RU18g7tOPnoVwAiDmJsj1oFY1cO/bMKu AtraAkF0yVk1j0b35XPz9b5kC7BJYSvC3ZO2ly7tc7hccUWhOEph53alxRqSdj06 dwmyn2y2f+Z31iAjGfe88R+maO5FfuZU6xm+ShAc/2mLJ7EGeNLmrG3sv3vlpwEg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrheeggddutdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne gfrhhlucfvnfffucdljedtmdenucfjughrpeffhffvuffkfhggtggujgesghdtreertddt vdenucfhrhhomhepofhitghhrggvlhcurfgrqhhuihgvrhcuoehmihgthhgrvghlsehprg hquhhivghrrdighiiiqeenucggtffrrghtthgvrhhnpedvgeduuefhtdeuleettdevjeeh heeiveeuieegleetgeeljeelieeuieehgeevhfenucfkphepudduuddruddtvddrudektd drudekheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhm pehmihgthhgrvghlsehprghquhhivghrrdighiii X-ME-Proxy: Received: from paquier.xyz (ee0822lan1.rev.em-net.ne.jp [111.102.180.185]) by mail.messagingengine.com (Postfix) with ESMTPA id 970681080057; Tue, 9 Feb 2021 01:47:45 -0500 (EST) Date: Tue, 9 Feb 2021 15:47:42 +0900 From: Michael Paquier To: Daniel Gustafsson Cc: Jacob Champion , "hlinnaka@iki.fi" , "pgsql-hackers@lists.postgresql.org" , "andrew.dunstan@2ndquadrant.com" , "thomas.munro@gmail.com" , "andres@anarazel.de" , "sfrost@snowman.net" Subject: Re: Support for NSS as a libpq TLS backend Message-ID: References: <8D7F95DB-8F8A-4300-BFDA-656FBAB30FE2@yesql.se> <5382CB4A-9CF3-4145-BA46-C802615935E0@yesql.se> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="7t4JaZr8OtAp/vbK" Content-Disposition: inline In-Reply-To: <5382CB4A-9CF3-4145-BA46-C802615935E0@yesql.se> List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --7t4JaZr8OtAp/vbK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Feb 09, 2021 at 12:08:37AM +0100, Daniel Gustafsson wrote: > Attached is a new patchset where I've tried to split the patches even further > to try and separate out changes for easier review. While not a perfect split > I'm sure, and clearly only for review purposes, I do hope it helps a little. > There is one hunk in 0002 which moves some OpenSSL specific code from > underneath USE_SSL, but thats about the only non-NSS change left in this > patchset AFAICS. I would have imagined 0010 to be either a 0001 or a 0002 :) } +#endif /* USE_SSL */ + +#ifndef USE_OPENSSL PQsslKeyPassHook_OpenSSL_type PQgetSSLKeyPassHook_OpenSSL(void) Indeed. Let's fix that on HEAD, as an independent thing. errmsg("hostssl record cannot match because SSL is not supported by this build"), - errhint("Compile with --with-ssl=openssl to use SSL connections."), + errhint("Compile with --with-ssl to use SSL connections."), Actually, we could change that directly on HEAD as you suggest. This code area is surrounded with USE_SSL so there is no need to mention openssl at all. -/* Support for overriding sslpassword handling with a callback. */ +/* Support for overriding sslpassword handling with a callback */ Makes sense. /* * USE_SSL code should be compiled only when compiling with an SSL - * implementation. (Currently, only OpenSSL is supported, but we might add - * more implementations in the future.) + * implementation. */ Fine by me as well, meaning that 0002 could just be committed as-is. I am also looking at 0003 a bit. -- Michael --7t4JaZr8OtAp/vbK Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAmAiMA4ACgkQnvQgOdby QH1epg//ZySq540eJzkTrl/D4v+SV9NGAEVQC7tnEMlysEokoN+iW/WjgWjkeMcn p0osDtvb5k7VV6sRjYj4E1Cn2EW9bAvsOBM4GybD0ngbBhNKIIwiXoMZGS5puzE+ ATs9IzSLqW63d1nKCxf90M1vqaHAhurR1r/QMFQJ5HoCr4vDgs+njOIK3xRSCPcw 1ibKT3CmrUkNFXmuNakzP0ZTkrxkkt1TadfuxXHvOQMG/9Hlj1Kl7wo+fF2Xkvg4 tXQ+FS6NESKBh3yJDgwTnp2w4Zon3V2txUjbWWssuIIhsTWWCj6z7UMROd6jrBmZ OFRrllSpL3CuCDXlHJG0HX0par4jQuccpsoQq0dI9/0Ah4hXhjATc4ExWXTbmP1s JObc+NWIg8Gnbxb6WCvVePr2xEanY8wMclvpPyuCYGBXRfv0E18CR7/AqQGPBSKA jdCes9IN9jUiLPvBEGtxfIX0Bf7vEbPigerWdMUeyCXp90/0bJbnXlsTfPReEE+B xGUDQialwS6wHtg3mrfolVlvcoTsHVIc21o679wO0g3nga8wTg2jYut0ULkAod/7 BHiU2ASK5d/orJpw6kJLaY033hhUkQ6iPTC6KKPD6r9wjDgs2xVBAYbFVGQOr7f4 THkvkHl4UPP4gV5qY2SlVq4mzxMMMgVcizBbhFpg1wfo4cCN1GI= =KfrG -----END PGP SIGNATURE----- --7t4JaZr8OtAp/vbK--