Skip to content

bpo-35557 - Allow base64.b16decode() to accept lowercase hexadecimal characters by default #11285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

bpo-35557 - Allow base64.b16decode() to accept lowercase hexadecimal characters by default #11285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b59eb0c
Refactor base64.b16decode() to accept hexadecimal strings with lowerc…
Dec 21, 2018
a9103cb
Revise tests in test_base64.py since there is no longer a second argu…
Dec 21, 2018
d71d2f3
Revise the `b16.decode` docstring
Dec 22, 2018
dc2589c
Remove RFC reference
Dec 22, 2018
23b5853
Remove superfluous whitespace in base64.b16decode() docstring
Dec 23, 2018
7c36ad2
Remove unneeded whitespace in the base64.b16decode() docstring betwee…
Dec 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions Lib/base64.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,29 +241,20 @@ def b32decode(s, casefold=False, map01=None):
return bytes(decoded)


# RFC 3548, Base 16 Alphabet specifies uppercase, but hexlify() returns
# lowercase. The RFC also recommends against accepting input case
# insensitively.
def b16encode(s):
"""Encode the bytes-like object s using Base16 and return a bytes object.
"""
return binascii.hexlify(s).upper()


def b16decode(s, casefold=False):
def b16decode(s):
"""Decode the Base16 encoded bytes-like object or ASCII string s.

Optional casefold is a flag specifying whether a lowercase alphabet is
acceptable as input. For security purposes, the default is False.

The result is returned as a bytes object. A binascii.Error is raised if
The result is returned as a bytes object. A binascii.Error is raised if
s is incorrectly padded or if there are non-alphabet characters present
in the input.
"""
s = _bytes_from_decode_data(s)
if casefold:
s = s.upper()
if re.search(b'[^0-9A-F]', s):
if re.search(b'[^0-9A-Fa-f]', s):
raise binascii.Error('Non-base16 digit found')
return binascii.unhexlify(s)

Expand Down
12 changes: 3 additions & 9 deletions Lib/test/test_base64.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,21 +373,15 @@ def test_b16decode(self):
eq(base64.b16decode('0102ABCDEF'), b'\x01\x02\xab\xcd\xef')
eq(base64.b16decode(b'00'), b'\x00')
eq(base64.b16decode('00'), b'\x00')
# Lower case is not allowed without a flag
self.assertRaises(binascii.Error, base64.b16decode, b'0102abcdef')
self.assertRaises(binascii.Error, base64.b16decode, '0102abcdef')
# Case fold
eq(base64.b16decode(b'0102abcdef', True), b'\x01\x02\xab\xcd\xef')
eq(base64.b16decode('0102abcdef', True), b'\x01\x02\xab\xcd\xef')
# Non-bytes
self.check_other_types(base64.b16decode, b"0102ABCDEF",
b'\x01\x02\xab\xcd\xef')
self.check_decode_type_errors(base64.b16decode)
eq(base64.b16decode(bytearray(b"0102abcdef"), True),
eq(base64.b16decode(bytearray(b"0102abcdef")),
b'\x01\x02\xab\xcd\xef')
eq(base64.b16decode(memoryview(b"0102abcdef"), True),
eq(base64.b16decode(memoryview(b"0102abcdef")),
b'\x01\x02\xab\xcd\xef')
eq(base64.b16decode(array('B', b"0102abcdef"), True),
eq(base64.b16decode(array('B', b"0102abcdef")),
b'\x01\x02\xab\xcd\xef')
# Non-alphabet characters
self.assertRaises(binascii.Error, base64.b16decode, '0102AG')
Expand Down