CRYPTOPP 5.6.3 RC6 checkin

1 files changed, 37 insertions, 36 deletions

diff --git a/hex.h b/hex.h
index 006914c5..6f1d5e1f 100644
--- a/hex.h
+++ b/hex.h
@@ -1,36 +1,37 @@
-#ifndef CRYPTOPP_HEX_H
-#define CRYPTOPP_HEX_H
-
-#include "basecode.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! Converts given data to base 16
-class CRYPTOPP_DLL HexEncoder : public SimpleProxyFilter
-{
-public:
-	HexEncoder(BufferedTransformation *attachment = NULL, bool uppercase = true, int outputGroupSize = 0, const std::string &separator = ":", const std::string &terminator = "")
-		: SimpleProxyFilter(new BaseN_Encoder(new Grouper), attachment)
-	{
-		IsolatedInitialize(MakeParameters(Name::Uppercase(), uppercase)(Name::GroupSize(), outputGroupSize)(Name::Separator(), ConstByteArrayParameter(separator))(Name::Terminator(), ConstByteArrayParameter(terminator)));
-	}
-
-	void IsolatedInitialize(const NameValuePairs &parameters);
-};
-
-//! Decode base 16 data back to bytes
-class CRYPTOPP_DLL HexDecoder : public BaseN_Decoder
-{
-public:
-	HexDecoder(BufferedTransformation *attachment = NULL)
-		: BaseN_Decoder(GetDefaultDecodingLookupArray(), 4, attachment) {}
-
-	void IsolatedInitialize(const NameValuePairs &parameters);
-
-private:
-	static const int * CRYPTOPP_API GetDefaultDecodingLookupArray();
-};
-
-NAMESPACE_END
-
-#endif
+#ifndef CRYPTOPP_HEX_H

+#define CRYPTOPP_HEX_H

+

+#include "cryptlib.h"

+#include "basecode.h"

+

+NAMESPACE_BEGIN(CryptoPP)

+

+//! Converts given data to base 16

+class CRYPTOPP_DLL HexEncoder : public SimpleProxyFilter

+{

+public:

+	HexEncoder(BufferedTransformation *attachment = NULL, bool uppercase = true, int outputGroupSize = 0, const std::string &separator = ":", const std::string &terminator = "")

+		: SimpleProxyFilter(new BaseN_Encoder(new Grouper), attachment)

+	{

+		IsolatedInitialize(MakeParameters(Name::Uppercase(), uppercase)(Name::GroupSize(), outputGroupSize)(Name::Separator(), ConstByteArrayParameter(separator))(Name::Terminator(), ConstByteArrayParameter(terminator)));

+	}

+

+	void IsolatedInitialize(const NameValuePairs &parameters);

+};

+

+//! Decode base 16 data back to bytes

+class CRYPTOPP_DLL HexDecoder : public BaseN_Decoder

+{

+public:

+	HexDecoder(BufferedTransformation *attachment = NULL)

+		: BaseN_Decoder(GetDefaultDecodingLookupArray(), 4, attachment) {}

+

+	void IsolatedInitialize(const NameValuePairs &parameters);

+

+private:

+	static const int * CRYPTOPP_API GetDefaultDecodingLookupArray();

+};

+

+NAMESPACE_END

+

+#endif