From 52b23a40fd9708b23e7dbb01d6b45c479da48772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= <a.zimin@rosalinux.ru>
Date: Wed, 9 May 2018 19:56:15 +0300
Subject: [PATCH] Updated to 3.37

---
 .abf.yml                       |  2 +-
 nss.spec                       |  7 +------
 renegotiate-transitional.patch | 24 ++++++++++++------------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index c645cbd..fef11f7 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -3,5 +3,5 @@ sources:
   blank-key3.db: 7f78b5bcecdb5005e7b803604b2ec9d1a9df2fb5
   blank-secmod.db: bd748cf6e1465a1bbe6e751b72ffc0076aff0b50
   certificadoACRaiz.crt: 8efdcabc93e61e925d4d1ded181a4320a467a139
-  nss-3.35.tar.gz: 72fb5bd2fc56113fec0d8867a1030bb0dfa108ac
+  nss-3.37.tar.gz: 29268d7dadeaa41f2bee25607153574f44b4701e
   verisign-class-3-secure-server-ca.der: 188590e94878478e33b6194e59fbbb28ff0888d5
diff --git a/nss.spec b/nss.spec
index 9af7b9a..fbe1367 100644
--- a/nss.spec
+++ b/nss.spec
@@ -18,7 +18,7 @@
 
 Summary:	Netscape Security Services
 Name:		nss
-Version:	3.35
+Version:	3.37
 Release:	1
 Epoch:		2
 Group:		System/Libraries
@@ -71,7 +71,6 @@ libraries.
 %attr(0755,root,root) %{_bindir}/baddbdir
 %attr(0755,root,root) %{_bindir}/bltest
 %attr(0755,root,root) %{_bindir}/btoa
-%attr(0755,root,root) %{_bindir}/certcgi
 %attr(0755,root,root) %{_bindir}/certutil
 %attr(0755,root,root) %{_bindir}/chktest
 %attr(0755,root,root) %{_bindir}/cmsutil
@@ -422,10 +421,6 @@ mkdir -p docs/bltest
 cp -a nss/cmd/bltest/tests/* docs/bltest/
 chmod -R a+r docs
 
-mkdir -p docs/certcgi
-cp -a nss/cmd/certcgi/*.html docs/certcgi/
-cp -a nss/cmd/certcgi/HOWTO.txt docs/certcgi/
-
 mkdir -p docs/modutil
 cp -a nss/cmd/modutil/*.html docs/modutil/
 
diff --git a/renegotiate-transitional.patch b/renegotiate-transitional.patch
index 73b366b..d3aa3bd 100644
--- a/renegotiate-transitional.patch
+++ b/renegotiate-transitional.patch
@@ -1,12 +1,12 @@
-diff -up ./nss/lib/ssl/sslsock.c.transitional ./nss/lib/ssl/sslsock.c
---- ./nss/lib/ssl/sslsock.c.transitional	2016-06-23 21:03:16.316480089 -0400
-+++ ./nss/lib/ssl/sslsock.c	2016-06-23 21:08:07.290202477 -0400
-@@ -72,7 +72,7 @@ static sslOptions ssl_defaults = {
-     PR_FALSE,              /* noLocks            */
-     PR_FALSE,              /* enableSessionTickets */
-     PR_FALSE,              /* enableDeflate      */
--    2,                     /* enableRenegotiation (default: requires extension) */
-+    3,                     /* enableRenegotiation (default: transitional) */
-     PR_FALSE,              /* requireSafeNegotiation */
-     PR_FALSE,              /* enableFalseStart   */
-     PR_TRUE,               /* cbcRandomIV        */
+diff -up nss/lib/ssl/sslsock.c.transitional nss/lib/ssl/sslsock.c
+--- nss/lib/ssl/sslsock.c.transitional	2018-03-09 13:57:50.615706802 +0100
++++ nss/lib/ssl/sslsock.c	2018-03-09 13:58:23.708974970 +0100
+@@ -67,7 +67,7 @@ static sslOptions ssl_defaults = {
+     .noLocks = PR_FALSE,
+     .enableSessionTickets = PR_FALSE,
+     .enableDeflate = PR_FALSE,
+-    .enableRenegotiation = SSL_RENEGOTIATE_REQUIRES_XTN,
++    .enableRenegotiation = SSL_RENEGOTIATE_TRANSITIONAL,
+     .requireSafeNegotiation = PR_FALSE,
+     .enableFalseStart = PR_FALSE,
+     .cbcRandomIV = PR_TRUE,