Commit 42aa7961 authored by Kamil Dudka's avatar Kamil Dudka
Browse files

nss: unconditionally require PK11_CreateGenericObject() 

This bumps the minimal supported version of NSS to 3.12.x.
parent 2a902738

RELEASE-NOTES

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Curl and libcurl 7.25.1 


This release includes the following changes:



 o nss: the minimal supported version of NSS bumped to 3.12.x

 o 



This release includes the following bugfixes:

configure.ac

+2 −8
Original line number Diff line number Diff line
@@ -2091,13 +2091,6 @@ if test "$OPENSSL_ENABLED" != "1" -a "$GNUTLS_ENABLED" != "1"; then 
        nssprefix=$OPT_NSS

    fi



    dnl Check for functionPK11_CreateGenericObject

    dnl this is needed for using the PEM PKCS#11 module

    AC_CHECK_LIB(nss3, PK11_CreateGenericObject,

     [

     AC_DEFINE(HAVE_PK11_CREATEGENERICOBJECT, 1, [if you have the function PK11_CreateGenericObject])

     AC_SUBST(HAVE_PK11_CREATEGENERICOBJECT, [1])

     ])

    if test -n "$addlib"; then



      CLEANLIBS="$LIBS"
@@ -2108,7 +2101,8 @@ if test "$OPENSSL_ENABLED" != "1" -a "$GNUTLS_ENABLED" != "1"; then 
         CPPFLAGS="$CPPFLAGS $addcflags"

      fi



      AC_CHECK_LIB(nss3, NSS_Initialize,

      dnl The function PK11_CreateGenericObject is needed to load libnsspem.so

      AC_CHECK_LIB(nss3, PK11_CreateGenericObject,

       [

       AC_DEFINE(USE_NSS, 1, [if NSS is enabled])

       AC_SUBST(USE_NSS, [1])

docs/INTERNALS

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Portability 
 openldap     2.0

 MIT krb5 lib 1.2.4

 qsossl       V5R2M0

 NSS          3.11.x

 NSS          3.12.x

 axTLS        1.2.7

 Heimdal      ?

lib/config-symbian.h

+0 −3
Original line number Diff line number Diff line
@@ -396,9 +396,6 @@ 
/* Define to 1 if you have the `pipe' function. */

#define HAVE_PIPE 1



/* if you have the function PK11_CreateGenericObject */

/* #undef HAVE_PK11_CREATEGENERICOBJECT */



/* Define to 1 if you have the `poll' function. */

/*#define HAVE_POLL 1*/

lib/config-vxworks.h

+0 −3
Original line number Diff line number Diff line
@@ -460,9 +460,6 @@ 
/* Define to 1 if you have the `pipe' function. */

#define HAVE_PIPE 1



/* if you have the function PK11_CreateGenericObject */

/* #undef HAVE_PK11_CREATEGENERICOBJECT */



/* Define to 1 if you have a working poll function. */

/* #undef HAVE_POLL */