diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-03-14 18:36:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-03-14 18:36:58 -0400 |
| commit | bd0657602d54be7b0c9032c40f73a0b738b0282c (patch) | |
| tree | c0a802f4d572b959bc0191f5ff731c9519dfe634 | |
| parent | c2ed9a2940fa33bad94efa26fac9b45446731b67 (diff) | |
| download | tor-bd0657602d54be7b0c9032c40f73a0b738b0282c.tar.gz tor-bd0657602d54be7b0c9032c40f73a0b738b0282c.zip | |
get_mozilla_ciphers: look at ssl3con.c, not sslenum.c
| -rw-r--r-- | src/common/get_mozilla_ciphers.py | 8 |
1 files changed, 3 insertions, 5 deletions
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() |