aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-09-19 21:15:15 -0400
committerJack Lloyd <[email protected]>2017-09-19 21:15:15 -0400
commit7687fd674b687552395e3de3546f6015c5d54594 (patch)
tree1ec7f7f4fb79c1cdf6b857813dc2868ec35ac0b6 /src
parent5ca8679dac547a66542b5acfb050043d95e37a97 (diff)
parentdf3e6466e56dc8bc272831425efbb6fc7172de06 (diff)
Merge GH #1215 Deprecate package transform
Diffstat (limited to 'src')
-rw-r--r--src/lib/misc/aont/package.h2
-rw-r--r--src/tests/test_package_transform.cpp6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/misc/aont/package.h b/src/lib/misc/aont/package.h
index d090e0725..8b2ed1b1f 100644
--- a/src/lib/misc/aont/package.h
+++ b/src/lib/misc/aont/package.h
@@ -22,6 +22,7 @@ namespace Botan {
* @param output the output data buffer (must be at least
* input_len + cipher->BLOCK_SIZE bytes long)
*/
+BOTAN_DEPRECATED("Possibly broken, avoid")
void BOTAN_DLL aont_package(RandomNumberGenerator& rng,
BlockCipher* cipher,
const uint8_t input[], size_t input_len,
@@ -35,6 +36,7 @@ void BOTAN_DLL aont_package(RandomNumberGenerator& rng,
* @param output the output data buffer (must be at least
* input_len - cipher->BLOCK_SIZE bytes long)
*/
+BOTAN_DEPRECATED("Possibly broken, avoid")
void BOTAN_DLL aont_unpackage(BlockCipher* cipher,
const uint8_t input[], size_t input_len,
uint8_t output[]);
diff --git a/src/tests/test_package_transform.cpp b/src/tests/test_package_transform.cpp
index 880f2ac50..e75ac7984 100644
--- a/src/tests/test_package_transform.cpp
+++ b/src/tests/test_package_transform.cpp
@@ -6,6 +6,8 @@
#include "tests.h"
+#define BOTAN_NO_DEPRECATED_WARNINGS
+
#if defined(BOTAN_HAS_PACKAGE_TRANSFORM)
#include <botan/package.h>
#endif
@@ -37,6 +39,8 @@ class Package_Transform_Tests : public Test
decoded.data());
result.test_eq("Package transform is reversible", decoded, input);
+#if 0
+ // Broken - https://github.com/randombit/botan/issues/825
output[0] ^= 1;
Botan::aont_unpackage(cipher->clone(),
output.data(), output.size(),
@@ -48,7 +52,7 @@ class Package_Transform_Tests : public Test
output.data(), output.size(),
decoded.data());
result.test_eq("Package transform is still reversible", decoded, input);
-
+#endif
// More tests including KATs would be useful for these functions
return std::vector<Test::Result> {result};