From 7784c568432231c737c789b065af6b81e038c54d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Sun, 4 Dec 2016 22:17:37 +0100
Subject: Update the verify_certificate_chain code to work with botan >=
 1.11.34 as well

---
 louloulibs/network/credentials_manager.hpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'louloulibs/network/credentials_manager.hpp')

diff --git a/louloulibs/network/credentials_manager.hpp b/louloulibs/network/credentials_manager.hpp
index 7557372..29ee024 100644
--- a/louloulibs/network/credentials_manager.hpp
+++ b/louloulibs/network/credentials_manager.hpp
@@ -9,6 +9,18 @@
 
 class TCPSocketHandler;
 
+/**
+ * If the given cert isn’t valid, based on the given hostname
+ * and fingerprint, then throws the exception if it’s non-empty.
+ *
+ * Must be called after the standard (from Botan) way of
+ * checking the certificate, if we want to also accept certificates based
+ * on a trusted fingerprint.
+ */
+void check_tls_certificate(const std::vector<Botan::X509_Certificate>& certs,
+                           const std::string& hostname, const std::string& trusted_fingerprint,
+                           std::exception_ptr exc);
+
 class BasicCredentialsManager: public Botan::Credentials_Manager
 {
 public:
@@ -19,12 +31,15 @@ public:
   BasicCredentialsManager& operator=(const BasicCredentialsManager&) = delete;
   BasicCredentialsManager& operator=(BasicCredentialsManager&&) = delete;
 
+#if BOTAN_VERSION_CODE < BOTAN_VERSION_CODE_FOR(1,11,34)
   void verify_certificate_chain(const std::string& type,
                                 const std::string& purported_hostname,
                                 const std::vector<Botan::X509_Certificate>&) override final;
+#endif
   std::vector<Botan::Certificate_Store*> trusted_certificate_authorities(const std::string& type,
                                                                          const std::string& context) override final;
   void set_trusted_fingerprint(const std::string& fingerprint);
+  const std::string& get_trusted_fingerprint() const;
 
 private:
   const TCPSocketHandler* const socket_handler;
-- 
cgit v1.2.3


From 0ab40dc1ab4e689921da54080b135e1d22b1c586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Tue, 14 Mar 2017 21:45:23 +0100
Subject: Refactoring louloulibs and cmake

Use OBJECT libraries
Remove the louloulibs directory
Write FOUND variables in the cache
---
 louloulibs/network/credentials_manager.hpp | 55 ------------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 louloulibs/network/credentials_manager.hpp

(limited to 'louloulibs/network/credentials_manager.hpp')

diff --git a/louloulibs/network/credentials_manager.hpp b/louloulibs/network/credentials_manager.hpp
deleted file mode 100644
index 29ee024..0000000
--- a/louloulibs/network/credentials_manager.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#pragma once
-
-#include "louloulibs.h"
-
-#ifdef BOTAN_FOUND
-
-#include <botan/botan.h>
-#include <botan/tls_client.h>
-
-class TCPSocketHandler;
-
-/**
- * If the given cert isn’t valid, based on the given hostname
- * and fingerprint, then throws the exception if it’s non-empty.
- *
- * Must be called after the standard (from Botan) way of
- * checking the certificate, if we want to also accept certificates based
- * on a trusted fingerprint.
- */
-void check_tls_certificate(const std::vector<Botan::X509_Certificate>& certs,
-                           const std::string& hostname, const std::string& trusted_fingerprint,
-                           std::exception_ptr exc);
-
-class BasicCredentialsManager: public Botan::Credentials_Manager
-{
-public:
-  BasicCredentialsManager(const TCPSocketHandler* const socket_handler);
-
-  BasicCredentialsManager(BasicCredentialsManager&&) = delete;
-  BasicCredentialsManager(const BasicCredentialsManager&) = delete;
-  BasicCredentialsManager& operator=(const BasicCredentialsManager&) = delete;
-  BasicCredentialsManager& operator=(BasicCredentialsManager&&) = delete;
-
-#if BOTAN_VERSION_CODE < BOTAN_VERSION_CODE_FOR(1,11,34)
-  void verify_certificate_chain(const std::string& type,
-                                const std::string& purported_hostname,
-                                const std::vector<Botan::X509_Certificate>&) override final;
-#endif
-  std::vector<Botan::Certificate_Store*> trusted_certificate_authorities(const std::string& type,
-                                                                         const std::string& context) override final;
-  void set_trusted_fingerprint(const std::string& fingerprint);
-  const std::string& get_trusted_fingerprint() const;
-
-private:
-  const TCPSocketHandler* const socket_handler;
-
-  static bool try_to_open_one_ca_bundle(const std::vector<std::string>& paths);
-  static void load_certs();
-  static Botan::Certificate_Store_In_Memory certificate_store;
-  static bool certs_loaded;
-  std::string trusted_fingerprint;
-};
-
-#endif //BOTAN_FOUND
-
-- 
cgit v1.2.3