Skip to content

Commit

Permalink
Merge branch 'master' into 'master'
Browse files Browse the repository at this point in the history 
Update to 3.20.1

Fixes CVE-2015-7181 and CVE-2015-7182. Contributes to MER#1407

Signed-off-by: Pasi Sjöholm <pasi.sjoholm@jollamobile.com>

See merge request !6
  • Loading branch information
@stskeeps
stskeeps committed Nov 4, 2015
2 parents 1305d81 + 98abb22 commit ab6de8f
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 145 deletions.
148 changes: 4 additions & 144 deletions nss-3.13.3-notimestamps.patch
View file
@@ -1,49 +1,7 @@
diff --git a/nss/lib/ckfw/builtins/ckbiver.c b/nss/lib/ckfw/builtins/ckbiver.c
index f9b1a87..221e1a7 100644
--- a/nss/lib/ckfw/builtins/ckbiver.c
+++ b/nss/lib/ckfw/builtins/ckbiver.c
@@ -52,7 +52,7 @@
*/
const char __nss_builtins_rcsid[] = "$Header: NSS Builtin Trusted Root CAs "
NSS_BUILTINS_LIBRARY_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__ " $";
+ " " "Built in OBS" " " "see rpm -q --info nss for more information" " $";
const char __nss_builtins_sccsid[] = "@(#)NSS Builtin Trusted Root CAs "
NSS_BUILTINS_LIBRARY_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " "Built in OBS" " " "see rpm -q --info nss for more information";
diff --git a/nss/lib/ckfw/capi/ckcapiver.c b/nss/lib/ckfw/capi/ckcapiver.c
index d692905..6255340 100644
--- a/nss/lib/ckfw/capi/ckcapiver.c
+++ b/nss/lib/ckfw/capi/ckcapiver.c
@@ -53,7 +53,7 @@
*/
const char __nss_ckcapi_rcsid[] = "$Header: NSS Access to Microsoft Certificate Store "
NSS_CKCAPI_LIBRARY_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__ " $";
+ " " "Built in OBS" " " "see rpm -q --info nss for more information" " $";
const char __nss_ckcapi_sccsid[] = "@(#)NSS Access to Microsoft Certificate Store "
NSS_CKCAPI_LIBRARY_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " "Built in OBS" " " "see rpm -q --info nss for more information";
diff --git a/nss/lib/ckfw/nssmkey/ckmkver.c b/nss/lib/ckfw/nssmkey/ckmkver.c
index 9cbb2d2..d5940db 100644
--- a/nss/lib/ckfw/nssmkey/ckmkver.c
+++ b/nss/lib/ckfw/nssmkey/ckmkver.c
@@ -53,7 +53,7 @@
*/
const char __nss_ckmk_rcsid[] = "$Header: NSS Access to the MAC OS X Key Ring "
NSS_CKMK_LIBRARY_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__ " $";
+ " " "Built in OBS" " " "see rpm -q --info nss for more information" " $";
const char __nss_ckmk_sccsid[] = "@(#)NSS Access to the MAC OS X Key Ring "
NSS_CKMK_LIBRARY_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " "Built in OBS" " " "see rpm -q --info nss for more information";
diff --git a/nss/lib/ckfw/pem/ckpemver.c b/nss/lib/ckfw/pem/ckpemver.c
index 76ab5df..6498c3e 100644
--- a/nss/lib/ckfw/pem/ckpemver.c
+++ b/nss/lib/ckfw/pem/ckpemver.c
Index: nss-3.20.1/nss/lib/ckfw/pem/ckpemver.c
===================================================================
--- nss-3.20.1.orig/nss/lib/ckfw/pem/ckpemver.c
+++ nss-3.20.1/nss/lib/ckfw/pem/ckpemver.c
@@ -53,7 +53,7 @@
*/
const char __nss_ckpem_rcsid[] = "$Header: NSS Access to Flat Files in PEM format"
Expand All @@ -54,101 +12,3 @@ index 76ab5df..6498c3e 100644
NSS_CKPEM_LIBRARY_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " "Built in OBS" " " "see rpm -q --info nss for more information";
diff --git a/nss/lib/freebl/freeblver.c b/nss/lib/freebl/freeblver.c
index 2c59545..f3e38ed 100644
--- a/nss/lib/freebl/freeblver.c
+++ b/nss/lib/freebl/freeblver.c
@@ -51,6 +51,6 @@
* must not end in a '$' to prevent rcs keyword substitution.
*/
const char __nss_freebl_rcsid[] = "$Header: NSS " SOFTOKEN_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__ " $";
+ " " "Built in OBS" " " "see rpm -q --info nss for more information" " $";
const char __nss_freebl_sccsid[] = "@(#)NSS " SOFTOKEN_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " "Built in OBS" " " "see rpm -q --info nss for more information";
diff --git a/nss/lib/nss/nssver.c b/nss/lib/nss/nssver.c
index 9d7f813..5f66ead 100644
--- a/nss/lib/nss/nssver.c
+++ b/nss/lib/nss/nssver.c
@@ -51,6 +51,6 @@
* must not end in a '$' to prevent rcs keyword substitution.
*/
const char __nss_base_rcsid[] = "$Header: NSS " NSS_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__ " $";
+ " " "Built in OBS" " " "see rpm -q --info nss for more information" " $";
const char __nss_base_sccsid[] = "@(#)NSS " NSS_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " "Built in OBS" " " "see rpm -q --info nss for more information";
diff --git a/nss/lib/smime/smimever.c b/nss/lib/smime/smimever.c
index df838e3..fb9585f 100644
--- a/nss/lib/smime/smimever.c
+++ b/nss/lib/smime/smimever.c
@@ -51,6 +51,6 @@
* must not end in a '$' to prevent rcs keyword substitution.
*/
const char __nss_smime_rcsid[] = "$Header: NSS " NSS_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__ " $";
+ " " "Built in OBS" " " "see rpm -q --info nss for more information" " $";
const char __nss_smime_sccsid[] = "@(#)NSS " NSS_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " "Built in OBS" " " "see rpm -q --info nss for more information";
diff --git a/nss/lib/softoken/legacydb/lginit.c b/nss/lib/softoken/legacydb/lginit.c
index c1b1578..ca28f9e 100644
--- a/nss/lib/softoken/legacydb/lginit.c
+++ b/nss/lib/softoken/legacydb/lginit.c
@@ -60,10 +60,8 @@
* NOTE: the first component of the concatenated rcsid string
* must not end in a '$' to prevent rcs keyword substitution.
*/
-const char __nss_dbm_rcsid[] = "$Header: NSS " SOFTOKEN_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__ " $";
-const char __nss_dbm_sccsid[] = "@(#)NSS " SOFTOKEN_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+const char __nss_dbm_rcsid[] = "$Header: NSS " SOFTOKEN_VERSION _DEBUG_STRING " $";
+const char __nss_dbm_sccsid[] = "@(#)NSS " SOFTOKEN_VERSION _DEBUG_STRING;

typedef struct LGPrivateStr {
NSSLOWCERTCertDBHandle *certDB;
diff --git a/nss/lib/softoken/softkver.c b/nss/lib/softoken/softkver.c
index 931d620..1b93143 100644
--- a/nss/lib/softoken/softkver.c
+++ b/nss/lib/softoken/softkver.c
@@ -51,6 +51,6 @@
* must not end in a '$' to prevent rcs keyword substitution.
*/
const char __nss_softokn_rcsid[] = "$Header: NSS " SOFTOKEN_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__ " $";
+ " " "Built in OBS" " " "see rpm -q --info nss for more information" " $";
const char __nss_softokn_sccsid[] = "@(#)NSS " SOFTOKEN_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " "Built in OBS" " " "see rpm -q --info nss for more information";
diff --git a/nss/lib/ssl/sslver.c b/nss/lib/ssl/sslver.c
index 782048f..d1e2266 100644
--- a/nss/lib/ssl/sslver.c
+++ b/nss/lib/ssl/sslver.c
@@ -51,6 +51,6 @@
* must not end in a '$' to prevent rcs keyword substitution.
*/
const char __nss_ssl_rcsid[] = "$Header: NSS " NSS_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__ " $";
+ " " "Built in OBS" " " "see rpm -q --info nss for more information" " $";
const char __nss_ssl_sccsid[] = "@(#)NSS " NSS_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " "Built in OBS" " " "see rpm -q --info nss for more information";
diff --git a/nss/lib/util/secoid.c b/nss/lib/util/secoid.c
index c722897..c44bbf3 100644
--- a/nss/lib/util/secoid.c
+++ b/nss/lib/util/secoid.c
@@ -59,9 +59,9 @@
* must not end in a '$' to prevent rcs keyword substitution.
*/
const char __nss_util_rcsid[] = "$Header: NSS " NSSUTIL_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__ " $";
+ " " "Built in OBS" " " "see rpm -q --info nss for more information" " $";
const char __nss_util_sccsid[] = "@(#)NSS " NSSUTIL_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " "Built in OBS" " " "see rpm -q --info nss for more information";

/* MISSI Mosaic Object ID space */
#define USGOV 0x60, 0x86, 0x48, 0x01, 0x65
Binary file removed nss-3.19.2.tar.gz
View file
Binary file not shown.
Binary file added nss-3.20.1.tar.gz
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions nss.changes
View file
@@ -1,3 +1,7 @@
* Wed Nov 04 2015 Pasi Sjöholm <pasi.sjoholm@jollamobile.com> - 3.20.1
- Update to 3.20.1
- Fixes CVE-2015-7181 and CVE-2015-7182. Contributes to MER#1407

* Thu Aug 20 2015 Pasi Sjöholm <pasi.sjoholm@jollamobile.com> - 3.19.2
- Update to 3.19.2. Fixes MER#1254
- Fixes CVE-2015-2721, CVE-2015-2730
Expand Down
2 changes: 1 addition & 1 deletion nss.spec
View file
Expand Up @@ -3,7 +3,7 @@

Summary: Network Security Services
Name: nss
Version: 3.19.2
Version: 3.20.1
Release: 1
License: MPLv2
URL: http://www.mozilla.org/projects/security/pki/nss/
Expand Down

0 comments on commit ab6de8f

Please sign in to comment.