1 files changed, 39 insertions, 4 deletions

diff --git a/base64.cpp b/base64.cpp
index 7571f2b8..8289c0c3 100644
--- a/base64.cpp
+++ b/base64.cpp
@@ -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 &parameters)
@@ -18,7 +23,24 @@ void Base64Encoder::IsolatedInitialize(const NameValuePairs &parameters)
 	
 	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 &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::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;