From 78858d7f7452d7a471cc68a73a54fed009b49ccb Mon Sep 17 00:00:00 2001
From: Elio Maldonado <emaldona@redhat.com>
Date: Mon, 16 Nov 2015 17:05:45 -0800
Subject: [PATCH] Remove obsolete patch

---
 nss.spec                                      |  3 --
 ..._sslauth_sni_tests_client_side_fixes.patch | 38 -------------------
 2 files changed, 41 deletions(-)
 delete mode 100644 ocsp_stapling_sslauth_sni_tests_client_side_fixes.patch

diff --git a/nss.spec b/nss.spec
index bf0c85d..b99e145 100644
--- a/nss.spec
+++ b/nss.spec
@@ -90,8 +90,6 @@ Patch49:          nss-skip-bltest-and-fipstest.patch
 Patch50:          iquote.patch
 # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=923089
 # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1009429
-# See https://hg.mozilla.org/projects/nss/raw-rev/dc7bb2f8cc50
-Patch56: ocsp_stapling_sslauth_sni_tests_client_side_fixes.patch
 # Local patch for TLS_ECDHE_{ECDSA|RSA}_WITH_3DES_EDE_CBC_SHA ciphers
 Patch58: rhbz1185708-enable-ecc-3des-ciphers-by-default.patch
 
@@ -184,7 +182,6 @@ low level services.
 %patch47 -p0 -b .templates
 %patch49 -p0 -b .skipthem
 %patch50 -p0 -b .iquote
-%patch56 -p1 -b .ocsp_sni
 pushd nss
 popd
 %patch58 -p0 -b .1185708_3des
diff --git a/ocsp_stapling_sslauth_sni_tests_client_side_fixes.patch b/ocsp_stapling_sslauth_sni_tests_client_side_fixes.patch
deleted file mode 100644
index 3ba7ae1..0000000
--- a/ocsp_stapling_sslauth_sni_tests_client_side_fixes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up ./nss/tests/ssl/sslauth.txt.ocsp_sni ./nss/tests/ssl/sslauth.txt
---- ./nss/tests/ssl/sslauth.txt.ocsp_sni	2015-05-28 10:50:45.000000000 -0700
-+++ ./nss/tests/ssl/sslauth.txt	2015-08-30 08:49:22.025299419 -0700
-@@ -65,12 +65,12 @@
- # SNI Tests
- #
-   SNI     0       -r_-a_Host-sni.Dom       -V_ssl3:_-w_nss_-n_TestUser                     TLS Server hello response without SNI
--  SNI     0       -r_-a_Host-sni.Dom       -V_ssl3:_-w_nss_-n_TestUser_-a_Host-sni.Dom     TLS Server hello response with SNI
--  SNI     1       -r_-a_Host-sni.Dom       -V_ssl3:_-w_nss_-n_TestUser_-a_Host-sni1.Dom    TLS Server response with alert
-+  SNI     0       -r_-a_Host-sni.Dom       -V_ssl3:_-c_v_-w_nss_-n_TestUser_-a_Host-sni.Dom     TLS Server hello response with SNI
-+  SNI     1       -r_-a_Host-sni.Dom       -V_ssl3:_-c_v_-w_nss_-n_TestUser_-a_Host-sni1.Dom    TLS Server response with alert
-   SNI     0       -r_-a_Host-sni.Dom       -V_ssl3:ssl3_-w_nss_-n_TestUser                  SSL3 Server hello response without SNI
--  SNI     1       -r_-a_Host-sni.Dom       -V_ssl3:ssl3_-w_nss_-n_TestUser_-a_Host-sni.Dom  SSL3 Server hello response with SNI: SSL don't have SH extensions
-+  SNI     1       -r_-a_Host-sni.Dom       -V_ssl3:_-c_vssl3_-w_nss_-n_TestUser_-a_Host-sni.Dom  SSL3 Server hello response with SNI: SSL don't have SH extensions
-   SNI     0       -r_-r_-r_-a_Host-sni.Dom -V_ssl3:_-w_nss_-n_TestUser                     TLS Server hello response without SNI
--  SNI     0       -r_-r_-r_-a_Host-sni.Dom -V_ssl3:_-w_nss_-n_TestUser_-a_Host-sni.Dom     TLS Server hello response with SNI
-+  SNI     0       -r_-r_-r_-a_Host-sni.Dom -V_ssl3:_-c_v_-w_nss_-n_TestUser_-a_Host-sni.Dom     TLS Server hello response with SNI
-   SNI     1       -r_-r_-r_-a_Host-sni.Dom -V_ssl3:_-w_nss_-n_TestUser_-a_Host-sni.Dom_-a_Host.Dom TLS Server hello response with SNI: Change name on 2d HS
--  SNI     1       -r_-r_-r_-a_Host-sni.Dom -V_ssl3:_-w_nss_-n_TestUser_-a_Host-sni.Dom_-a_Host-sni1.Dom TLS Server hello response with SNI: Change name to invalid 2d HS
--  SNI     1       -r_-r_-r_-a_Host-sni.Dom -V_ssl3:_-w_nss_-n_TestUser_-a_Host-sni1.Dom    TLS Server response with alert
-+  SNI     1       -r_-r_-r_-a_Host-sni.Dom -V_ssl3:_-c_v_-w_nss_-n_TestUser_-a_Host-sni.Dom_-a_Host-sni1.Dom TLS Server hello response with SNI: Change name to invalid 2d HS
-+  SNI     1       -r_-r_-r_-a_Host-sni.Dom -V_ssl3:_-c_v_-w_nss_-n_TestUser_-a_Host-sni1.Dom    TLS Server response with alert
-diff -up ./nss/tests/ssl/ssl.sh.ocsp_sni ./nss/tests/ssl/ssl.sh
---- ./nss/tests/ssl/ssl.sh.ocsp_sni	2015-08-30 08:49:21.905301105 -0700
-+++ ./nss/tests/ssl/ssl.sh	2015-08-30 08:49:22.017299531 -0700
-@@ -457,10 +457,10 @@ ssl_stapling_sub()
-     start_selfserv
- 
-     echo "tstclnt -p ${PORT} -h ${HOSTADDR} -f -d ${P_R_CLIENTDIR} -v ${CLIENT_OPTIONS} \\"
--    echo "        -T -O -F -M 1 -V ssl3: < ${REQUEST_FILE}"
-+    echo "        -c v -T -O -F -M 1 -V ssl3: < ${REQUEST_FILE}"
-     rm ${TMP}/$HOST.tmp.$$ 2>/dev/null
-     ${PROFTOOL} ${BINDIR}/tstclnt -p ${PORT} -h ${HOSTADDR} -f ${CLIENT_OPTIONS} \
--	    -d ${P_R_CLIENTDIR} -v -T -O -F -M 1 -V ssl3: < ${REQUEST_FILE} \
-+	    -d ${P_R_CLIENTDIR} -v -c v -T -O -F -M 1 -V ssl3: < ${REQUEST_FILE} \
- 	    >${TMP}/$HOST.tmp.$$  2>&1
-     ret=$?
-     cat ${TMP}/$HOST.tmp.$$