Refactoring in xmss_sign

peterdettman · peterdettman · commit ffd00735728d · 2024-10-01T20:32:04.000+07:00
diff --git a/core/src/main/java/org/bouncycastle/pqc/crypto/slhdsa/HT.java b/core/src/main/java/org/bouncycastle/pqc/crypto/slhdsa/HT.java
@@ -132,11 +132,11 @@ SIG_XMSS xmss_sign(byte[] M, byte[] skSeed, int idx, byte[] pkSeed, ADRS paramAd
         // build authentication path
         for (int j = 0; j < engine.H_PRIME; j++)
         {
-            int k = (idx / (1 << j)) ^ 1;
-            AUTH[j] = treehash(skSeed, k * (1 << j), j, pkSeed, adrs);
+            int k = (idx >>> j) ^ 1;
+            AUTH[j] = treehash(skSeed, k << j, j, pkSeed, adrs);
         }
         adrs = new ADRS(paramAdrs);
-        adrs.setType(ADRS.WOTS_PK);
+        adrs.setType(ADRS.WOTS_HASH);
         adrs.setKeyPairAddress(idx);
 
         byte[] sig = wots.sign(M, skSeed, pkSeed, adrs);
diff --git a/core/src/main/java/org/bouncycastle/pqc/crypto/sphincsplus/HT.java b/core/src/main/java/org/bouncycastle/pqc/crypto/sphincsplus/HT.java
@@ -132,11 +132,11 @@ SIG_XMSS xmss_sign(byte[] M, byte[] skSeed, int idx, byte[] pkSeed, ADRS paramAd
         // build authentication path
         for (int j = 0; j < engine.H_PRIME; j++)
         {
-            int k = (idx / (1 << j)) ^ 1;
-            AUTH[j] = treehash(skSeed, k * (1 << j), j, pkSeed, adrs);
+            int k = (idx >>> j) ^ 1;
+            AUTH[j] = treehash(skSeed, k << j, j, pkSeed, adrs);
         }
         adrs = new ADRS(paramAdrs);
-        adrs.setType(ADRS.WOTS_PK);
+        adrs.setType(ADRS.WOTS_HASH);
         adrs.setKeyPairAddress(idx);
 
         byte[] sig = wots.sign(M, skSeed, pkSeed, adrs);

Original file line number	Diff line number	Diff line change
`@@ -132,11 +132,11 @@ SIG_XMSS xmss_sign(byte[] M, byte[] skSeed, int idx, byte[] pkSeed, ADRS paramAd`
`132`	`132`	`// build authentication path`
`133`	`133`	`for (int j = 0; j < engine.H_PRIME; j++)`
`134`	`134`	`{`
`135`		`- int k = (idx / (1 << j)) ^ 1;`
`136`		`- AUTH[j] = treehash(skSeed, k * (1 << j), j, pkSeed, adrs);`
	`135`	`+ int k = (idx >>> j) ^ 1;`
	`136`	`+ AUTH[j] = treehash(skSeed, k << j, j, pkSeed, adrs);`
`137`	`137`	`}`
`138`	`138`	`adrs = new ADRS(paramAdrs);`
`139`		`- adrs.setType(ADRS.WOTS_PK);`
	`139`	`+ adrs.setType(ADRS.WOTS_HASH);`
`140`	`140`	`adrs.setKeyPairAddress(idx);`
`141`	`141`
`142`	`142`	`byte[] sig = wots.sign(M, skSeed, pkSeed, adrs);`