Skip to content

Fix mac mismatch block #9

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix mac mismatch block #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions src/librespot/crypto/shannon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package crypto
import (
"bytes"
"encoding/binary"
"errors"
"io"
"librespot/connection"
"log"
"sync"
)

Expand Down Expand Up @@ -111,7 +111,7 @@ func (s *shannonStream) FinishSend() (err error) {
return
}

func (s *shannonStream) finishRecv() {
func (s *shannonStream) finishRecv() error {
count := 4

mac := make([]byte, count)
Expand All @@ -121,13 +121,14 @@ func (s *shannonStream) finishRecv() {
shn_finish(&s.recvCipher, mac2, count)

if !bytes.Equal(mac, mac2) {
log.Println("received mac doesn't match")
return errors.New("received mac doesn't match")
}

s.recvNonce += 1
nonce := make([]uint8, 4)
binary.BigEndian.PutUint32(nonce, s.recvNonce)
shn_nonce(&s.recvCipher, nonce, len(nonce))
return nil
}

func (s *shannonStream) RecvPacket() (cmd uint8, buf []byte, err error) {
Expand All @@ -151,7 +152,7 @@ func (s *shannonStream) RecvPacket() (cmd uint8, buf []byte, err error) {
buf = s.Decrypt(buf)

}
s.finishRecv()
err = s.finishRecv()

return cmd, buf, err
}