bsock-tls: moved tls-config stuff to tls_conf.cc/.h

bareos · Aug 16, 2018 · e02bbe9 · e02bbe9
1 parent 86bb678
commit e02bbe9
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 52 deletions.
diff --git a/core/src/lib/bsock.cc b/core/src/lib/bsock.cc
@@ -33,53 +33,6 @@
 #include "lib/util.h"
 #include "lib/tls_openssl.h"
 
-DLL_IMP_EXP uint32_t GetLocalTlsPolicyFromConfiguration(TlsResource *tls_configuration) {
-   uint32_t merged_policy = 0;
-
-#if defined(HAVE_TLS)
-   merged_policy = tls_configuration->tls_cert.GetPolicy() | tls_configuration->tls_psk.GetPolicy();
-   Dmsg1(100, "GetLocalTlsPolicyFromConfiguration: %u\n", merged_policy);
-#else
-   Dmsg1(100, "Ignore configuration no tls compiled in: %u\n", merged_policy);
-#endif
-   return merged_policy;
-}
-
-TlsBase *SelectTlsFromPolicy(
-   TlsResource *tls_configuration, uint32_t remote_policy) {
-
-   if ((tls_configuration->tls_cert.require && TlsCert::enabled(remote_policy))
-      || (tls_configuration->tls_cert.enable && TlsCert::required(remote_policy))) {
-      Dmsg0(100, "SelectTlsFromPolicy: take required cert\n");
-
-      // one requires the other accepts cert
-      return &(tls_configuration->tls_cert);
-   }
-   if ((tls_configuration->tls_psk.require && TlsPsk::enabled(remote_policy))
-      || (tls_configuration->tls_psk.enable && TlsPsk::required(remote_policy))) {
-
-      Dmsg0(100, "SelectTlsFromPolicy: take required  psk\n");
-      // one requires the other accepts psk
-      return &(tls_configuration->tls_psk);
-   }
-   if (tls_configuration->tls_cert.enable && TlsCert::enabled(remote_policy)) {
-
-      Dmsg0(100, "SelectTlsFromPolicy: take cert\n");
-      // both accept cert
-      return &(tls_configuration->tls_cert);
-   }
-   if (tls_configuration->tls_psk.enable && TlsPsk::enabled(remote_policy)) {
-
-      Dmsg0(100, "SelectTlsFromPolicy: take psk\n");
-      // both accept psk
-      return &(tls_configuration->tls_psk);
-   }
-
-   Dmsg0(100, "SelectTlsFromPolicy: take cleartext\n");
-   // fallback to cleartext
-   return nullptr;
-}
-
 BareosSocket::BareosSocket() : tls_conn(nullptr) {
    Dmsg0(100, "Contruct BareosSocket\n");
    fd_            = -1;

diff --git a/core/src/lib/bsock.h b/core/src/lib/bsock.h
@@ -45,11 +45,6 @@ class BareosSocket;
 btimer_t *StartBsockTimer(BareosSocket *bs, uint32_t wait);
 void StopBsockTimer(btimer_t *wid);
 
-uint32_t GetLocalTlsPolicyFromConfiguration(TlsResource *tls_configuration);
-
-
-TlsBase *SelectTlsFromPolicy(TlsResource *tls_configuration, uint32_t remote_policy);
-
 class DLL_IMP_EXP BareosSocket : public SmartAlloc {
 /*
  * Note, keep this public part before the private otherwise

diff --git a/core/src/lib/tls_conf.cc b/core/src/lib/tls_conf.cc
@@ -56,3 +56,50 @@ uint32_t TlsPsk::GetPolicy() const {
 
    return result << TlsPsk::policy_offset;
 }
+
+DLL_IMP_EXP uint32_t GetLocalTlsPolicyFromConfiguration(TlsResource *tls_configuration) {
+   uint32_t merged_policy = 0;
+
+#if defined(HAVE_TLS)
+   merged_policy = tls_configuration->tls_cert.GetPolicy() | tls_configuration->tls_psk.GetPolicy();
+   Dmsg1(100, "GetLocalTlsPolicyFromConfiguration: %u\n", merged_policy);
+#else
+   Dmsg1(100, "Ignore configuration no tls compiled in: %u\n", merged_policy);
+#endif
+   return merged_policy;
+}
+
+TlsBase *SelectTlsFromPolicy(
+   TlsResource *tls_configuration, uint32_t remote_policy) {
+
+   if ((tls_configuration->tls_cert.require && TlsCert::enabled(remote_policy))
+      || (tls_configuration->tls_cert.enable && TlsCert::required(remote_policy))) {
+      Dmsg0(100, "SelectTlsFromPolicy: take required cert\n");
+
+      // one requires the other accepts cert
+      return &(tls_configuration->tls_cert);
+   }
+   if ((tls_configuration->tls_psk.require && TlsPsk::enabled(remote_policy))
+      || (tls_configuration->tls_psk.enable && TlsPsk::required(remote_policy))) {
+
+      Dmsg0(100, "SelectTlsFromPolicy: take required  psk\n");
+      // one requires the other accepts psk
+      return &(tls_configuration->tls_psk);
+   }
+   if (tls_configuration->tls_cert.enable && TlsCert::enabled(remote_policy)) {
+
+      Dmsg0(100, "SelectTlsFromPolicy: take cert\n");
+      // both accept cert
+      return &(tls_configuration->tls_cert);
+   }
+   if (tls_configuration->tls_psk.enable && TlsPsk::enabled(remote_policy)) {
+
+      Dmsg0(100, "SelectTlsFromPolicy: take psk\n");
+      // both accept psk
+      return &(tls_configuration->tls_psk);
+   }
+
+   Dmsg0(100, "SelectTlsFromPolicy: take cleartext\n");
+   // fallback to cleartext
+   return nullptr;
+}
diff --git a/core/src/lib/tls_conf.h b/core/src/lib/tls_conf.h
@@ -206,4 +206,9 @@ class DLL_IMP_EXP TlsPsk : public TlsBase {
    static bool required(u_int32_t policy);
 };
 
+class TlsResource;
+
+uint32_t GetLocalTlsPolicyFromConfiguration(TlsResource *tls_configuration);
+TlsBase *SelectTlsFromPolicy(TlsResource *tls_configuration, uint32_t remote_policy);
+
 #endif //BAREOS_LIB_TLS_CONF_H_