Merge pull request #752 from tls-attacker/f2mLoopFix

Fix for F2m loop bug

Author: ic0ns

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/crypto/ec/EllipticCurveOverF2m.java

@@ -209,6 +209,10 @@ public Point createAPointOnCurve(BigInteger x) {
      * @return      The result z for the quadratic equation or null if non-existent
      */
     public FieldElementF2m solveQuadraticEquation(FieldElement beta) {
+        if (beta.getData().equals(BigInteger.ZERO)) {
+            return new FieldElementF2m(BigInteger.ONE, beta.getModulus());
+        }
+
         FieldElementF2m gamma;
         FieldElementF2m z;
         Random randNum = new Random(0);

TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/crypto/ec/PointFormatterTest.java

@@ -101,7 +101,7 @@ public void compressionFormatTest() {
             ArrayConverter.hexStringToByteArray("0300D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F");
         byte[] sect233r1Base =
             ArrayConverter.hexStringToByteArray("0300FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B");
-        byte[] secp571k1Base = ArrayConverter.hexStringToByteArray(
+        byte[] sect571k1Base = ArrayConverter.hexStringToByteArray(
             "02026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972");
 
         byte[] compressed = PointFormatter.formatToByteArray(NamedGroup.SECP160R1,
@@ -126,6 +126,6 @@ public void compressionFormatTest() {
 
         compressed = PointFormatter.formatToByteArray(NamedGroup.SECT571K1,
             CurveFactory.getCurve(NamedGroup.SECT571K1).getBasePoint(), ECPointFormat.ANSIX962_COMPRESSED_CHAR2);
-        assertArrayEquals(secp571k1Base, compressed);
+        assertArrayEquals(sect571k1Base, compressed);
     }
 }