projects
/
tls-check.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
162a2cd
)
more details in assertions
author
Ralf Jung
<post@ralfj.de>
Thu, 20 Nov 2014 09:03:24 +0000
(10:03 +0100)
committer
Ralf Jung
<post@ralfj.de>
Thu, 20 Nov 2014 09:03:24 +0000
(10:03 +0100)
tls-check
patch
|
blob
|
history
diff --git
a/tls-check
b/tls-check
index 33529d9c33d541110cafb64861e01e3bed8bce4b..8a64d84734c7daaabe45f3e9bf4eb914bc09cf0b 100755
(executable)
--- a/
tls-check
+++ b/
tls-check
@@
-121,7
+121,7
@@
class CipherPropsProvider:
def __getProps(self, cipher):
# as OpenSSL about this cipher
cipherInfo = subprocess.check_output(["openssl", "ciphers", "-v", cipher]).decode('UTF-8').strip()
def __getProps(self, cipher):
# as OpenSSL about this cipher
cipherInfo = subprocess.check_output(["openssl", "ciphers", "-v", cipher]).decode('UTF-8').strip()
- assert '\n' not in cipherInfo
+ assert '\n' not in cipherInfo
, "Cipher "+cipher+" produced unexpected output:\n"+cipherInfo
cipherInfoFields = cipherInfo.split()
# get # of bits
encMatch = re.match(r'^Enc=([0-9A-Za-z]+)\(([0-9]+)\)$', cipherInfoFields[4])
cipherInfoFields = cipherInfo.split()
# get # of bits
encMatch = re.match(r'^Enc=([0-9A-Za-z]+)\(([0-9]+)\)$', cipherInfoFields[4])
@@
-143,7
+143,7
@@
class CipherPropsProvider:
isLow = cipher in self.low
isMedium = cipher in self.medium
isHigh = cipher in self.high
isLow = cipher in self.low
isMedium = cipher in self.medium
isHigh = cipher in self.high
- assert isExp+isLow+isMedium+isHigh <= 1, "Cipher is more than one from EXP, LOW, MEDIUM, HIGH"
+ assert isExp+isLow+isMedium+isHigh <= 1, "Cipher
"+cipher+"
is more than one from EXP, LOW, MEDIUM, HIGH"
if isExp:
strength = CipherStrength.exp
elif isLow:
if isExp:
strength = CipherStrength.exp
elif isLow: