tls-openssl: added the static verify-peer callback to TlsOpenSslPriva…

…te class
bareos · Sep 17, 2018 · 0712f87 · 0712f87
1 parent 67a8766
commit 0712f87
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/core/src/lib/tls_openssl.cc b/core/src/lib/tls_openssl.cc
@@ -89,9 +89,10 @@ class TlsOpenSslPrivate
 
    int OpensslBsockReadwrite(BareosSocket *bsock, char *ptr, int nbytes, bool write);
    bool OpensslBsockSessionStart(BareosSocket *bsock, bool server);
-   int OpensslVerifyPeer(int ok, X509_STORE_CTX *store);
    int tls_pem_callback_dispatch(char *buf, int size, int rwflag, void *userdata);
 
+   static int OpensslVerifyPeer(int ok, X509_STORE_CTX *store);
+
    SSL                  *openssl_;
    SSL_CTX              *openssl_ctx_;
    CRYPTO_PEM_PASSWD_CB *pem_callback_;
@@ -257,9 +258,9 @@ TlsOpenSsl::TlsOpenSsl(int fd)
       /*
        * SSL_VERIFY_FAIL_IF_NO_PEER_CERT has no effect in client mode
        */
-//      SSL_CTX_set_verify(d_->openssl_ctx_,
-//                         SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
-//                         d_->OpensslVerifyPeer);
+      SSL_CTX_set_verify(d_->openssl_ctx_,
+                         SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
+                         TlsOpenSslPrivate::OpensslVerifyPeer);
    } else {
       SSL_CTX_set_verify(d_->openssl_ctx_,
                          SSL_VERIFY_NONE,
@@ -277,8 +278,8 @@ TlsOpenSsl::~TlsOpenSsl()
  * OpenSSL has already performed internal certificate verification.
  * We just report any errors that occured.
  */
-int OpensslVerifyPeer(int ok, X509_STORE_CTX *store)
-{
+int TlsOpenSslPrivate::OpensslVerifyPeer(int ok, X509_STORE_CTX *store)
+{  /* static */
    if (!ok) {
       X509 *cert = X509_STORE_CTX_get_current_cert(store);
       int depth = X509_STORE_CTX_get_error_depth(store);