Fix conflicts in experimental query

atorralba · atorralba · commit 68fe3dd9f412 · 2022-01-19T16:42:58.000+01:00
diff --git a/java/ql/src/experimental/Security/CWE/CWE-327/SslLib.qll b/java/ql/src/experimental/Security/CWE/CWE-327/SslLib.qll
@@ -94,18 +94,6 @@ class UnsafeTlsVersion extends StringLiteral {
   }
 }
 
-class SSLParameters extends RefType {
-  SSLParameters() { hasQualifiedName("javax.net.ssl", "SSLParameters") }
-}
-
-class SSLSocket extends RefType {
-  SSLSocket() { hasQualifiedName("javax.net.ssl", "SSLSocket") }
-}
-
 class SSLServerSocket extends RefType {
   SSLServerSocket() { hasQualifiedName("javax.net.ssl", "SSLServerSocket") }
 }
-
-class SSLEngine extends RefType {
-  SSLEngine() { hasQualifiedName("javax.net.ssl", "SSLEngine") }
-}

Original file line number	Diff line number	Diff line change
`@@ -94,18 +94,6 @@ class UnsafeTlsVersion extends StringLiteral {`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`97`		`-class SSLParameters extends RefType {`
`98`		`- SSLParameters() { hasQualifiedName("javax.net.ssl", "SSLParameters") }`
`99`		`-}`
`100`		`-`
`101`		`-class SSLSocket extends RefType {`
`102`		`- SSLSocket() { hasQualifiedName("javax.net.ssl", "SSLSocket") }`
`103`		`-}`
`104`		`-`
`105`	`97`	`class SSLServerSocket extends RefType {`
`106`	`98`	`SSLServerSocket() { hasQualifiedName("javax.net.ssl", "SSLServerSocket") }`
`107`	`99`	`}`
`108`		`-`
`109`		`-class SSLEngine extends RefType {`
`110`		`- SSLEngine() { hasQualifiedName("javax.net.ssl", "SSLEngine") }`
`111`		`-}`