diff options
| author | lloyd <[email protected]> | 2012-04-19 00:01:16 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2012-04-19 00:01:16 +0000 |
| commit | 82246a67d00088e02137095af72d6104d76408dc (patch) | |
| tree | ab766faecacdc020f37df07e243730ecaffe196a /src | |
| parent | a8c026b7299d748b2e94f136377d6f46d4cb5da2 (diff) | |
Various dependency/amalgamation fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/credentials/info.txt | 5 | ||||
| -rw-r--r-- | src/tls/info.txt | 2 | ||||
| -rw-r--r-- | src/tls/sessions_sqlite/tls_sqlite_sess_mgr.h | 4 | ||||
| -rw-r--r-- | src/tls/tls_session.h | 4 | ||||
| -rw-r--r-- | src/tls/tls_session_manager.h | 4 |
5 files changed, 13 insertions, 6 deletions
diff --git a/src/credentials/info.txt b/src/credentials/info.txt index f6dcdd64d..689c4f1ae 100644 --- a/src/credentials/info.txt +++ b/src/credentials/info.txt @@ -1 +1,6 @@ define CREDENTIALS_MANAGER + +<requires> +x509cert +x509store +</requires> diff --git a/src/tls/info.txt b/src/tls/info.txt index 77ffb4585..6b309cdfc 100644 --- a/src/tls/info.txt +++ b/src/tls/info.txt @@ -70,6 +70,8 @@ tls_version.cpp aes arc4 asn1 +camellia +cbc credentials des dh diff --git a/src/tls/sessions_sqlite/tls_sqlite_sess_mgr.h b/src/tls/sessions_sqlite/tls_sqlite_sess_mgr.h index 7ac2caeb2..57e5a58f6 100644 --- a/src/tls/sessions_sqlite/tls_sqlite_sess_mgr.h +++ b/src/tls/sessions_sqlite/tls_sqlite_sess_mgr.h @@ -5,8 +5,8 @@ * Released under the terms of the Botan license */ -#ifndef TLS_SQLITE_SESSION_MANAGER_H__ -#define TLS_SQLITE_SESSION_MANAGER_H__ +#ifndef BOTAN_TLS_SQLITE_SESSION_MANAGER_H__ +#define BOTAN_TLS_SQLITE_SESSION_MANAGER_H__ #include <botan/tls_session_manager.h> #include <botan/rng.h> diff --git a/src/tls/tls_session.h b/src/tls/tls_session.h index 9a3c242a8..290ee6dcc 100644 --- a/src/tls/tls_session.h +++ b/src/tls/tls_session.h @@ -5,8 +5,8 @@ * Released under the terms of the Botan license */ -#ifndef TLS_SESSION_STATE_H__ -#define TLS_SESSION_STATE_H__ +#ifndef BOTAN_TLS_SESSION_STATE_H__ +#define BOTAN_TLS_SESSION_STATE_H__ #include <botan/x509cert.h> #include <botan/tls_version.h> diff --git a/src/tls/tls_session_manager.h b/src/tls/tls_session_manager.h index 3a39bf50e..bb0524a52 100644 --- a/src/tls/tls_session_manager.h +++ b/src/tls/tls_session_manager.h @@ -5,8 +5,8 @@ * Released under the terms of the Botan license */ -#ifndef TLS_SESSION_MANAGER_H__ -#define TLS_SESSION_MANAGER_H__ +#ifndef BOTAN_TLS_SESSION_MANAGER_H__ +#define BOTAN_TLS_SESSION_MANAGER_H__ #include <botan/tls_session.h> #include <map> |