aboutsummaryrefslogtreecommitdiffstats
path: root/src/tls
diff options
context:
space:
mode:
authorlloyd <[email protected]>2013-06-05 00:11:07 +0000
committerlloyd <[email protected]>2013-06-05 00:11:07 +0000
commit398db82560040f25fff620c355b19fe3d4d45453 (patch)
tree8569aa36700485c3044c5ca60a636fe3fc48036e /src/tls
parent2e4a4e269d11fb27e71ff49b52d39e5c0ac9e9a1 (diff)
Move cryptobox/raw_key.cpp to new module cryptobox_psk which allows it
to be used in TLS without requiring pulling in CTR, Serpent, PBKDF2 and other code required by password-based cryptobox but not needed for TLS session encryption.
Diffstat (limited to 'src/tls')
-rw-r--r--src/tls/info.txt2
-rw-r--r--src/tls/tls_session.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tls/info.txt b/src/tls/info.txt
index 669dcc781..56fac8bd8 100644
--- a/src/tls/info.txt
+++ b/src/tls/info.txt
@@ -70,7 +70,7 @@ aes
asn1
cbc
credentials
-cryptobox
+cryptobox_psk
dh
ecdh
eme_pkcs
diff --git a/src/tls/tls_session.cpp b/src/tls/tls_session.cpp
index 9d869116c..6596804b5 100644
--- a/src/tls/tls_session.cpp
+++ b/src/tls/tls_session.cpp
@@ -10,7 +10,7 @@
#include <botan/ber_dec.h>
#include <botan/asn1_str.h>
#include <botan/pem.h>
-#include <botan/cryptobox.h>
+#include <botan/cryptobox_psk.h>
#include <memory>
namespace Botan {