From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 28 Jul 2014 14:27:04 +0000 (+0200)
Subject: nss: do not check the version of NSS at run time
X-Git-Tag: curl-7_38_0~170
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30b093f6fc728aabb70153e5c54d4199854ca8c4;p=thirdparty%2Fcurl.git

nss: do not check the version of NSS at run time

The minimal required version of NSS is 3.14.x so it does not make sense
to check for NSS 3.12.0+ at run time.
---

diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c
index 1e12d3dc67..b2d7f6f9f6 100644
--- a/lib/vtls/nss.c
+++ b/lib/vtls/nss.c
@@ -1030,8 +1030,7 @@ static CURLcode nss_init_core(struct SessionHandle *data, const char *cert_dir)
   initparams.length = sizeof(initparams);
 
   if(cert_dir) {
-    const bool use_sql = NSS_VersionCheck("3.12.0");
-    char *certpath = aprintf("%s%s", use_sql ? "sql:" : "", cert_dir);
+    char *certpath = aprintf("sql:%s", cert_dir);
     if(!certpath)
       return CURLE_OUT_OF_MEMORY;