diff options
| -rw-r--r-- | src/constructs/passhash/passhash9.cpp | 2 | ||||
| -rw-r--r-- | src/filters/b64_filt/b64_filt.cpp (renamed from src/filters/base64/base64.cpp) | 2 | ||||
| -rw-r--r-- | src/filters/b64_filt/b64_filt.h (renamed from src/filters/base64/base64.h) | 0 | ||||
| -rw-r--r-- | src/filters/b64_filt/info.txt (renamed from src/filters/base64/info.txt) | 2 | ||||
| -rw-r--r-- | src/filters/filters.h | 4 | ||||
| -rw-r--r-- | src/wrap/perl-xs/Botan.xs | 4 |
6 files changed, 6 insertions, 8 deletions
diff --git a/src/constructs/passhash/passhash9.cpp b/src/constructs/passhash/passhash9.cpp index a3dcba82d..e5f379052 100644 --- a/src/constructs/passhash/passhash9.cpp +++ b/src/constructs/passhash/passhash9.cpp @@ -9,7 +9,7 @@ #include <botan/loadstor.h> #include <botan/libstate.h> #include <botan/pbkdf2.h> -#include <botan/base64.h> +#include <botan/b64_filt.h> #include <botan/pipe.h> namespace Botan { diff --git a/src/filters/base64/base64.cpp b/src/filters/b64_filt/b64_filt.cpp index b3d897f09..080848d18 100644 --- a/src/filters/base64/base64.cpp +++ b/src/filters/b64_filt/b64_filt.cpp @@ -5,7 +5,7 @@ * Distributed under the terms of the Botan license */ -#include <botan/base64.h> +#include <botan/b64_filt.h> #include <botan/charset.h> #include <botan/exceptn.h> #include <algorithm> diff --git a/src/filters/base64/base64.h b/src/filters/b64_filt/b64_filt.h index ae5fa26ce..ae5fa26ce 100644 --- a/src/filters/base64/base64.h +++ b/src/filters/b64_filt/b64_filt.h diff --git a/src/filters/base64/info.txt b/src/filters/b64_filt/info.txt index 93671739d..8fff2f181 100644 --- a/src/filters/base64/info.txt +++ b/src/filters/b64_filt/info.txt @@ -1,4 +1,4 @@ -define BASE64_CODEC +define BASE64_FILTER <requires> filters diff --git a/src/filters/filters.h b/src/filters/filters.h index 060b1d6d0..49c04e430 100644 --- a/src/filters/filters.h +++ b/src/filters/filters.h @@ -20,8 +20,8 @@ #include <botan/scan_name.h> -#if defined(BOTAN_HAS_BASE64_CODEC) - #include <botan/base64.h> +#if defined(BOTAN_HAS_BASE64_FILTER) + #include <botan/b64_filt.h> #endif #if defined(BOTAN_HAS_HEX_FILTER) diff --git a/src/wrap/perl-xs/Botan.xs b/src/wrap/perl-xs/Botan.xs index 5268a96d1..fc0c00ff5 100644 --- a/src/wrap/perl-xs/Botan.xs +++ b/src/wrap/perl-xs/Botan.xs @@ -12,9 +12,7 @@ extern "C" { #include <botan/asn1_obj.h> #include <botan/asn1_oid.h> -#include <botan/base64.h> -#include <botan/basefilt.h> -#include <botan/hex_filt.h> +#include <botan/filters.h> #include <botan/init.h> #include <botan/oids.h> #include <botan/x509cert.h> |