Skip to content
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

x/crypto/bcrypt: use base64.NoPadding #194

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+31 −26
Open

x/crypto/bcrypt: use base64.NoPadding #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8add495
x/crypto/bcrypt: use base64.NoPadding
AlexanderYastrebov Oct 17, 2021
88fceb2
add test for input encoded without padding
AlexanderYastrebov Oct 18, 2021
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 bcrypt/base64.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,15 @@ import "encoding/base64"

const alphabet = "./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"

var bcEncoding = base64.NewEncoding(alphabet)
var bcEncoding = base64.NewEncoding(alphabet).WithPadding(base64.NoPadding)

func base64Encode(src []byte) []byte {
n := bcEncoding.EncodedLen(len(src))
dst := make([]byte, n)
dst := make([]byte, bcEncoding.EncodedLen(len(src)))
bcEncoding.Encode(dst, src)
for dst[n-1] == '=' {
n--
}
return dst[:n]
return dst
}

func base64Decode(src []byte) ([]byte, error) {
numOfEquals := 4 - (len(src) % 4)
for i := 0; i < numOfEquals; i++ {
src = append(src, '=')
}

dst := make([]byte, bcEncoding.DecodedLen(len(src)))
n, err := bcEncoding.Decode(dst, src)
if err != nil {
Expand Down
42 changes: 28 additions & 14 deletions bcrypt/bcrypt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,22 +107,36 @@ func TestInvalidHashErrors(t *testing.T) {
}

func TestUnpaddedBase64Encoding(t *testing.T) {
original := []byte{101, 201, 101, 75, 19, 227, 199, 20, 239, 236, 133, 32, 30, 109, 243, 30}
encodedOriginal := []byte("XajjQvNhvvRt5GSeFk1xFe")

encoded := base64Encode(original)

if !bytes.Equal(encodedOriginal, encoded) {
t.Errorf("Encoded %v should have equaled %v", encoded, encodedOriginal)
}
for _, tc := range []struct {
original []byte
encodedOriginal []byte
}{
{
original: []byte{101, 201, 101, 75, 19, 227, 199, 20, 239, 236, 133, 32, 30, 109, 243, 30},
encodedOriginal: []byte("XajjQvNhvvRt5GSeFk1xFe"),
},
{
original: []byte("length multiple of three encodes without padding"),
encodedOriginal: []byte("ZETsX1PmGEzzZFPnaEvjGE7kGFPmakTjGETsW07iXVKeb0jyYE7zbA/uWUPiYU3l"),
},
} {
t.Run(string(tc.encodedOriginal), func(t *testing.T) {

encoded := base64Encode(tc.original)

if !bytes.Equal(tc.encodedOriginal, encoded) {
t.Errorf("Encoded %v should have equaled %v", encoded, tc.encodedOriginal)
}

decoded, err := base64Decode(encodedOriginal)
if err != nil {
t.Fatalf("base64Decode blew up: %s", err)
}
decoded, err := base64Decode(tc.encodedOriginal)
if err != nil {
t.Fatalf("base64Decode blew up: %s", err)
}

if !bytes.Equal(decoded, original) {
t.Errorf("Decoded %v should have equaled %v", decoded, original)
if !bytes.Equal(decoded, tc.original) {
t.Errorf("Decoded %v should have equaled %v", decoded, tc.original)
}
})
}
}

Expand Down