commit mozilla-nss for openSUSE:Factory
Hello community, here is the log from the commit of package mozilla-nss for openSUSE:Factory checked in at Mon Jan 10 10:44:21 CET 2011. -------- --- GNOME/mozilla-nss/mozilla-nss.changes 2010-12-10 00:14:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/mozilla-nss/mozilla-nss.changes 2011-01-10 00:11:31.000000000 +0100 @@ -1,0 +2,9 @@ +Sun Jan 9 23:05:11 UTC 2011 - wr@rosenauer.org + +- update to 3.12.9rc0 + * fix minor memory leaks (bmo#619268) + * fix crash in nss_cms_decoder_work_data (bmo#607058) + * fix crash in certutil (bmo#620908) + * handle invalid argument in JPAKE (bmo#609068) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-nss.spec ++++++ --- /var/tmp/diff_new_pack.yyO9nC/_old 2011-01-10 10:44:02.000000000 +0100 +++ /var/tmp/diff_new_pack.yyO9nC/_new 2011-01-10 10:44:02.000000000 +0100 @@ -1,8 +1,8 @@ # # spec file for package mozilla-nss (Version 3.12.9) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2006-2010 Wolfgang Rosenauer +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006-2011 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,7 +30,7 @@ %endif License: GPLv2+ ; LGPLv2.1+ ; MPL Version: 3.12.9 -Release: 1 +Release: 2 # bug437293 %ifarch ppc64 Obsoletes: mozilla-nss-64bit ++++++ nss-3.12.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss-3.12.9/mozilla/security/nss/lib/freebl/jpake.c new/nss-3.12.9/mozilla/security/nss/lib/freebl/jpake.c --- old/nss-3.12.9/mozilla/security/nss/lib/freebl/jpake.c 2010-12-04 19:59:01.000000000 +0100 +++ new/nss-3.12.9/mozilla/security/nss/lib/freebl/jpake.c 2011-01-07 03:46:47.000000000 +0100 @@ -422,7 +422,8 @@ SECITEM_TO_MPINT(*x2, &X2); SECITEM_TO_MPINT(*s, &S); - if (mp_cmp(&S, &Q) >= 0) { + /* S must be in [1, Q-1] */ + if (mp_cmp_z(&S) <= 0 || mp_cmp(&S, &Q) >= 0) { err = MP_BADARG; goto cleanup; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss-3.12.9/mozilla/security/nss/lib/freebl/win_rand.c new/nss-3.12.9/mozilla/security/nss/lib/freebl/win_rand.c --- old/nss-3.12.9/mozilla/security/nss/lib/freebl/win_rand.c 2009-07-15 05:34:04.000000000 +0200 +++ new/nss-3.12.9/mozilla/security/nss/lib/freebl/win_rand.c 2011-01-06 20:05:57.000000000 +0100 @@ -151,6 +151,7 @@ return; // append *.* so we actually look for files. _snwprintf(szFileName, _MAX_PATH, L"%s\\*.*", szSysDir); + szFileName[_MAX_PATH - 1] = L'\0'; lFindHandle = FindFirstFileW(szFileName, &fdData); if (lFindHandle == INVALID_HANDLE_VALUE) @@ -164,6 +165,7 @@ // pass the full pathname to the callback _snwprintf(szFileName, _MAX_PATH, L"%s\\%s", szSysDir, fdData.cFileName); + szFileName[_MAX_PATH - 1] = L'\0'; if (fdData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { if (++uFolders <= MAX_FOLDERS) EnumSystemFilesInFolder(func, szFileName, maxDepth - 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss-3.12.9/mozilla/security/nss/lib/nss/nss.h new/nss-3.12.9/mozilla/security/nss/lib/nss/nss.h --- old/nss-3.12.9/mozilla/security/nss/lib/nss/nss.h 2010-09-23 19:07:52.000000000 +0200 +++ new/nss-3.12.9/mozilla/security/nss/lib/nss/nss.h 2011-01-06 19:04:16.000000000 +0100 @@ -36,7 +36,7 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -/* $Id: nss.h,v 1.81.2.3 2010/09/23 17:07:52 christophe.ravel.bugs%sun.com Exp $ */ +/* $Id: nss.h,v 1.81.2.4 2011/01/06 18:04:16 christophe.ravel.bugs%sun.com Exp $ */ #ifndef __nss_h_ #define __nss_h_ @@ -66,12 +66,12 @@ * The format of the version string should be * "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]" */ -#define NSS_VERSION "3.12.9.0" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta" +#define NSS_VERSION "3.12.9.0" _NSS_ECC_STRING _NSS_CUSTOMIZED #define NSS_VMAJOR 3 #define NSS_VMINOR 12 #define NSS_VPATCH 9 #define NSS_VBUILD 0 -#define NSS_BETA PR_TRUE +#define NSS_BETA PR_FALSE #ifndef RC_INVOKED diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss-3.12.9/mozilla/security/nss/lib/pki/pkistore.c new/nss-3.12.9/mozilla/security/nss/lib/pki/pkistore.c --- old/nss-3.12.9/mozilla/security/nss/lib/pki/pkistore.c 2008-06-06 03:19:30.000000000 +0200 +++ new/nss-3.12.9/mozilla/security/nss/lib/pki/pkistore.c 2010-12-17 21:14:38.000000000 +0100 @@ -35,7 +35,7 @@ * ***** END LICENSE BLOCK ***** */ #ifdef DEBUG -static const char CVS_ID[] = "@(#) $RCSfile: pkistore.c,v $ $Revision: 1.33 $ $Date: 2008/06/06 01:19:30 $"; +static const char CVS_ID[] = "@(#) $RCSfile: pkistore.c,v $ $Revision: 1.33.40.1 $ $Date: 2010/12/17 20:14:38 $"; #endif /* DEBUG */ #ifndef PKIM_H @@ -650,7 +650,11 @@ entry = (certificate_hash_entry *) nssHash_Lookup(store->issuer_and_serial, cert); if (entry) { - entry->trust = nssTrust_AddRef(trust); + NSSTrust* newTrust = nssTrust_AddRef(trust); + if (entry->trust) { + nssTrust_Destroy(entry->trust); + } + entry->trust = newTrust; } PZ_Unlock(store->lock); return (entry) ? PR_SUCCESS : PR_FAILURE; @@ -687,7 +691,11 @@ entry = (certificate_hash_entry *) nssHash_Lookup(store->issuer_and_serial, cert); if (entry) { - entry->profile = nssSMIMEProfile_AddRef(profile); + nssSMIMEProfile* newProfile = nssSMIMEProfile_AddRef(profile); + if (entry->profile) { + nssSMIMEProfile_Destroy(entry->profile); + } + entry->profile = newProfile; } PZ_Unlock(store->lock); return (entry) ? PR_SUCCESS : PR_FAILURE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss-3.12.9/mozilla/security/nss/lib/smime/cmsdecode.c new/nss-3.12.9/mozilla/security/nss/lib/smime/cmsdecode.c --- old/nss-3.12.9/mozilla/security/nss/lib/smime/cmsdecode.c 2006-08-05 03:19:23.000000000 +0200 +++ new/nss-3.12.9/mozilla/security/nss/lib/smime/cmsdecode.c 2010-12-23 19:03:41.000000000 +0100 @@ -37,7 +37,7 @@ /* * CMS decoding. * - * $Id: cmsdecode.c,v 1.9 2006/08/05 01:19:23 julien.pierre.bugs%sun.com Exp $ + * $Id: cmsdecode.c,v 1.9.66.1 2010/12/23 18:03:41 kaie%kuix.de Exp $ */ #include "cmslocal.h" @@ -463,6 +463,11 @@ PORT_Assert ((data != NULL && len) || final); cinfo = NSS_CMSContent_GetContentInfo(p7dcx->content.pointer, p7dcx->type); + if (!cinfo) { + /* The original programmer didn't expect this to happen */ + p7dcx->error = SEC_ERROR_LIBRARY_FAILURE; + goto loser; + } if (cinfo->ciphcx != NULL) { /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss-3.12.9/mozilla/security/nss/lib/smime/cmsencode.c new/nss-3.12.9/mozilla/security/nss/lib/smime/cmsencode.c --- old/nss-3.12.9/mozilla/security/nss/lib/smime/cmsencode.c 2006-06-09 00:01:02.000000000 +0200 +++ new/nss-3.12.9/mozilla/security/nss/lib/smime/cmsencode.c 2010-12-23 19:03:41.000000000 +0100 @@ -37,7 +37,7 @@ /* * CMS encoding. * - * $Id: cmsencode.c,v 1.6 2006/06/08 22:01:02 nelson%bolyard.com Exp $ + * $Id: cmsencode.c,v 1.6.66.1 2010/12/23 18:03:41 kaie%kuix.de Exp $ */ #include "cmslocal.h" @@ -425,6 +425,11 @@ /* we got data (either from the caller, or from a lower level encoder) */ cinfo = NSS_CMSContent_GetContentInfo(p7ecx->content.pointer, p7ecx->type); + if (!cinfo) { + /* The original programmer didn't expect this to happen */ + p7ecx->error = SEC_ERROR_LIBRARY_FAILURE; + return SECFailure; + } /* Update the running digest. */ if (len && cinfo->digcx != NULL) @@ -628,6 +633,12 @@ /* we are at innermost decoder */ /* find out about our inner content type - must be data */ cinfo = NSS_CMSContent_GetContentInfo(p7ecx->content.pointer, p7ecx->type); + if (!cinfo) { + /* The original programmer didn't expect this to happen */ + p7ecx->error = SEC_ERROR_LIBRARY_FAILURE; + return SECFailure; + } + childtype = NSS_CMSContentInfo_GetContentTypeTag(cinfo); if (childtype != SEC_OID_PKCS7_DATA) return SECFailure; @@ -728,6 +739,12 @@ /* find out about our inner content type - must be data */ cinfo = NSS_CMSContent_GetContentInfo(p7ecx->content.pointer, p7ecx->type); + if (!cinfo) { + /* The original programmer didn't expect this to happen */ + p7ecx->error = SEC_ERROR_LIBRARY_FAILURE; + rv = SECFailure; + goto loser; + } childtype = NSS_CMSContentInfo_GetContentTypeTag(cinfo); if (childtype == SEC_OID_PKCS7_DATA && cinfo->content.data == NULL) { SEC_ASN1EncoderClearTakeFromBuf(p7ecx->ecx); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss-3.12.9/mozilla/security/nss/lib/softoken/legacydb/lginit.c new/nss-3.12.9/mozilla/security/nss/lib/softoken/legacydb/lginit.c --- old/nss-3.12.9/mozilla/security/nss/lib/softoken/legacydb/lginit.c 2009-02-04 00:18:48.000000000 +0100 +++ new/nss-3.12.9/mozilla/security/nss/lib/softoken/legacydb/lginit.c 2011-01-06 20:55:02.000000000 +0100 @@ -36,7 +36,7 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -/* $Id: lginit.c,v 1.14 2009/02/03 23:18:48 julien.pierre.boogz%sun.com Exp $ */ +/* $Id: lginit.c,v 1.14.22.1 2011/01/06 19:55:02 wtc%google.com Exp $ */ #include "lowkeyi.h" #include "pcert.h" @@ -540,9 +540,11 @@ goto loser; } + sdb->private = lgdb_p; + sdb->version = 0; sdb->sdb_type = SDB_LEGACY; sdb->sdb_flags = flags; - sdb->private = lgdb_p; + sdb->app_private = NULL; sdb->sdb_FindObjectsInit = lg_FindObjectsInit; sdb->sdb_FindObjects = lg_FindObjects; sdb->sdb_FindObjectsFinal = lg_FindObjectsFinal; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss-3.12.9/mozilla/security/nss/lib/softoken/sdb.c new/nss-3.12.9/mozilla/security/nss/lib/softoken/sdb.c --- old/nss-3.12.9/mozilla/security/nss/lib/softoken/sdb.c 2010-07-31 02:49:28.000000000 +0200 +++ new/nss-3.12.9/mozilla/security/nss/lib/softoken/sdb.c 2011-01-06 20:55:01.000000000 +0100 @@ -20,6 +20,7 @@ * * Contributor(s): * Robert Relyea (rrelyea@redhat.com) + * Meena Vyas (meena.vyas@oracle.com) * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -1910,8 +1911,10 @@ sdb_p->sqlXactDB = NULL; sdb_p->sqlXactThread = NULL; sdb->private = sdb_p; + sdb->version = 0; sdb->sdb_type = SDB_SQL; sdb->sdb_flags = flags | SDB_HAS_META; + sdb->app_private = NULL; sdb->sdb_FindObjectsInit = sdb_FindObjectsInit; sdb->sdb_FindObjects = sdb_FindObjects; sdb->sdb_FindObjectsFinal = sdb_FindObjectsFinal; @@ -1924,6 +1927,7 @@ sdb->sdb_Begin = sdb_Begin; sdb->sdb_Commit = sdb_Commit; sdb->sdb_Abort = sdb_Abort; + sdb->sdb_Reset = sdb_Reset; sdb->sdb_Close = sdb_Close; sdb->sdb_SetForkState = sdb_SetForkState; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss-3.12.9/mozilla/security/nss/lib/softoken/softkver.h new/nss-3.12.9/mozilla/security/nss/lib/softoken/softkver.h --- old/nss-3.12.9/mozilla/security/nss/lib/softoken/softkver.h 2010-09-23 19:07:53.000000000 +0200 +++ new/nss-3.12.9/mozilla/security/nss/lib/softoken/softkver.h 2011-01-06 19:04:17.000000000 +0100 @@ -57,11 +57,11 @@ * The format of the version string should be * "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]" */ -#define SOFTOKEN_VERSION "3.12.9.0" SOFTOKEN_ECC_STRING " Beta" +#define SOFTOKEN_VERSION "3.12.9.0" SOFTOKEN_ECC_STRING #define SOFTOKEN_VMAJOR 3 #define SOFTOKEN_VMINOR 12 #define SOFTOKEN_VPATCH 9 #define SOFTOKEN_VBUILD 0 -#define SOFTOKEN_BETA PR_TRUE +#define SOFTOKEN_BETA PR_FALSE #endif /* _SOFTKVER_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss-3.12.9/mozilla/security/nss/lib/util/nssutil.h new/nss-3.12.9/mozilla/security/nss/lib/util/nssutil.h --- old/nss-3.12.9/mozilla/security/nss/lib/util/nssutil.h 2010-09-23 19:07:53.000000000 +0200 +++ new/nss-3.12.9/mozilla/security/nss/lib/util/nssutil.h 2011-01-06 19:04:17.000000000 +0100 @@ -51,11 +51,11 @@ * The format of the version string should be * "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]" */ -#define NSSUTIL_VERSION "3.12.9.0 Beta" +#define NSSUTIL_VERSION "3.12.9.0" #define NSSUTIL_VMAJOR 3 #define NSSUTIL_VMINOR 12 #define NSSUTIL_VPATCH 9 #define NSSUTIL_VBUILD 0 -#define NSSUTIL_BETA PR_TRUE +#define NSSUTIL_BETA PR_FALSE #endif /* __nssutil_h_ */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de