From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 14 Mar 2012 22:36:58 +0000 (-0400)
Subject: get_mozilla_ciphers: look at ssl3con.c, not sslenum.c
X-Git-Tag: tor-0.2.3.17-beta~20^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd0657602d54be7b0c9032c40f73a0b738b0282c;p=thirdparty%2Ftor.git

get_mozilla_ciphers: look at ssl3con.c, not sslenum.c
---

diff --git a/src/common/get_mozilla_ciphers.py b/src/common/get_mozilla_ciphers.py
index 61e8c4d90d..f9250317b1 100644
--- a/src/common/get_mozilla_ciphers.py
+++ b/src/common/get_mozilla_ciphers.py
@@ -64,22 +64,20 @@ for line in cipherLines:
 
 ####
 # Now find the correct order for the ciphers
-fileC = open(ff('security/nss/lib/ssl/sslenum.c'), 'r')
+fileC = open(ff('security/nss/lib/ssl/ssl3con.c'), 'r')
 firefox_ciphers = []
 inEnum=False
 for line in fileC:
     if not inEnum:
-        if "SSL_ImplementedCiphers[] =" in line:
+        if "ssl3CipherSuiteCfg cipherSuites[" in line:
             inEnum = True
         continue
 
     if line.startswith("};"):
         break
 
-    m = re.match(r'^\s*([A-Z_0-9]+)\s*', line)
+    m = re.match(r'^\s*\{\s*([A-Z_0-9]+),', line)
     if m:
-        if m.group(1) == "0":
-            break
         firefox_ciphers.append(m.group(1))
 
 fileC.close()