Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/research/qtuitest

1 files changed, 43 insertions, 0 deletions

diff --git a/botan/src/block/des/desx.cpp b/botan/src/block/des/desx.cpp
new file mode 100644
index 0000000..e557901
--- /dev/null
+++ b/botan/src/block/des/desx.cpp
@@ -0,0 +1,43 @@
+/*
+* DES
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#include <botan/desx.h>
+#include <botan/xor_buf.h>
+
+namespace Botan {
+
+/*
+* DESX Encryption
+*/
+void DESX::enc(const byte in[], byte out[]) const
+   {
+   xor_buf(out, in, K1.begin(), BLOCK_SIZE);
+   des.encrypt(out);
+   xor_buf(out, K2.begin(), BLOCK_SIZE);
+   }
+
+/*
+* DESX Decryption
+*/
+void DESX::dec(const byte in[], byte out[]) const
+   {
+   xor_buf(out, in, K2.begin(), BLOCK_SIZE);
+   des.decrypt(out);
+   xor_buf(out, K1.begin(), BLOCK_SIZE);
+   }
+
+/*
+* DESX Key Schedule
+*/
+void DESX::key_schedule(const byte key[], u32bit)
+   {
+   K1.copy(key, 8);
+   des.set_key(key + 8, 8);
+   K2.copy(key + 16, 8);
+   }
+
+}