aboutsummaryrefslogtreecommitdiffstats
path: root/src/cmd
diff options
context:
space:
mode:
authorlloyd <[email protected]>2015-02-21 14:14:45 +0000
committerlloyd <[email protected]>2015-02-21 14:14:45 +0000
commit5ef7108d620a00ce5b2f6997c8b6ffc0708467d6 (patch)
tree670771c55dfb1e77e0783cd791355327ecdf1ef6 /src/cmd
parentee2ac0c46d0c76e04b0fa68f9bb73825b60a4b09 (diff)
Hide all uses of boost filesystem in fs.cpp. Use readdir as an
alternate implementation for Unix and add some feature checks so a boost-free build of the tests and command line are possible again.
Diffstat (limited to 'src/cmd')
-rw-r--r--src/cmd/credentials.h2
-rw-r--r--src/cmd/tls_proxy.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/credentials.h b/src/cmd/credentials.h
index b5ee701f3..e578b67a7 100644
--- a/src/cmd/credentials.h
+++ b/src/cmd/credentials.h
@@ -32,7 +32,7 @@ class Basic_Credentials_Manager : public Credentials_Manager
public:
Basic_Credentials_Manager()
{
-
+ load_certstores();
}
Basic_Credentials_Manager(RandomNumberGenerator& rng,
diff --git a/src/cmd/tls_proxy.cpp b/src/cmd/tls_proxy.cpp
index d162ec0aa..7afe27a3c 100644
--- a/src/cmd/tls_proxy.cpp
+++ b/src/cmd/tls_proxy.cpp
@@ -7,7 +7,7 @@
#include "apps.h"
-#if defined(BOTAN_HAS_TLS)
+#if defined(BOTAN_HAS_TLS) && defined(BOTAN_HAS_BOOST_ASIO)
#include <iostream>
#include <string>