arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added Base64URLEncoder and decoder for web safe alphabet from RFC 4648, Section 5. Discussion at https://groups.google.com/d/msg/cryptopp-users/OF5RPXW-cHw/EDrOuA4-rRYJ

reviewable/pr7/r1
Jeffrey Walton 2015-07-01 21:06:29 -04:00
parent 99ed4c86db
commit ea75b3ae5f
2 changed files with 73 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
base64.cpp
View File

@ -5,8 +5,13 @@
NAMESPACE_BEGIN(CryptoPP) NAMESPACE_BEGIN(CryptoPP)
static const byte s_vec[] =
// Base64
static const byte s_vec1[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
// Base64URL
static const byte s_vec2[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
static const byte s_padding = '='; static const byte s_padding = '=';
void Base64Encoder::IsolatedInitialize(const NameValuePairs &parameters) void Base64Encoder::IsolatedInitialize(const NameValuePairs &parameters)
@ -18,7 +23,24 @@ void Base64Encoder::IsolatedInitialize(const NameValuePairs &parameters)
m_filter->Initialize(CombinedNameValuePairs( m_filter->Initialize(CombinedNameValuePairs(
parameters, parameters,
MakeParameters(Name::EncodingLookupArray(), &s_vec[0], false) MakeParameters(Name::EncodingLookupArray(), &s_vec1[0], false)
(Name::PaddingByte(), s_padding)
(Name::GroupSize(), insertLineBreaks ? maxLineLength : 0)
(Name::Separator(), ConstByteArrayParameter(lineBreak))
(Name::Terminator(), ConstByteArrayParameter(lineBreak))
(Name::Log2Base(), 6, true)));
}
void Base64URLEncoder::IsolatedInitialize(const NameValuePairs &parameters)
{
bool insertLineBreaks = parameters.GetValueWithDefault(Name::InsertLineBreaks(), true);
int maxLineLength = parameters.GetIntValueWithDefault(Name::MaxLineLength(), 72);
const char *lineBreak = insertLineBreaks ? "\n" : "";
m_filter->Initialize(CombinedNameValuePairs(
parameters,
MakeParameters(Name::EncodingLookupArray(), &s_vec2[0], false)
(Name::PaddingByte(), s_padding) (Name::PaddingByte(), s_padding)
(Name::GroupSize(), insertLineBreaks ? maxLineLength : 0) (Name::GroupSize(), insertLineBreaks ? maxLineLength : 0)
(Name::Separator(), ConstByteArrayParameter(lineBreak)) (Name::Separator(), ConstByteArrayParameter(lineBreak))
@ -33,7 +55,20 @@ const int *Base64Decoder::GetDecodingLookupArray()
if (!s_initialized) if (!s_initialized)
{ {
InitializeDecodingLookupArray(s_array, s_vec, 64, false); InitializeDecodingLookupArray(s_array, s_vec1, 64, false);
s_initialized = true;
}
return s_array;
}
const int *Base64URLDecoder::GetDecodingLookupArray()
{
static volatile bool s_initialized = false;
static int s_array[256];
if (!s_initialized)
{
InitializeDecodingLookupArray(s_array, s_vec2, 64, false);
s_initialized = true; s_initialized = true;
} }
return s_array; return s_array;

29
base64.h
View File

@ -6,6 +6,7 @@
NAMESPACE_BEGIN(CryptoPP) NAMESPACE_BEGIN(CryptoPP)
//! Base64 Encoder Class //! Base64 Encoder Class
// https://tools.ietf.org/html/rfc4648#section-4
class Base64Encoder : public SimpleProxyFilter class Base64Encoder : public SimpleProxyFilter
{ {
public: public:
@ -19,6 +20,7 @@ public:
}; };
//! Base64 Decoder Class //! Base64 Decoder Class
// https://tools.ietf.org/html/rfc4648#section-4
class Base64Decoder : public BaseN_Decoder class Base64Decoder : public BaseN_Decoder
{ {
public: public:
@ -31,6 +33,33 @@ private:
static const int * CRYPTOPP_API GetDecodingLookupArray(); static const int * CRYPTOPP_API GetDecodingLookupArray();
}; };
//! Base64 URL Encoder Class
// https://tools.ietf.org/html/rfc4648#section-5
class Base64URLEncoder : public SimpleProxyFilter
{
public:
Base64URLEncoder(BufferedTransformation *attachment = NULL, bool insertLineBreaks = false, int maxLineLength = -1)
: SimpleProxyFilter(new BaseN_Encoder(new Grouper), attachment)
{
IsolatedInitialize(MakeParameters(Name::InsertLineBreaks(), insertLineBreaks)(Name::MaxLineLength(), maxLineLength));
}
void IsolatedInitialize(const NameValuePairs &parameters);
};
//! Base64 URL Decoder Class
class Base64URLDecoder : public BaseN_Decoder
{
public:
Base64URLDecoder(BufferedTransformation *attachment = NULL)
: BaseN_Decoder(GetDecodingLookupArray(), 6, attachment) {}
void IsolatedInitialize(const NameValuePairs &parameters) {}
private:
static const int * CRYPTOPP_API GetDecodingLookupArray();
};
NAMESPACE_END NAMESPACE_END
#endif #endif