Merge pull request USArmyResearchLab#35 from drewbrew/support-dos-eol

support DOS/Unix line endings in decode_base64()
elain · Feb 10, 2015 · 0e1dbb1 · 0e1dbb1
2 parents 3744b58 + 83139d4
commit 0e1dbb1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/util.py b/lib/util.py
@@ -43,7 +43,8 @@ def decode_base64(intext, alphabet='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqr
 
     outtext = ''
 
-    intext = intext.rstrip('\n')
+    # support DOS and Unix line endings
+    intext = intext.rstrip('\r\n')
 
     i = 0
     while i < len(intext) - 3: