diff options
author | Jeffrey Walton <noloader@gmail.com> | 2015-07-01 21:06:29 -0400 |
---|---|---|
committer | Jeffrey Walton <noloader@gmail.com> | 2015-07-01 21:06:29 -0400 |
commit | ea75b3ae5fabc1c5a01a71ab395ac99a4946c818 (patch) | |
tree | 239f1e4f6224a5ddb944afff2be5d63a7d62895b /base64.cpp | |
parent | 99ed4c86dbccdafc1d1af73b2135aa7546905514 (diff) | |
download | cryptopp-git-ea75b3ae5fabc1c5a01a71ab395ac99a4946c818.tar.gz |
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
Diffstat (limited to 'base64.cpp')
-rw-r--r-- | base64.cpp | 43 |
1 files changed, 39 insertions, 4 deletions
@@ -5,8 +5,13 @@ NAMESPACE_BEGIN(CryptoPP) -static const byte s_vec[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + +// Base64 +static const byte s_vec1[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; +// Base64URL +static const byte s_vec2[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"; static const byte s_padding = '='; void Base64Encoder::IsolatedInitialize(const NameValuePairs ¶meters) @@ -18,7 +23,24 @@ void Base64Encoder::IsolatedInitialize(const NameValuePairs ¶meters) m_filter->Initialize(CombinedNameValuePairs( 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 ¶meters) +{ + 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::GroupSize(), insertLineBreaks ? maxLineLength : 0) (Name::Separator(), ConstByteArrayParameter(lineBreak)) @@ -30,10 +52,23 @@ const int *Base64Decoder::GetDecodingLookupArray() { static volatile bool s_initialized = false; static int s_array[256]; + + if (!s_initialized) + { + 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_vec, 64, false); + InitializeDecodingLookupArray(s_array, s_vec2, 64, false); s_initialized = true; } return s_array; |