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

This commit is contained in:
Nick Mathewson 2012-03-14 18:36:58 -04:00
parent c2ed9a2940
commit bd0657602d

View File

@ -64,22 +64,20 @@ for line in cipherLines:
#### ####
# Now find the correct order for the ciphers # 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 = [] firefox_ciphers = []
inEnum=False inEnum=False
for line in fileC: for line in fileC:
if not inEnum: if not inEnum:
if "SSL_ImplementedCiphers[] =" in line: if "ssl3CipherSuiteCfg cipherSuites[" in line:
inEnum = True inEnum = True
continue continue
if line.startswith("};"): if line.startswith("};"):
break 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:
if m.group(1) == "0":
break
firefox_ciphers.append(m.group(1)) firefox_ciphers.append(m.group(1))
fileC.close() fileC.close()