Add OpenSSL common utilities to OpenSSLVerify.qll

Author: Ted Reed

CodeQL_Queries/cpp/OpenSSL-hostname-validation/OpenSSLMissingVerifyCallback.ql

@@ -20,32 +20,12 @@
 
 import cpp
 import semmle.code.cpp.dataflow.TaintTracking
-
-class SslSetVerifyFunctionCall extends FunctionCall {
-  SslSetVerifyFunctionCall() { this.getTarget().hasName("SSL_set_verify") }
-}
-
-class SslCtxSetVerifyFunctionCall extends FunctionCall {
-  SslCtxSetVerifyFunctionCall() { this.getTarget().hasName("SSL_CTX_set_verify") }
-}
-
-class SslLikeSetVerifyFunctionCall extends FunctionCall {
-  SslLikeSetVerifyFunctionCall() {
-    this instanceof SslCtxSetVerifyFunctionCall or
-    this instanceof SslSetVerifyFunctionCall
-  }
-}
+import OpenSSLVerify
 
 class SslSet1HostFunctionCall extends FunctionCall {
   SslSet1HostFunctionCall() { this.getTarget().hasName("SSL_set1_host") }
 }
 
-class SslCtxSetCertVerifyCallbackFunctionCall extends FunctionCall {
-  SslCtxSetCertVerifyCallbackFunctionCall() {
-    this.getTarget().hasName("SSL_CTX_set_cert_verify_callback")
-  }
-}
-
 class SslLikeCheckHostnameFunctionCall extends FunctionCall {
   SslLikeCheckHostnameFunctionCall() {
     this instanceof SslSet1HostFunctionCall or

CodeQL_Queries/cpp/OpenSSL-hostname-validation/OpenSSLPreverifyIgnored.ql

@@ -13,20 +13,7 @@
  */
 
 import cpp
-
-class SslSetVerifyFunctionCall extends FunctionCall {
-  SslSetVerifyFunctionCall() { this.getTarget().hasName("SSL_set_verify") }
-}
-
-class SslCtxSetVerifyFunctionCall extends FunctionCall {
-  SslCtxSetVerifyFunctionCall() { this.getTarget().hasName("SSL_CTX_set_verify") }
-}
-
-class SslCtxSetCertVerifyCallbackFunctionCall extends FunctionCall {
-  SslCtxSetCertVerifyCallbackFunctionCall() {
-    this.getTarget().hasName("SSL_CTX_set_cert_verify_callback")
-  }
-}
+import OpenSSLVerify
 
 class SetVerifyCallbackFunctionCall extends FunctionCall {
   SetVerifyCallbackFunctionCall() { this.getTarget().hasName("set_verify_callback") }

CodeQL_Queries/cpp/OpenSSL-hostname-validation/OpenSSLVerify.qll

@@ -0,0 +1,26 @@
+import cpp
+
+/** 
+ * Common utilities for OpenSSL certificate verification.
+ */
+
+class SslSetVerifyFunctionCall extends FunctionCall {
+  SslSetVerifyFunctionCall() { this.getTarget().hasName("SSL_set_verify") }
+}
+
+class SslCtxSetVerifyFunctionCall extends FunctionCall {
+  SslCtxSetVerifyFunctionCall() { this.getTarget().hasName("SSL_CTX_set_verify") }
+}
+
+class SslLikeSetVerifyFunctionCall extends FunctionCall {
+  SslLikeSetVerifyFunctionCall() {
+    this instanceof SslCtxSetVerifyFunctionCall or
+    this instanceof SslSetVerifyFunctionCall
+  }
+}
+
+class SslCtxSetCertVerifyCallbackFunctionCall extends FunctionCall {
+  SslCtxSetCertVerifyCallbackFunctionCall() {
+    this.getTarget().hasName("SSL_CTX_set_cert_verify_callback")
+  }
+}