[misc] ed25519 update to 0.3.0

mariadb-corporation · Oct 18, 2023 · 6a77c87 · 6a77c87
1 parent 875d9f0
commit 6a77c87
Show file tree

Hide file tree

Showing 9 changed files with 294 additions and 110 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/plugin/authentication/standard/Ed25519PasswordPlugin.java b/src/main/java/org/mariadb/jdbc/plugin/authentication/standard/Ed25519PasswordPlugin.java
@@ -46,7 +46,7 @@ private static byte[] ed25519SignWithPassword(final String password, final byte[
       final byte[] sm = new byte[64 + mlen];
 
       byte[] az = hash.digest(bytePwd);
-      az[0] &= 248;
+      az[0] &= (byte) 248;
       az[31] &= 63;
       az[31] |= 64;
 

diff --git a/src/main/java/org/mariadb/jdbc/plugin/authentication/standard/ed25519/math/Curve.java b/src/main/java/org/mariadb/jdbc/plugin/authentication/standard/ed25519/math/Curve.java
@@ -19,6 +19,7 @@ public class Curve implements Serializable {
   private final GroupElement zeroP3PrecomputedDouble;
   private final GroupElement zeroPrecomp;
 
+  @SuppressWarnings({"this-escape"})
   public Curve(Field f, byte[] d, FieldElement I) {
     this.f = f;
     this.d = f.fromByteArray(d);
@@ -76,8 +77,7 @@ public int hashCode() {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (!(o instanceof Curve)) return false;
-    Curve c = (Curve) o;
+    if (!(o instanceof Curve c)) return false;
     return f.equals(c.getField()) && d.equals(c.getD()) && I.equals(c.getI());
   }
 }
diff --git a/src/main/java/org/mariadb/jdbc/plugin/authentication/standard/ed25519/math/Field.java b/src/main/java/org/mariadb/jdbc/plugin/authentication/standard/ed25519/math/Field.java
@@ -7,6 +7,7 @@
  *
  * @author str4d
  */
+@SuppressWarnings("all")
 public class Field implements Serializable {
   private static final long serialVersionUID = 8746587465875676L;
 
@@ -28,6 +29,7 @@ public class Field implements Serializable {
 
   private final Encoding enc;
 
+  @SuppressWarnings({"this-escape"})
   public Field(int b, byte[] q, Encoding enc) {
     this.b = b;
     this.enc = enc;
@@ -56,6 +58,18 @@ public int getb() {
     return b;
   }
 
+  public FieldElement getQ() {
+    return q;
+  }
+
+  public FieldElement getQm2() {
+    return qm2;
+  }
+
+  public FieldElement getQm5d8() {
+    return qm5d8;
+  }
+
   public Encoding getEncoding() {
     return enc;
   }