[Pkg-fedora-ds-maintainers] [libapache2-mod-nss] 31/156: More correct detection of NSS version when determining whether we should expect PK11_TokenKeyGenWithFlags(). It hasn't been included as of NSS 3.10.0.

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to branch master
in repository libapache2-mod-nss.

commit 203bed3bd17a0b9e6eac50a071242d9616d2a7bb
Author: rcritten <>
Date:   Thu Aug 18 13:44:33 2005 +0000

    More correct detection of NSS version when determining whether we
    should expect PK11_TokenKeyGenWithFlags(). It hasn't been included as
    of NSS 3.10.0.
---
 nss_pcache.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nss_pcache.c b/nss_pcache.c
index 7157a1e..e6e1966 100644
--- a/nss_pcache.c
+++ b/nss_pcache.c
@@ -146,15 +146,13 @@ CreatePk11PinStore(Pk11PinStore **out, const char *tokenName, const char *pin)
         }
 
         /* Generate a key and parameters to do the encryption */
-#if NSS_VMAJOR >= 3
-#if NSS_VMINOR <= 9
+#if NSS_VMAJOR >= 3 && (NSS_VMINOR <= 9 || (NSS_VMINOR <= 10 && NSS_VPATCH == 0))
         store->key = PK11_KeyGen(store->slot, store->mech->type,
                        0, 0, 0);
 #else
         store->key = PK11_TokenKeyGenWithFlags(store->slot, store->mech->type,
                      NULL, 0, NULL, CKF_ENCRYPT|CKF_DECRYPT, PR_FALSE, NULL);
 #endif
-#endif
         if (store->key == 0)
         {
             /* PR_SetError(xxx); */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-fedora-ds/libapache2-mod-nss.git