teach/adlin
Archived
0
0
Fork 0
Code Issues 1 Pull Requests 4 Releases Activity

As PKey are smaller, fix disk test

Browse Source
This commit is contained in:
nemunaire 2022-03-02 00:40:35 +01:00
parent 4dff9c0062
commit 0a9bb806cd
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -17,7 +17,7 @@ token-validator/token-validator: token-validator/*.go
pkg/challenge: pkg/challenge/adlin pkg/challenge/issue pkg/challenge/init pkg/challenge: pkg/challenge/adlin pkg/challenge/issue pkg/challenge/init
$(LINUXKIT) pkg build --platforms linux/amd64 -org nemunaire pkg/challenge/ $(LINUXKIT) pkg build --platforms linux/amd64 -org nemunaire pkg/challenge/
challenge-initrd.img: challenge.yml subject/adlin.6.gz subject/adlin-TP1-topologie.png pkg/challenge pkg/shadow-up challenge-initrd.img: challenge.yml subject/adlin.6.gz subject/adlin-TP1-topologie.png pkg/challenge pkg/challenge/init pkg/shadow-up
$(LINUXKIT) build -docker $< $(LINUXKIT) build -docker $<

4
pkg/challenge/init
View File

@ -87,8 +87,8 @@ losetup -P "${LOOPDEV}" /dev/blk > /dev/null 2> /dev/null
mdev -s mdev -s
/sbin/mkfs.ext4 "${LOOPDEV}p1" > /dev/null 2> /dev/null /sbin/mkfs.ext4 "${LOOPDEV}p1" > /dev/null 2> /dev/null
mount "${LOOPDEV}p1" /mnt > /dev/null 2> /dev/null mount "${LOOPDEV}p1" /mnt > /dev/null 2> /dev/null
N1=$((72 - $RANDOM % 35)) N1=$((29 - $RANDOM % 25))
N2=$((25 + $RANDOM % 35)) N2=$((3 + $RANDOM % 25))
{ {
echo -n $N1 echo -n $N1
echo -n $N2 echo -n $N2

3
token-validator/challenge.go
View File

@ -197,6 +197,9 @@ func challengeDisk(s *adlin.Student, t *givenToken, chid int) error {
if n1+n2 > len(pkey) { if n1+n2 > len(pkey) {
n2 = len(pkey) - n1 n2 = len(pkey) - n1
} }
if n1+n2 < n1 {
return errors.New("This is not the expected token.")
}
expectedToken := sha512.Sum512([]byte(pkey[n1 : n1+n2])) expectedToken := sha512.Sum512([]byte(pkey[n1 : n1+n2]))