mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

MOre gen_server_ciphers improvements:

Browse Source 
- Remove DES from mandatory list.
  - always put the closing ; on its own line.
This commit is contained in:
Nick Mathewson 2017-01-27 16:15:26 -05:00
parent 363be43df3
commit 26a9787aa5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/codegen/gen_server_ciphers.py
View File

@ -20,7 +20,6 @@ BAD_STUFF = [ "_DES_40_", "MD5", "_RC4_", "_DES_64_",
MANDATORY = [ MANDATORY = [
"TLS1_TXT_DHE_RSA_WITH_AES_256_SHA", "TLS1_TXT_DHE_RSA_WITH_AES_256_SHA",
"TLS1_TXT_DHE_RSA_WITH_AES_128_SHA", "TLS1_TXT_DHE_RSA_WITH_AES_128_SHA",
"SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA",
] ]
def find_ciphers(filename): def find_ciphers(filename):
@ -112,18 +111,21 @@ for fname in sys.argv[1:]:
ALL_CIPHERS.sort(key=Ciphersuite.sort_key) ALL_CIPHERS.sort(key=Ciphersuite.sort_key)
indent = " "*7
for c in ALL_CIPHERS: for c in ALL_CIPHERS:
if c is ALL_CIPHERS[-1]: if c is ALL_CIPHERS[-1]:
colon = ';' colon = ''
else: else:
colon = ' ":"' colon = ' ":"'
if c.name in MANDATORY: if c.name in MANDATORY:
print " /* Required */" print "%s/* Required */"%indent
print ' %s%s'%(c.name,colon) print '%s%s%s'%(indent,c.name,colon)
else: else:
print "#ifdef %s"%c.name print "#ifdef %s"%c.name
print ' %s%s'%(c.name,colon) print '%s%s%s'%(indent,c.name,colon)
print "#endif" print "#endif"
print '%s;'%indent