Update ruby/ql/lib/codeql/ruby/security/OpenSSL.qll

alexrford · nickrolfe · alexrford · commit df0da980ea27 · 2021-12-22T16:38:15.000Z
Co-authored-by: Nick Rolfe &lt;nickrolfe@github.com&gt;
diff --git a/ruby/ql/lib/codeql/ruby/security/OpenSSL.qll b/ruby/ql/lib/codeql/ruby/security/OpenSSL.qll
@@ -245,9 +245,10 @@ module Ciphers {
   string getCanonicalCipherName(string name) {
     isOpenSSLCipher(name) and
     (
-      if exists(string special | special = getSpecialCanonicalCipherName(name))
-      then result = getSpecialCanonicalCipherName(name)
-      else result = name.toUpperCase()
+      result = getSpecialCanonicalCipherName(name)
+      or
+      not exists(getSpecialCanonicalCipherName(name)) and
+      result = name.toUpperCase()
     )
   }
 

Original file line number	Diff line number	Diff line change
`@@ -245,9 +245,10 @@ module Ciphers {`
`245`	`245`	`string getCanonicalCipherName(string name) {`
`246`	`246`	`isOpenSSLCipher(name) and`
`247`	`247`	`(`
`248`		`- if exists(string special \| special = getSpecialCanonicalCipherName(name))`
`249`		`- then result = getSpecialCanonicalCipherName(name)`
`250`		`- else result = name.toUpperCase()`
	`248`	`+ result = getSpecialCanonicalCipherName(name)`
	`249`	`+ or`
	`250`	`+ not exists(getSpecialCanonicalCipherName(name)) and`
	`251`	`+ result = name.toUpperCase()`
`251`	`252`	`)`
`252`	`253`	`}`
`253`	`254`