From: Sergio Durigan Junior <sergiodj@debian.org>
Date: Sun, 5 Mar 2023 17:00:03 +0000 (-0500)
Subject: Use correct path when loading libnss{pem,ckbi}.so
X-Git-Tag: archive/raspbian/7.88.1-10+rpi1+deb12u4^2~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=401882a6b28a340bea3e6972ef2a98cc4443bae5;p=curl.git

Use correct path when loading libnss{pem,ckbi}.so

Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726073

Gbp-Pq: Name Use-correct-path-when-loading-libnss-pem-ckbi-.so.patch
---

diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c
index 774cbdd7..79994e05 100644
--- a/lib/vtls/nss.c
+++ b/lib/vtls/nss.c
@@ -255,8 +255,12 @@ static const char *trust_library = "nssckbi.dll";
 static const char *pem_library = "libnsspem.dylib";
 static const char *trust_library = "libnssckbi.dylib";
 #else
-static const char *pem_library = "libnsspem.so";
-static const char *trust_library = "libnssckbi.so";
+#ifndef _DEB_HOST_ARCH
+#error "_DEB_HOST_ARCH must be defined"
+#endif
+
+static const char *pem_library = "/usr/lib/" _DEB_HOST_ARCH "/nss/libnsspem.so";
+static const char *trust_library = "/usr/lib/" _DEB_HOST_ARCH "/libnssckbi.so";
 #endif
 
 static SECMODModule *pem_module = NULL;