Merge pull request #33 from jplomas/main

Revert to fix very old QRLLIB bug (of zero impact)
theQRL · Jul 1, 2024 · fd8be9a · fd8be9a
2 parents 4121b74 + b66ad15
commit fd8be9a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/xmss/descriptor.go b/xmss/descriptor.go
@@ -37,7 +37,7 @@ func NewQRLDescriptorFromBytes(descriptorBytes []uint8) *QRLDescriptor {
 
 	return &QRLDescriptor{
 		hashFunction:   HashFunction(descriptorBytes[0] & 0x0f),
-		signatureType:  common.SignatureType((descriptorBytes[0] >> 4) & 0xF0),
+		signatureType:  common.SignatureType((descriptorBytes[0] >> 4) & 0x0F),
 		height:         (descriptorBytes[1] & 0x0f) << 1,
 		addrFormatType: common.AddrFormatType((descriptorBytes[1] & 0xF0) >> 4),
 	}
@@ -50,7 +50,7 @@ func LegacyQRLDescriptorFromBytes(descriptorBytes []uint8) *QRLDescriptor {
 
 	return &QRLDescriptor{
 		hashFunction:   HashFunction(descriptorBytes[0] & 0x0f),
-		signatureType:  common.SignatureType((descriptorBytes[0] >> 4) & 0xF0),
+		signatureType:  common.SignatureType((descriptorBytes[0] >> 4) & 0x0F),
 		height:         (descriptorBytes[1] & 0x0f) << 1,
 		addrFormatType: common.AddrFormatType((descriptorBytes[1] & 0xF0) >> 4),
 	}

diff --git a/xmss/xmss_test.go b/xmss/xmss_test.go
@@ -58,8 +58,8 @@ func TestIsValidXMSSAddress2(t *testing.T) {
 	addr, _ := hex.DecodeString("2001430a5152fcc369c309caf3554bd3528161c8")
 	var address [20]uint8
 	copy(address[:], addr)
-	if !IsValidXMSSAddress(address) {
-		t.Errorf("Failed to flag invalid address")
+	if IsValidXMSSAddress(address) {
+		t.Errorf("Dilithium address passed the validXMSSAddress check")
 	}
 }