commit a2b5fa140b648ebc57bdcd2e3b90f45a82df7553 Author: catbref Date: Wed May 16 11:46:44 2018 +0100 Initial stab at migrating to HSQLDB for Qora gen2 Most SQL tables defined but only payment transactions actually implemented. Maven support added. Some code imported from 'old' Qora: RIPEMD160 renamed as BrokenMD160 and deprecated. whispersystem's Ed25519 implementation (to be replaced with bouncycastle). Basic Account/PublicKeyAccount/PrivateKeyAccount code. Some utils like Base58 and Pair. To use: Use maven to fetch dependencies. Build project. Fire up an old-gen Qora node. Run src/test/update.java as a JUnit test to build DB structure. Run src/test/migrate.java as a JUnit test to migrate old Qora blocks to DB. You should now be able to run src/test/load.java and src/test/save.java as JUnit tests demonstrating loading/saving Transactions from/to database. This commit done while halfway through adding Block support! diff --git a/.classpath b/.classpath new file mode 100644 index 00000000..77e8068a --- /dev/null +++ b/.classpath @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..08aba977 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/db* +/bin/ +/target/ diff --git a/.project b/.project new file mode 100644 index 00000000..407e837c --- /dev/null +++ b/.project @@ -0,0 +1,23 @@ + + + Qora2 + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..672496e1 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,12 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..f897a7f1 --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..b44dacc8 --- /dev/null +++ b/pom.xml @@ -0,0 +1,46 @@ + + 4.0.0 + org.qora + qora-core + 0.0.1-SNAPSHOT + + src + + + maven-compiler-plugin + 3.5.1 + + 1.8 + 1.8 + + + + + + + org.hsqldb + hsqldb + 2.4.0 + + + com.googlecode.json-simple + json-simple + 1.1.1 + + + com.google.guava + guava + 25.0-jre + + + org.apache.logging.log4j + log4j-core + 2.11.0 + + + org.apache.logging.log4j + log4j-api + 2.11.0 + + + \ No newline at end of file diff --git a/src/database/DB.java b/src/database/DB.java new file mode 100644 index 00000000..0e4c3b0c --- /dev/null +++ b/src/database/DB.java @@ -0,0 +1,129 @@ +package database; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.math.BigDecimal; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Arrays; + +import com.google.common.primitives.Bytes; + +public class DB { + + public static void startTransaction(Connection c) throws SQLException { + c.prepareStatement("START TRANSACTION").execute(); + } + + public static void commit(Connection c) throws SQLException { + c.prepareStatement("COMMIT").execute(); + } + + public static void rollback(Connection c) throws SQLException { + c.prepareStatement("ROLLBACK").execute(); + } + + public static byte[] getResultSetBytes(InputStream inputStream, int length) { + if (inputStream == null) + return null; + + byte[] result = new byte[length]; + + try { + if (inputStream.read(result) == length) + return result; + } catch (IOException e) { + // Fall-through to return null + } + + return null; + } + + public static byte[] getResultSetBytes(InputStream inputStream) { + final int BYTE_BUFFER_LENGTH = 1024; + + if (inputStream == null) + return null; + + byte[] result = new byte[0]; + + while (true) { + try { + byte[] buffer = new byte[BYTE_BUFFER_LENGTH]; + int length = inputStream.read(buffer); + result = Bytes.concat(result, Arrays.copyOf(buffer, length)); + } catch (IOException e) { + // No more bytes + break; + } + } + + return result; + } + + public static String formatInsertWithPlaceholders(String table, String... columns) { + String[] placeholders = new String[columns.length]; + Arrays.setAll(placeholders, (int i) -> "?"); + + StringBuilder output = new StringBuilder(); + output.append("INSERT INTO "); + output.append(table); + output.append(" ("); + output.append(String.join(", ", columns)); + output.append(") VALUES ("); + output.append(String.join(", ", placeholders)); + output.append(") ON DUPLICATE KEY UPDATE "); + output.append(String.join("=?, ", columns)); + output.append("=?"); + return output.toString(); + } + + public static void bindInsertPlaceholders(PreparedStatement preparedStatement, Object... objects) throws SQLException { + // We need to bind two sets of placeholders based on this syntax: + // INSERT INTO table (column, ... ) VALUES (?, ...) ON DUPLICATE KEY UPDATE SET column=?, ... + for (int i = 0; i < objects.length; ++i) { + Object object = objects[i]; + + if (object instanceof BigDecimal) { + preparedStatement.setBigDecimal(i + 1, (BigDecimal) object); + preparedStatement.setBigDecimal(i + objects.length + 1, (BigDecimal) object); + } else { + preparedStatement.setObject(i + 1, object); + preparedStatement.setObject(i + objects.length + 1, object); + } + } + } + + /** + * Execute SQL using byte[] as 1st placeholder + *

+ * Typically used to fetch Blocks or Transactions using signature or reference. + *

+ * + * @param connection + * @param sql + * @param bytes + * @return ResultSet, or null if no matching rows found + * @throws SQLException + */ + public static ResultSet executeUsingBytes(Connection connection, String sql, byte[] bytes) throws SQLException { + PreparedStatement preparedStatement = connection.prepareStatement(sql); + preparedStatement.setBinaryStream(1, new ByteArrayInputStream(bytes)); + + if (!preparedStatement.execute()) + throw new SQLException("Fetching from database produced no results"); + + ResultSet rs = preparedStatement.getResultSet(); + if (rs == null) + throw new SQLException("Fetching results from database produced no ResultSet"); + + if (!rs.next()) + return null; + + return rs; + } + +} diff --git a/src/database/NoDataFoundException.java b/src/database/NoDataFoundException.java new file mode 100644 index 00000000..d63bec42 --- /dev/null +++ b/src/database/NoDataFoundException.java @@ -0,0 +1,11 @@ +package database; + +import java.sql.SQLException; + +@SuppressWarnings("serial") +public class NoDataFoundException extends SQLException { + + public NoDataFoundException() { + } + +} diff --git a/src/org/whispersystems/curve25519/java/Arrays.java b/src/org/whispersystems/curve25519/java/Arrays.java new file mode 100644 index 00000000..0291048f --- /dev/null +++ b/src/org/whispersystems/curve25519/java/Arrays.java @@ -0,0 +1,16 @@ +package org.whispersystems.curve25519.java; + +public class Arrays { + /** + * Assigns the specified byte value to each element of the specified array + * of bytes. + * + * @param a the array to be filled + * @param val the value to be stored in all elements of the array + */ + public static void fill(byte[] a, byte val) { + for (int i = 0, len = a.length; i < len; i++) + a[i] = val; + } + +} diff --git a/src/org/whispersystems/curve25519/java/Sha512.java b/src/org/whispersystems/curve25519/java/Sha512.java new file mode 100644 index 00000000..90ee796e --- /dev/null +++ b/src/org/whispersystems/curve25519/java/Sha512.java @@ -0,0 +1,7 @@ +package org.whispersystems.curve25519.java; + +public interface Sha512 { + + public void calculateDigest(byte[] out, byte[] in, long length); + +} diff --git a/src/org/whispersystems/curve25519/java/crypto_verify_32.java b/src/org/whispersystems/curve25519/java/crypto_verify_32.java new file mode 100644 index 00000000..aada88cc --- /dev/null +++ b/src/org/whispersystems/curve25519/java/crypto_verify_32.java @@ -0,0 +1,13 @@ +package org.whispersystems.curve25519.java; + +public class crypto_verify_32 { + + @SuppressWarnings("all") + public static int crypto_verify_32(byte[] x, byte[] y) { + int differentbits = 0; + for (int count = 0; count < 32; count++) { + differentbits |= (x[count] ^ y[count]); + } + return differentbits; + } +} diff --git a/src/org/whispersystems/curve25519/java/curve_sigs.java b/src/org/whispersystems/curve25519/java/curve_sigs.java new file mode 100644 index 00000000..81c6f37b --- /dev/null +++ b/src/org/whispersystems/curve25519/java/curve_sigs.java @@ -0,0 +1,114 @@ +package org.whispersystems.curve25519.java; + +public class curve_sigs { + + public static void curve25519_keygen(byte[] curve25519_pubkey_out, + byte[] curve25519_privkey_in) + { + ge_p3 ed = new ge_p3(); /* Ed25519 pubkey point */ + //int[] ed_y = new int[10]; + int[] ed_y_plus_one = new int[10]; + int[] one_minus_ed_y = new int[10]; + int[] inv_one_minus_ed_y = new int[10]; + int[] mont_x = new int[10]; + + /* Perform a fixed-base multiplication of the Edwards base point, + (which is efficient due to precalculated tables), then convert + to the Curve25519 montgomery-format public key. In particular, + convert Curve25519's "montgomery" x-coordinate into an Ed25519 + "edwards" y-coordinate: + + mont_x = (ed_y + 1) / (1 - ed_y) + + with projective coordinates: + + mont_x = (ed_y + ed_z) / (ed_z - ed_y) + + NOTE: ed_y=1 is converted to mont_x=0 since fe_invert is mod-exp + */ + + ge_scalarmult_base.ge_scalarmult_base(ed, curve25519_privkey_in); + fe_add.fe_add(ed_y_plus_one, ed.Y, ed.Z); + fe_sub.fe_sub(one_minus_ed_y, ed.Z, ed.Y); + fe_invert.fe_invert(inv_one_minus_ed_y, one_minus_ed_y); + fe_mul.fe_mul(mont_x, ed_y_plus_one, inv_one_minus_ed_y); + fe_tobytes.fe_tobytes(curve25519_pubkey_out, mont_x); + } + + public static int curve25519_sign(Sha512 sha512provider, byte[] signature_out, + byte[] curve25519_privkey, + byte[] msg, int msg_len, + byte[] random) + { + ge_p3 ed_pubkey_point = new ge_p3(); /* Ed25519 pubkey point */ + byte[] ed_pubkey = new byte[32]; /* Ed25519 encoded pubkey */ + byte[] sigbuf = new byte[msg_len + 128]; /* working buffer */ + byte sign_bit = 0; + + /* Convert the Curve25519 privkey to an Ed25519 public key */ + ge_scalarmult_base.ge_scalarmult_base(ed_pubkey_point, curve25519_privkey); + ge_p3_tobytes.ge_p3_tobytes(ed_pubkey, ed_pubkey_point); + sign_bit = (byte)(ed_pubkey[31] & 0x80); + + /* Perform an Ed25519 signature with explicit private key */ + sign_modified.crypto_sign_modified(sha512provider, sigbuf, msg, msg_len, curve25519_privkey, + ed_pubkey, random); + System.arraycopy(sigbuf, 0, signature_out, 0, 64); + + /* Encode the sign bit into signature (in unused high bit of S) */ + signature_out[63] &= 0x7F; /* bit should be zero already, but just in case */ + signature_out[63] |= sign_bit; + return 0; + } + + public static int curve25519_verify(Sha512 sha512provider, byte[] signature, + byte[] curve25519_pubkey, + byte[] msg, int msg_len) + { + int[] mont_x = new int[10]; + int[] mont_x_minus_one = new int[10]; + int[] mont_x_plus_one = new int[10]; + int[] inv_mont_x_plus_one = new int[10]; + int[] one = new int[10]; + int[] ed_y = new int[10]; + byte[] ed_pubkey = new byte[32]; + long some_retval = 0; + byte[] verifybuf = new byte[msg_len + 64]; /* working buffer */ + byte[] verifybuf2 = new byte[msg_len + 64]; /* working buffer #2 */ + + /* Convert the Curve25519 public key into an Ed25519 public key. In + particular, convert Curve25519's "montgomery" x-coordinate into an + Ed25519 "edwards" y-coordinate: + + ed_y = (mont_x - 1) / (mont_x + 1) + + NOTE: mont_x=-1 is converted to ed_y=0 since fe_invert is mod-exp + + Then move the sign bit into the pubkey from the signature. + */ + + fe_frombytes.fe_frombytes(mont_x, curve25519_pubkey); + fe_1.fe_1(one); + fe_sub.fe_sub(mont_x_minus_one, mont_x, one); + fe_add.fe_add(mont_x_plus_one, mont_x, one); + fe_invert.fe_invert(inv_mont_x_plus_one, mont_x_plus_one); + fe_mul.fe_mul(ed_y, mont_x_minus_one, inv_mont_x_plus_one); + fe_tobytes.fe_tobytes(ed_pubkey, ed_y); + + /* Copy the sign bit, and remove it from signature */ + ed_pubkey[31] &= 0x7F; /* bit should be zero already, but just in case */ + ed_pubkey[31] |= (signature[63] & 0x80); + System.arraycopy(signature, 0, verifybuf, 0, 64); + verifybuf[63] &= 0x7F; + + System.arraycopy(msg, 0, verifybuf, 64, (int)msg_len); + + /* Then perform a normal Ed25519 verification, return 0 on success */ + /* The below call has a strange API: */ + /* verifybuf = R || S || message */ + /* verifybuf2 = java to next call gets a copy of verifybuf, S gets + replaced with pubkey for hashing, then the whole thing gets zeroized + (if bad sig), or contains a copy of msg (good sig) */ + return open.crypto_sign_open(sha512provider, verifybuf2, some_retval, verifybuf, 64 + msg_len, ed_pubkey); + } +} diff --git a/src/org/whispersystems/curve25519/java/fe_0.java b/src/org/whispersystems/curve25519/java/fe_0.java new file mode 100644 index 00000000..a5f38afe --- /dev/null +++ b/src/org/whispersystems/curve25519/java/fe_0.java @@ -0,0 +1,27 @@ +package org.whispersystems.curve25519.java; + +public class fe_0 { + +//CONVERT #include "fe.h" + +/* +h = 0 +*/ + +@SuppressWarnings("all") +public static void fe_0(int[] h) +{ + h[0] = 0; + h[1] = 0; + h[2] = 0; + h[3] = 0; + h[4] = 0; + h[5] = 0; + h[6] = 0; + h[7] = 0; + h[8] = 0; + h[9] = 0; +} + + +} diff --git a/src/org/whispersystems/curve25519/java/fe_1.java b/src/org/whispersystems/curve25519/java/fe_1.java new file mode 100644 index 00000000..357e80cf --- /dev/null +++ b/src/org/whispersystems/curve25519/java/fe_1.java @@ -0,0 +1,27 @@ +package org.whispersystems.curve25519.java; + +public class fe_1 { + +//CONVERT #include "fe.h" + +/* +h = 1 +*/ + +@SuppressWarnings("all") +public static void fe_1(int[] h) +{ + h[0] = 1; + h[1] = 0; + h[2] = 0; + h[3] = 0; + h[4] = 0; + h[5] = 0; + h[6] = 0; + h[7] = 0; + h[8] = 0; + h[9] = 0; +} + + +} diff --git a/src/org/whispersystems/curve25519/java/fe_add.java b/src/org/whispersystems/curve25519/java/fe_add.java new file mode 100644 index 00000000..831cdf70 --- /dev/null +++ b/src/org/whispersystems/curve25519/java/fe_add.java @@ -0,0 +1,65 @@ +package org.whispersystems.curve25519.java; + +public class fe_add { + +//CONVERT #include "fe.h" + +/* +h = f + g +Can overlap h with f or g. + +Preconditions: + |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. + |g| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. + +Postconditions: + |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc. +*/ + +@SuppressWarnings("all") +public static void fe_add(int[] h,int[] f,int[] g) +{ + int f0 = f[0]; + int f1 = f[1]; + int f2 = f[2]; + int f3 = f[3]; + int f4 = f[4]; + int f5 = f[5]; + int f6 = f[6]; + int f7 = f[7]; + int f8 = f[8]; + int f9 = f[9]; + int g0 = g[0]; + int g1 = g[1]; + int g2 = g[2]; + int g3 = g[3]; + int g4 = g[4]; + int g5 = g[5]; + int g6 = g[6]; + int g7 = g[7]; + int g8 = g[8]; + int g9 = g[9]; + int h0 = f0 + g0; + int h1 = f1 + g1; + int h2 = f2 + g2; + int h3 = f3 + g3; + int h4 = f4 + g4; + int h5 = f5 + g5; + int h6 = f6 + g6; + int h7 = f7 + g7; + int h8 = f8 + g8; + int h9 = f9 + g9; + h[0] = (int)h0; + h[1] = (int)h1; + h[2] = (int)h2; + h[3] = (int)h3; + h[4] = (int)h4; + h[5] = (int)h5; + h[6] = (int)h6; + h[7] = (int)h7; + h[8] = (int)h8; + h[9] = (int)h9; +} + + +} diff --git a/src/org/whispersystems/curve25519/java/fe_cmov.java b/src/org/whispersystems/curve25519/java/fe_cmov.java new file mode 100644 index 00000000..e6519d67 --- /dev/null +++ b/src/org/whispersystems/curve25519/java/fe_cmov.java @@ -0,0 +1,71 @@ +package org.whispersystems.curve25519.java; + +public class fe_cmov { + +//CONVERT #include "fe.h" + +/* +Replace (f,g) with (g,g) if b == 1; +replace (f,g) with (f,g) if b == 0. + +Preconditions: b in {0,1}. +*/ + +@SuppressWarnings("all") +public static void fe_cmov(int[] f,int[] g,int b) +{ + int f0 = f[0]; + int f1 = f[1]; + int f2 = f[2]; + int f3 = f[3]; + int f4 = f[4]; + int f5 = f[5]; + int f6 = f[6]; + int f7 = f[7]; + int f8 = f[8]; + int f9 = f[9]; + int g0 = g[0]; + int g1 = g[1]; + int g2 = g[2]; + int g3 = g[3]; + int g4 = g[4]; + int g5 = g[5]; + int g6 = g[6]; + int g7 = g[7]; + int g8 = g[8]; + int g9 = g[9]; + int x0 = f0 ^ g0; + int x1 = f1 ^ g1; + int x2 = f2 ^ g2; + int x3 = f3 ^ g3; + int x4 = f4 ^ g4; + int x5 = f5 ^ g5; + int x6 = f6 ^ g6; + int x7 = f7 ^ g7; + int x8 = f8 ^ g8; + int x9 = f9 ^ g9; + b = -b; + x0 &= b; + x1 &= b; + x2 &= b; + x3 &= b; + x4 &= b; + x5 &= b; + x6 &= b; + x7 &= b; + x8 &= b; + x9 &= b; + f[0] = f0 ^ x0; + f[1] = f1 ^ x1; + f[2] = f2 ^ x2; + f[3] = f3 ^ x3; + f[4] = f4 ^ x4; + f[5] = f5 ^ x5; + f[6] = f6 ^ x6; + f[7] = f7 ^ x7; + f[8] = f8 ^ x8; + f[9] = f9 ^ x9; +} + + +} diff --git a/src/org/whispersystems/curve25519/java/fe_copy.java b/src/org/whispersystems/curve25519/java/fe_copy.java new file mode 100644 index 00000000..c999f5aa --- /dev/null +++ b/src/org/whispersystems/curve25519/java/fe_copy.java @@ -0,0 +1,37 @@ +package org.whispersystems.curve25519.java; + +public class fe_copy { + +//CONVERT #include "fe.h" + +/* +h = f +*/ + +@SuppressWarnings("all") +public static void fe_copy(int[] h,int[] f) +{ + int f0 = f[0]; + int f1 = f[1]; + int f2 = f[2]; + int f3 = f[3]; + int f4 = f[4]; + int f5 = f[5]; + int f6 = f[6]; + int f7 = f[7]; + int f8 = f[8]; + int f9 = f[9]; + h[0] = f0; + h[1] = f1; + h[2] = f2; + h[3] = f3; + h[4] = f4; + h[5] = f5; + h[6] = f6; + h[7] = f7; + h[8] = f8; + h[9] = f9; +} + + +} diff --git a/src/org/whispersystems/curve25519/java/fe_cswap.java b/src/org/whispersystems/curve25519/java/fe_cswap.java new file mode 100644 index 00000000..fe8a0d20 --- /dev/null +++ b/src/org/whispersystems/curve25519/java/fe_cswap.java @@ -0,0 +1,83 @@ +package org.whispersystems.curve25519.java; + +public class fe_cswap { + +//CONVERT #include +//CONVERT #include "fe.h" + +/* +Replace (f,g) with (g,f) if b == 1; +replace (f,g) with (f,g) if b == 0. + +Preconditions: b in {0,1}. +*/ + +@SuppressWarnings("all") +public static void fe_cswap(int[] f,int[] g,int b) +{ + int f0 = f[0]; + int f1 = f[1]; + int f2 = f[2]; + int f3 = f[3]; + int f4 = f[4]; + int f5 = f[5]; + int f6 = f[6]; + int f7 = f[7]; + int f8 = f[8]; + int f9 = f[9]; + int g0 = g[0]; + int g1 = g[1]; + int g2 = g[2]; + int g3 = g[3]; + int g4 = g[4]; + int g5 = g[5]; + int g6 = g[6]; + int g7 = g[7]; + int g8 = g[8]; + int g9 = g[9]; + int x0 = f0 ^ g0; + int x1 = f1 ^ g1; + int x2 = f2 ^ g2; + int x3 = f3 ^ g3; + int x4 = f4 ^ g4; + int x5 = f5 ^ g5; + int x6 = f6 ^ g6; + int x7 = f7 ^ g7; + int x8 = f8 ^ g8; + int x9 = f9 ^ g9; + b = -b; + x0 &= b; + x1 &= b; + x2 &= b; + x3 &= b; + x4 &= b; + x5 &= b; + x6 &= b; + x7 &= b; + x8 &= b; + x9 &= b; + f[0] = f0 ^ x0; + f[1] = f1 ^ x1; + f[2] = f2 ^ x2; + f[3] = f3 ^ x3; + f[4] = f4 ^ x4; + f[5] = f5 ^ x5; + f[6] = f6 ^ x6; + f[7] = f7 ^ x7; + f[8] = f8 ^ x8; + f[9] = f9 ^ x9; + g[0] = g0 ^ x0; + g[1] = g1 ^ x1; + g[2] = g2 ^ x2; + g[3] = g3 ^ x3; + g[4] = g4 ^ x4; + g[5] = g5 ^ x5; + g[6] = g6 ^ x6; + g[7] = g7 ^ x7; + g[8] = g8 ^ x8; + g[9] = g9 ^ x9; +} + + + +} diff --git a/src/org/whispersystems/curve25519/java/fe_frombytes.java b/src/org/whispersystems/curve25519/java/fe_frombytes.java new file mode 100644 index 00000000..3d09d133 --- /dev/null +++ b/src/org/whispersystems/curve25519/java/fe_frombytes.java @@ -0,0 +1,81 @@ +package org.whispersystems.curve25519.java; + +public class fe_frombytes { + +//CONVERT #include "fe.h" +//CONVERT #include "long.h" +//CONVERT #include "long.h" + +public static long load_3(byte[] in, int index) +{ + long result; + result = ((long) in[index + 0]) & 0xFF; + result |= (((long) in[index + 1]) << 8) & 0xFF00; + result |= (((long) in[index + 2]) << 16) & 0xFF0000; + return result; +} + +public static long load_4(byte[] in, int index) +{ + long result; + result = (((long) in[index + 0]) & 0xFF); + result |= ((((long) in[index + 1]) << 8) & 0xFF00); + result |= ((((long) in[index + 2]) << 16) & 0xFF0000); + result |= ((((long) in[index + 3]) << 24) & 0xFF000000L); + return result; +} + +/* +Ignores top bit of h. +*/ + +@SuppressWarnings("all") +public static void fe_frombytes(int[] h,byte[] s) +{ + long h0 = load_4(s, 0); + long h1 = load_3(s, 4) << 6; + long h2 = load_3(s, 7) << 5; + long h3 = load_3(s, 10) << 3; + long h4 = load_3(s, 13) << 2; + long h5 = load_4(s, 16); + long h6 = load_3(s, 20) << 7; + long h7 = load_3(s, 23) << 5; + long h8 = load_3(s, 26) << 4; + long h9 = (load_3(s, 29) & 8388607) << 2; + long carry0; + long carry1; + long carry2; + long carry3; + long carry4; + long carry5; + long carry6; + long carry7; + long carry8; + long carry9; + + carry9 = (h9 + (long) (1<<24)) >> 25; h0 += carry9 * 19; h9 -= carry9 << 25; + carry1 = (h1 + (long) (1<<24)) >> 25; h2 += carry1; h1 -= carry1 << 25; + carry3 = (h3 + (long) (1<<24)) >> 25; h4 += carry3; h3 -= carry3 << 25; + carry5 = (h5 + (long) (1<<24)) >> 25; h6 += carry5; h5 -= carry5 << 25; + carry7 = (h7 + (long) (1<<24)) >> 25; h8 += carry7; h7 -= carry7 << 25; + + carry0 = (h0 + (long) (1<<25)) >> 26; h1 += carry0; h0 -= carry0 << 26; + carry2 = (h2 + (long) (1<<25)) >> 26; h3 += carry2; h2 -= carry2 << 26; + carry4 = (h4 + (long) (1<<25)) >> 26; h5 += carry4; h4 -= carry4 << 26; + carry6 = (h6 + (long) (1<<25)) >> 26; h7 += carry6; h6 -= carry6 << 26; + carry8 = (h8 + (long) (1<<25)) >> 26; h9 += carry8; h8 -= carry8 << 26; + + h[0] = (int)h0; + h[1] = (int)h1; + h[2] = (int)h2; + h[3] = (int)h3; + h[4] = (int)h4; + h[5] = (int)h5; + h[6] = (int)h6; + h[7] = (int)h7; + h[8] = (int)h8; + h[9] = (int)h9; +} + + +} diff --git a/src/org/whispersystems/curve25519/java/fe_invert.java b/src/org/whispersystems/curve25519/java/fe_invert.java new file mode 100644 index 00000000..4e65382b --- /dev/null +++ b/src/org/whispersystems/curve25519/java/fe_invert.java @@ -0,0 +1,182 @@ +package org.whispersystems.curve25519.java; + +public class fe_invert { + +//CONVERT #include "fe.h" + +@SuppressWarnings("all") +public static void fe_invert(int[] out,int[] z) +{ + int[] t0 = new int[10]; + int[] t1 = new int[10]; + int[] t2 = new int[10]; + int[] t3 = new int[10]; + int i; + +//CONVERT #include "pow225521.h" + +/* qhasm: fe z1 */ + +/* qhasm: fe z2 */ + +/* qhasm: fe z8 */ + +/* qhasm: fe z9 */ + +/* qhasm: fe z11 */ + +/* qhasm: fe z22 */ + +/* qhasm: fe z_5_0 */ + +/* qhasm: fe z_10_5 */ + +/* qhasm: fe z_10_0 */ + +/* qhasm: fe z_20_10 */ + +/* qhasm: fe z_20_0 */ + +/* qhasm: fe z_40_20 */ + +/* qhasm: fe z_40_0 */ + +/* qhasm: fe z_50_10 */ + +/* qhasm: fe z_50_0 */ + +/* qhasm: fe z_100_50 */ + +/* qhasm: fe z_100_0 */ + +/* qhasm: fe z_200_100 */ + +/* qhasm: fe z_200_0 */ + +/* qhasm: fe z_250_50 */ + +/* qhasm: fe z_250_0 */ + +/* qhasm: fe z_255_5 */ + +/* qhasm: fe z_255_21 */ + +/* qhasm: enter pow225521 */ + +/* qhasm: z2 = z1^2^1 */ +/* asm 1: fe_sq.fe_sq(>z2=fe#1,z2=fe#1,>z2=fe#1); */ +/* asm 2: fe_sq.fe_sq(>z2=t0,z2=t0,>z2=t0); */ +fe_sq.fe_sq(t0,z); for (i = 1;i < 1;++i) fe_sq.fe_sq(t0,t0); + +/* qhasm: z8 = z2^2^2 */ +/* asm 1: fe_sq.fe_sq(>z8=fe#2,z8=fe#2,>z8=fe#2); */ +/* asm 2: fe_sq.fe_sq(>z8=t1,z8=t1,>z8=t1); */ +fe_sq.fe_sq(t1,t0); for (i = 1;i < 2;++i) fe_sq.fe_sq(t1,t1); + +/* qhasm: z9 = z1*z8 */ +/* asm 1: fe_mul.fe_mul(>z9=fe#2,z9=t1,z11=fe#1,z11=t0,z22=fe#3,z22=fe#3,>z22=fe#3); */ +/* asm 2: fe_sq.fe_sq(>z22=t2,z22=t2,>z22=t2); */ +fe_sq.fe_sq(t2,t0); for (i = 1;i < 1;++i) fe_sq.fe_sq(t2,t2); + +/* qhasm: z_5_0 = z9*z22 */ +/* asm 1: fe_mul.fe_mul(>z_5_0=fe#2,z_5_0=t1,z_10_5=fe#3,z_10_5=fe#3,>z_10_5=fe#3); */ +/* asm 2: fe_sq.fe_sq(>z_10_5=t2,z_10_5=t2,>z_10_5=t2); */ +fe_sq.fe_sq(t2,t1); for (i = 1;i < 5;++i) fe_sq.fe_sq(t2,t2); + +/* qhasm: z_10_0 = z_10_5*z_5_0 */ +/* asm 1: fe_mul.fe_mul(>z_10_0=fe#2,z_10_0=t1,z_20_10=fe#3,z_20_10=fe#3,>z_20_10=fe#3); */ +/* asm 2: fe_sq.fe_sq(>z_20_10=t2,z_20_10=t2,>z_20_10=t2); */ +fe_sq.fe_sq(t2,t1); for (i = 1;i < 10;++i) fe_sq.fe_sq(t2,t2); + +/* qhasm: z_20_0 = z_20_10*z_10_0 */ +/* asm 1: fe_mul.fe_mul(>z_20_0=fe#3,z_20_0=t2,z_40_20=fe#4,z_40_20=fe#4,>z_40_20=fe#4); */ +/* asm 2: fe_sq.fe_sq(>z_40_20=t3,z_40_20=t3,>z_40_20=t3); */ +fe_sq.fe_sq(t3,t2); for (i = 1;i < 20;++i) fe_sq.fe_sq(t3,t3); + +/* qhasm: z_40_0 = z_40_20*z_20_0 */ +/* asm 1: fe_mul.fe_mul(>z_40_0=fe#3,z_40_0=t2,z_50_10=fe#3,z_50_10=fe#3,>z_50_10=fe#3); */ +/* asm 2: fe_sq.fe_sq(>z_50_10=t2,z_50_10=t2,>z_50_10=t2); */ +fe_sq.fe_sq(t2,t2); for (i = 1;i < 10;++i) fe_sq.fe_sq(t2,t2); + +/* qhasm: z_50_0 = z_50_10*z_10_0 */ +/* asm 1: fe_mul.fe_mul(>z_50_0=fe#2,z_50_0=t1,z_100_50=fe#3,z_100_50=fe#3,>z_100_50=fe#3); */ +/* asm 2: fe_sq.fe_sq(>z_100_50=t2,z_100_50=t2,>z_100_50=t2); */ +fe_sq.fe_sq(t2,t1); for (i = 1;i < 50;++i) fe_sq.fe_sq(t2,t2); + +/* qhasm: z_100_0 = z_100_50*z_50_0 */ +/* asm 1: fe_mul.fe_mul(>z_100_0=fe#3,z_100_0=t2,z_200_100=fe#4,z_200_100=fe#4,>z_200_100=fe#4); */ +/* asm 2: fe_sq.fe_sq(>z_200_100=t3,z_200_100=t3,>z_200_100=t3); */ +fe_sq.fe_sq(t3,t2); for (i = 1;i < 100;++i) fe_sq.fe_sq(t3,t3); + +/* qhasm: z_200_0 = z_200_100*z_100_0 */ +/* asm 1: fe_mul.fe_mul(>z_200_0=fe#3,z_200_0=t2,z_250_50=fe#3,z_250_50=fe#3,>z_250_50=fe#3); */ +/* asm 2: fe_sq.fe_sq(>z_250_50=t2,z_250_50=t2,>z_250_50=t2); */ +fe_sq.fe_sq(t2,t2); for (i = 1;i < 50;++i) fe_sq.fe_sq(t2,t2); + +/* qhasm: z_250_0 = z_250_50*z_50_0 */ +/* asm 1: fe_mul.fe_mul(>z_250_0=fe#2,z_250_0=t1,z_255_5=fe#2,z_255_5=fe#2,>z_255_5=fe#2); */ +/* asm 2: fe_sq.fe_sq(>z_255_5=t1,z_255_5=t1,>z_255_5=t1); */ +fe_sq.fe_sq(t1,t1); for (i = 1;i < 5;++i) fe_sq.fe_sq(t1,t1); + +/* qhasm: z_255_21 = z_255_5*z11 */ +/* asm 1: fe_mul.fe_mul(>z_255_21=fe#12,z_255_21=out,> 26; h1 += carry0; h0 -= carry0 << 26; + carry4 = (h4 + (long) (1<<25)) >> 26; h5 += carry4; h4 -= carry4 << 26; + /* |h0| <= 2^25 */ + /* |h4| <= 2^25 */ + /* |h1| <= 1.71*2^59 */ + /* |h5| <= 1.71*2^59 */ + + carry1 = (h1 + (long) (1<<24)) >> 25; h2 += carry1; h1 -= carry1 << 25; + carry5 = (h5 + (long) (1<<24)) >> 25; h6 += carry5; h5 -= carry5 << 25; + /* |h1| <= 2^24; from now on fits into int32 */ + /* |h5| <= 2^24; from now on fits into int32 */ + /* |h2| <= 1.41*2^60 */ + /* |h6| <= 1.41*2^60 */ + + carry2 = (h2 + (long) (1<<25)) >> 26; h3 += carry2; h2 -= carry2 << 26; + carry6 = (h6 + (long) (1<<25)) >> 26; h7 += carry6; h6 -= carry6 << 26; + /* |h2| <= 2^25; from now on fits into int32 unchanged */ + /* |h6| <= 2^25; from now on fits into int32 unchanged */ + /* |h3| <= 1.71*2^59 */ + /* |h7| <= 1.71*2^59 */ + + carry3 = (h3 + (long) (1<<24)) >> 25; h4 += carry3; h3 -= carry3 << 25; + carry7 = (h7 + (long) (1<<24)) >> 25; h8 += carry7; h7 -= carry7 << 25; + /* |h3| <= 2^24; from now on fits into int32 unchanged */ + /* |h7| <= 2^24; from now on fits into int32 unchanged */ + /* |h4| <= 1.72*2^34 */ + /* |h8| <= 1.41*2^60 */ + + carry4 = (h4 + (long) (1<<25)) >> 26; h5 += carry4; h4 -= carry4 << 26; + carry8 = (h8 + (long) (1<<25)) >> 26; h9 += carry8; h8 -= carry8 << 26; + /* |h4| <= 2^25; from now on fits into int32 unchanged */ + /* |h8| <= 2^25; from now on fits into int32 unchanged */ + /* |h5| <= 1.01*2^24 */ + /* |h9| <= 1.71*2^59 */ + + carry9 = (h9 + (long) (1<<24)) >> 25; h0 += carry9 * 19; h9 -= carry9 << 25; + /* |h9| <= 2^24; from now on fits into int32 unchanged */ + /* |h0| <= 1.1*2^39 */ + + carry0 = (h0 + (long) (1<<25)) >> 26; h1 += carry0; h0 -= carry0 << 26; + /* |h0| <= 2^25; from now on fits into int32 unchanged */ + /* |h1| <= 1.01*2^24 */ + + h[0] = (int)h0; + h[1] = (int)h1; + h[2] = (int)h2; + h[3] = (int)h3; + h[4] = (int)h4; + h[5] = (int)h5; + h[6] = (int)h6; + h[7] = (int)h7; + h[8] = (int)h8; + h[9] = (int)h9; +} + + +} diff --git a/src/org/whispersystems/curve25519/java/fe_mul121666.java b/src/org/whispersystems/curve25519/java/fe_mul121666.java new file mode 100644 index 00000000..98f28609 --- /dev/null +++ b/src/org/whispersystems/curve25519/java/fe_mul121666.java @@ -0,0 +1,78 @@ +package org.whispersystems.curve25519.java; + +public class fe_mul121666 { + +//CONVERT #include "fe.h" +//CONVERT #include "long.h" + +/* +h = f * 121666 +Can overlap h with f. + +Preconditions: + |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc. + +Postconditions: + |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. +*/ + +@SuppressWarnings("all") +public static void fe_mul121666(int[] h,int[] f) +{ + int f0 = f[0]; + int f1 = f[1]; + int f2 = f[2]; + int f3 = f[3]; + int f4 = f[4]; + int f5 = f[5]; + int f6 = f[6]; + int f7 = f[7]; + int f8 = f[8]; + int f9 = f[9]; + long h0 = f0 * (long) 121666; + long h1 = f1 * (long) 121666; + long h2 = f2 * (long) 121666; + long h3 = f3 * (long) 121666; + long h4 = f4 * (long) 121666; + long h5 = f5 * (long) 121666; + long h6 = f6 * (long) 121666; + long h7 = f7 * (long) 121666; + long h8 = f8 * (long) 121666; + long h9 = f9 * (long) 121666; + long carry0; + long carry1; + long carry2; + long carry3; + long carry4; + long carry5; + long carry6; + long carry7; + long carry8; + long carry9; + + carry9 = (h9 + (long) (1<<24)) >> 25; h0 += carry9 * 19; h9 -= carry9 << 25; + carry1 = (h1 + (long) (1<<24)) >> 25; h2 += carry1; h1 -= carry1 << 25; + carry3 = (h3 + (long) (1<<24)) >> 25; h4 += carry3; h3 -= carry3 << 25; + carry5 = (h5 + (long) (1<<24)) >> 25; h6 += carry5; h5 -= carry5 << 25; + carry7 = (h7 + (long) (1<<24)) >> 25; h8 += carry7; h7 -= carry7 << 25; + + carry0 = (h0 + (long) (1<<25)) >> 26; h1 += carry0; h0 -= carry0 << 26; + carry2 = (h2 + (long) (1<<25)) >> 26; h3 += carry2; h2 -= carry2 << 26; + carry4 = (h4 + (long) (1<<25)) >> 26; h5 += carry4; h4 -= carry4 << 26; + carry6 = (h6 + (long) (1<<25)) >> 26; h7 += carry6; h6 -= carry6 << 26; + carry8 = (h8 + (long) (1<<25)) >> 26; h9 += carry8; h8 -= carry8 << 26; + + h[0] = (int)h0; + h[1] = (int)h1; + h[2] = (int)h2; + h[3] = (int)h3; + h[4] = (int)h4; + h[5] = (int)h5; + h[6] = (int)h6; + h[7] = (int)h7; + h[8] = (int)h8; + h[9] = (int)h9; +} + + +} diff --git a/src/org/whispersystems/curve25519/java/fe_neg.java b/src/org/whispersystems/curve25519/java/fe_neg.java new file mode 100644 index 00000000..1d185fb9 --- /dev/null +++ b/src/org/whispersystems/curve25519/java/fe_neg.java @@ -0,0 +1,53 @@ +package org.whispersystems.curve25519.java; + +public class fe_neg { + +//CONVERT #include "fe.h" + +/* +h = -f + +Preconditions: + |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. + +Postconditions: + |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. +*/ + +@SuppressWarnings("all") +public static void fe_neg(int[] h,int[] f) +{ + int f0 = f[0]; + int f1 = f[1]; + int f2 = f[2]; + int f3 = f[3]; + int f4 = f[4]; + int f5 = f[5]; + int f6 = f[6]; + int f7 = f[7]; + int f8 = f[8]; + int f9 = f[9]; + int h0 = -f0; + int h1 = -f1; + int h2 = -f2; + int h3 = -f3; + int h4 = -f4; + int h5 = -f5; + int h6 = -f6; + int h7 = -f7; + int h8 = -f8; + int h9 = -f9; + h[0] = (int)h0; + h[1] = (int)h1; + h[2] = (int)h2; + h[3] = (int)h3; + h[4] = (int)h4; + h[5] = (int)h5; + h[6] = (int)h6; + h[7] = (int)h7; + h[8] = (int)h8; + h[9] = (int)h9; +} + + +} diff --git a/src/org/whispersystems/curve25519/java/fe_pow22523.java b/src/org/whispersystems/curve25519/java/fe_pow22523.java new file mode 100644 index 00000000..e39104ba --- /dev/null +++ b/src/org/whispersystems/curve25519/java/fe_pow22523.java @@ -0,0 +1,181 @@ +package org.whispersystems.curve25519.java; + +public class fe_pow22523 { + +//CONVERT #include "fe.h" + +@SuppressWarnings("all") +public static void fe_pow22523(int[] out,int[] z) +{ + int[] t0 = new int[10]; + int[] t1 = new int[10]; + int[] t2 = new int[10]; + int i; + +//CONVERT #include "pow22523.h" + +/* qhasm: fe z1 */ + +/* qhasm: fe z2 */ + +/* qhasm: fe z8 */ + +/* qhasm: fe z9 */ + +/* qhasm: fe z11 */ + +/* qhasm: fe z22 */ + +/* qhasm: fe z_5_0 */ + +/* qhasm: fe z_10_5 */ + +/* qhasm: fe z_10_0 */ + +/* qhasm: fe z_20_10 */ + +/* qhasm: fe z_20_0 */ + +/* qhasm: fe z_40_20 */ + +/* qhasm: fe z_40_0 */ + +/* qhasm: fe z_50_10 */ + +/* qhasm: fe z_50_0 */ + +/* qhasm: fe z_100_50 */ + +/* qhasm: fe z_100_0 */ + +/* qhasm: fe z_200_100 */ + +/* qhasm: fe z_200_0 */ + +/* qhasm: fe z_250_50 */ + +/* qhasm: fe z_250_0 */ + +/* qhasm: fe z_252_2 */ + +/* qhasm: fe z_252_3 */ + +/* qhasm: enter pow22523 */ + +/* qhasm: z2 = z1^2^1 */ +/* asm 1: fe_sq.fe_sq(>z2=fe#1,z2=fe#1,>z2=fe#1); */ +/* asm 2: fe_sq.fe_sq(>z2=t0,z2=t0,>z2=t0); */ +fe_sq.fe_sq(t0,z); for (i = 1;i < 1;++i) fe_sq.fe_sq(t0,t0); + +/* qhasm: z8 = z2^2^2 */ +/* asm 1: fe_sq.fe_sq(>z8=fe#2,z8=fe#2,>z8=fe#2); */ +/* asm 2: fe_sq.fe_sq(>z8=t1,z8=t1,>z8=t1); */ +fe_sq.fe_sq(t1,t0); for (i = 1;i < 2;++i) fe_sq.fe_sq(t1,t1); + +/* qhasm: z9 = z1*z8 */ +/* asm 1: fe_mul.fe_mul(>z9=fe#2,z9=t1,z11=fe#1,z11=t0,z22=fe#1,z22=fe#1,>z22=fe#1); */ +/* asm 2: fe_sq.fe_sq(>z22=t0,z22=t0,>z22=t0); */ +fe_sq.fe_sq(t0,t0); for (i = 1;i < 1;++i) fe_sq.fe_sq(t0,t0); + +/* qhasm: z_5_0 = z9*z22 */ +/* asm 1: fe_mul.fe_mul(>z_5_0=fe#1,z_5_0=t0,z_10_5=fe#2,z_10_5=fe#2,>z_10_5=fe#2); */ +/* asm 2: fe_sq.fe_sq(>z_10_5=t1,z_10_5=t1,>z_10_5=t1); */ +fe_sq.fe_sq(t1,t0); for (i = 1;i < 5;++i) fe_sq.fe_sq(t1,t1); + +/* qhasm: z_10_0 = z_10_5*z_5_0 */ +/* asm 1: fe_mul.fe_mul(>z_10_0=fe#1,z_10_0=t0,z_20_10=fe#2,z_20_10=fe#2,>z_20_10=fe#2); */ +/* asm 2: fe_sq.fe_sq(>z_20_10=t1,z_20_10=t1,>z_20_10=t1); */ +fe_sq.fe_sq(t1,t0); for (i = 1;i < 10;++i) fe_sq.fe_sq(t1,t1); + +/* qhasm: z_20_0 = z_20_10*z_10_0 */ +/* asm 1: fe_mul.fe_mul(>z_20_0=fe#2,z_20_0=t1,z_40_20=fe#3,z_40_20=fe#3,>z_40_20=fe#3); */ +/* asm 2: fe_sq.fe_sq(>z_40_20=t2,z_40_20=t2,>z_40_20=t2); */ +fe_sq.fe_sq(t2,t1); for (i = 1;i < 20;++i) fe_sq.fe_sq(t2,t2); + +/* qhasm: z_40_0 = z_40_20*z_20_0 */ +/* asm 1: fe_mul.fe_mul(>z_40_0=fe#2,z_40_0=t1,z_50_10=fe#2,z_50_10=fe#2,>z_50_10=fe#2); */ +/* asm 2: fe_sq.fe_sq(>z_50_10=t1,z_50_10=t1,>z_50_10=t1); */ +fe_sq.fe_sq(t1,t1); for (i = 1;i < 10;++i) fe_sq.fe_sq(t1,t1); + +/* qhasm: z_50_0 = z_50_10*z_10_0 */ +/* asm 1: fe_mul.fe_mul(>z_50_0=fe#1,z_50_0=t0,z_100_50=fe#2,z_100_50=fe#2,>z_100_50=fe#2); */ +/* asm 2: fe_sq.fe_sq(>z_100_50=t1,z_100_50=t1,>z_100_50=t1); */ +fe_sq.fe_sq(t1,t0); for (i = 1;i < 50;++i) fe_sq.fe_sq(t1,t1); + +/* qhasm: z_100_0 = z_100_50*z_50_0 */ +/* asm 1: fe_mul.fe_mul(>z_100_0=fe#2,z_100_0=t1,z_200_100=fe#3,z_200_100=fe#3,>z_200_100=fe#3); */ +/* asm 2: fe_sq.fe_sq(>z_200_100=t2,z_200_100=t2,>z_200_100=t2); */ +fe_sq.fe_sq(t2,t1); for (i = 1;i < 100;++i) fe_sq.fe_sq(t2,t2); + +/* qhasm: z_200_0 = z_200_100*z_100_0 */ +/* asm 1: fe_mul.fe_mul(>z_200_0=fe#2,z_200_0=t1,z_250_50=fe#2,z_250_50=fe#2,>z_250_50=fe#2); */ +/* asm 2: fe_sq.fe_sq(>z_250_50=t1,z_250_50=t1,>z_250_50=t1); */ +fe_sq.fe_sq(t1,t1); for (i = 1;i < 50;++i) fe_sq.fe_sq(t1,t1); + +/* qhasm: z_250_0 = z_250_50*z_50_0 */ +/* asm 1: fe_mul.fe_mul(>z_250_0=fe#1,z_250_0=t0,z_252_2=fe#1,z_252_2=fe#1,>z_252_2=fe#1); */ +/* asm 2: fe_sq.fe_sq(>z_252_2=t0,z_252_2=t0,>z_252_2=t0); */ +fe_sq.fe_sq(t0,t0); for (i = 1;i < 2;++i) fe_sq.fe_sq(t0,t0); + +/* qhasm: z_252_3 = z_252_2*z1 */ +/* asm 1: fe_mul.fe_mul(>z_252_3=fe#12,z_252_3=out,> 26; h1 += carry0; h0 -= carry0 << 26; + carry4 = (h4 + (long) (1<<25)) >> 26; h5 += carry4; h4 -= carry4 << 26; + + carry1 = (h1 + (long) (1<<24)) >> 25; h2 += carry1; h1 -= carry1 << 25; + carry5 = (h5 + (long) (1<<24)) >> 25; h6 += carry5; h5 -= carry5 << 25; + + carry2 = (h2 + (long) (1<<25)) >> 26; h3 += carry2; h2 -= carry2 << 26; + carry6 = (h6 + (long) (1<<25)) >> 26; h7 += carry6; h6 -= carry6 << 26; + + carry3 = (h3 + (long) (1<<24)) >> 25; h4 += carry3; h3 -= carry3 << 25; + carry7 = (h7 + (long) (1<<24)) >> 25; h8 += carry7; h7 -= carry7 << 25; + + carry4 = (h4 + (long) (1<<25)) >> 26; h5 += carry4; h4 -= carry4 << 26; + carry8 = (h8 + (long) (1<<25)) >> 26; h9 += carry8; h8 -= carry8 << 26; + + carry9 = (h9 + (long) (1<<24)) >> 25; h0 += carry9 * 19; h9 -= carry9 << 25; + + carry0 = (h0 + (long) (1<<25)) >> 26; h1 += carry0; h0 -= carry0 << 26; + + h[0] = (int)h0; + h[1] = (int)h1; + h[2] = (int)h2; + h[3] = (int)h3; + h[4] = (int)h4; + h[5] = (int)h5; + h[6] = (int)h6; + h[7] = (int)h7; + h[8] = (int)h8; + h[9] = (int)h9; +} + + +} diff --git a/src/org/whispersystems/curve25519/java/fe_sq2.java b/src/org/whispersystems/curve25519/java/fe_sq2.java new file mode 100644 index 00000000..f959db98 --- /dev/null +++ b/src/org/whispersystems/curve25519/java/fe_sq2.java @@ -0,0 +1,168 @@ +package org.whispersystems.curve25519.java; + +public class fe_sq2 { + +//CONVERT #include "fe.h" +//CONVERT #include "long.h" + +/* +h = 2 * f * f +Can overlap h with f. + +Preconditions: + |f| bounded by 1.65*2^26,1.65*2^25,1.65*2^26,1.65*2^25,etc. + +Postconditions: + |h| bounded by 1.01*2^25,1.01*2^24,1.01*2^25,1.01*2^24,etc. +*/ + +/* +See fe_mul.c for discussion of implementation strategy. +*/ + +@SuppressWarnings("all") +public static void fe_sq2(int[] h,int[] f) +{ + int f0 = f[0]; + int f1 = f[1]; + int f2 = f[2]; + int f3 = f[3]; + int f4 = f[4]; + int f5 = f[5]; + int f6 = f[6]; + int f7 = f[7]; + int f8 = f[8]; + int f9 = f[9]; + int f0_2 = 2 * f0; + int f1_2 = 2 * f1; + int f2_2 = 2 * f2; + int f3_2 = 2 * f3; + int f4_2 = 2 * f4; + int f5_2 = 2 * f5; + int f6_2 = 2 * f6; + int f7_2 = 2 * f7; + int f5_38 = 38 * f5; /* 1.959375*2^30 */ + int f6_19 = 19 * f6; /* 1.959375*2^30 */ + int f7_38 = 38 * f7; /* 1.959375*2^30 */ + int f8_19 = 19 * f8; /* 1.959375*2^30 */ + int f9_38 = 38 * f9; /* 1.959375*2^30 */ + long f0f0 = f0 * (long) f0; + long f0f1_2 = f0_2 * (long) f1; + long f0f2_2 = f0_2 * (long) f2; + long f0f3_2 = f0_2 * (long) f3; + long f0f4_2 = f0_2 * (long) f4; + long f0f5_2 = f0_2 * (long) f5; + long f0f6_2 = f0_2 * (long) f6; + long f0f7_2 = f0_2 * (long) f7; + long f0f8_2 = f0_2 * (long) f8; + long f0f9_2 = f0_2 * (long) f9; + long f1f1_2 = f1_2 * (long) f1; + long f1f2_2 = f1_2 * (long) f2; + long f1f3_4 = f1_2 * (long) f3_2; + long f1f4_2 = f1_2 * (long) f4; + long f1f5_4 = f1_2 * (long) f5_2; + long f1f6_2 = f1_2 * (long) f6; + long f1f7_4 = f1_2 * (long) f7_2; + long f1f8_2 = f1_2 * (long) f8; + long f1f9_76 = f1_2 * (long) f9_38; + long f2f2 = f2 * (long) f2; + long f2f3_2 = f2_2 * (long) f3; + long f2f4_2 = f2_2 * (long) f4; + long f2f5_2 = f2_2 * (long) f5; + long f2f6_2 = f2_2 * (long) f6; + long f2f7_2 = f2_2 * (long) f7; + long f2f8_38 = f2_2 * (long) f8_19; + long f2f9_38 = f2 * (long) f9_38; + long f3f3_2 = f3_2 * (long) f3; + long f3f4_2 = f3_2 * (long) f4; + long f3f5_4 = f3_2 * (long) f5_2; + long f3f6_2 = f3_2 * (long) f6; + long f3f7_76 = f3_2 * (long) f7_38; + long f3f8_38 = f3_2 * (long) f8_19; + long f3f9_76 = f3_2 * (long) f9_38; + long f4f4 = f4 * (long) f4; + long f4f5_2 = f4_2 * (long) f5; + long f4f6_38 = f4_2 * (long) f6_19; + long f4f7_38 = f4 * (long) f7_38; + long f4f8_38 = f4_2 * (long) f8_19; + long f4f9_38 = f4 * (long) f9_38; + long f5f5_38 = f5 * (long) f5_38; + long f5f6_38 = f5_2 * (long) f6_19; + long f5f7_76 = f5_2 * (long) f7_38; + long f5f8_38 = f5_2 * (long) f8_19; + long f5f9_76 = f5_2 * (long) f9_38; + long f6f6_19 = f6 * (long) f6_19; + long f6f7_38 = f6 * (long) f7_38; + long f6f8_38 = f6_2 * (long) f8_19; + long f6f9_38 = f6 * (long) f9_38; + long f7f7_38 = f7 * (long) f7_38; + long f7f8_38 = f7_2 * (long) f8_19; + long f7f9_76 = f7_2 * (long) f9_38; + long f8f8_19 = f8 * (long) f8_19; + long f8f9_38 = f8 * (long) f9_38; + long f9f9_38 = f9 * (long) f9_38; + long h0 = f0f0 +f1f9_76+f2f8_38+f3f7_76+f4f6_38+f5f5_38; + long h1 = f0f1_2+f2f9_38+f3f8_38+f4f7_38+f5f6_38; + long h2 = f0f2_2+f1f1_2 +f3f9_76+f4f8_38+f5f7_76+f6f6_19; + long h3 = f0f3_2+f1f2_2 +f4f9_38+f5f8_38+f6f7_38; + long h4 = f0f4_2+f1f3_4 +f2f2 +f5f9_76+f6f8_38+f7f7_38; + long h5 = f0f5_2+f1f4_2 +f2f3_2 +f6f9_38+f7f8_38; + long h6 = f0f6_2+f1f5_4 +f2f4_2 +f3f3_2 +f7f9_76+f8f8_19; + long h7 = f0f7_2+f1f6_2 +f2f5_2 +f3f4_2 +f8f9_38; + long h8 = f0f8_2+f1f7_4 +f2f6_2 +f3f5_4 +f4f4 +f9f9_38; + long h9 = f0f9_2+f1f8_2 +f2f7_2 +f3f6_2 +f4f5_2; + long carry0; + long carry1; + long carry2; + long carry3; + long carry4; + long carry5; + long carry6; + long carry7; + long carry8; + long carry9; + + h0 += h0; + h1 += h1; + h2 += h2; + h3 += h3; + h4 += h4; + h5 += h5; + h6 += h6; + h7 += h7; + h8 += h8; + h9 += h9; + + carry0 = (h0 + (long) (1<<25)) >> 26; h1 += carry0; h0 -= carry0 << 26; + carry4 = (h4 + (long) (1<<25)) >> 26; h5 += carry4; h4 -= carry4 << 26; + + carry1 = (h1 + (long) (1<<24)) >> 25; h2 += carry1; h1 -= carry1 << 25; + carry5 = (h5 + (long) (1<<24)) >> 25; h6 += carry5; h5 -= carry5 << 25; + + carry2 = (h2 + (long) (1<<25)) >> 26; h3 += carry2; h2 -= carry2 << 26; + carry6 = (h6 + (long) (1<<25)) >> 26; h7 += carry6; h6 -= carry6 << 26; + + carry3 = (h3 + (long) (1<<24)) >> 25; h4 += carry3; h3 -= carry3 << 25; + carry7 = (h7 + (long) (1<<24)) >> 25; h8 += carry7; h7 -= carry7 << 25; + + carry4 = (h4 + (long) (1<<25)) >> 26; h5 += carry4; h4 -= carry4 << 26; + carry8 = (h8 + (long) (1<<25)) >> 26; h9 += carry8; h8 -= carry8 << 26; + + carry9 = (h9 + (long) (1<<24)) >> 25; h0 += carry9 * 19; h9 -= carry9 << 25; + + carry0 = (h0 + (long) (1<<25)) >> 26; h1 += carry0; h0 -= carry0 << 26; + + h[0] = (int)h0; + h[1] = (int)h1; + h[2] = (int)h2; + h[3] = (int)h3; + h[4] = (int)h4; + h[5] = (int)h5; + h[6] = (int)h6; + h[7] = (int)h7; + h[8] = (int)h8; + h[9] = (int)h9; +} + + +} diff --git a/src/org/whispersystems/curve25519/java/fe_sub.java b/src/org/whispersystems/curve25519/java/fe_sub.java new file mode 100644 index 00000000..00a7ea46 --- /dev/null +++ b/src/org/whispersystems/curve25519/java/fe_sub.java @@ -0,0 +1,65 @@ +package org.whispersystems.curve25519.java; + +public class fe_sub { + +//CONVERT #include "fe.h" + +/* +h = f - g +Can overlap h with f or g. + +Preconditions: + |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. + |g| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. + +Postconditions: + |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc. +*/ + +@SuppressWarnings("all") +public static void fe_sub(int[] h,int[] f,int[] g) +{ + int f0 = f[0]; + int f1 = f[1]; + int f2 = f[2]; + int f3 = f[3]; + int f4 = f[4]; + int f5 = f[5]; + int f6 = f[6]; + int f7 = f[7]; + int f8 = f[8]; + int f9 = f[9]; + int g0 = g[0]; + int g1 = g[1]; + int g2 = g[2]; + int g3 = g[3]; + int g4 = g[4]; + int g5 = g[5]; + int g6 = g[6]; + int g7 = g[7]; + int g8 = g[8]; + int g9 = g[9]; + int h0 = f0 - g0; + int h1 = f1 - g1; + int h2 = f2 - g2; + int h3 = f3 - g3; + int h4 = f4 - g4; + int h5 = f5 - g5; + int h6 = f6 - g6; + int h7 = f7 - g7; + int h8 = f8 - g8; + int h9 = f9 - g9; + h[0] = (int)h0; + h[1] = (int)h1; + h[2] = (int)h2; + h[3] = (int)h3; + h[4] = (int)h4; + h[5] = (int)h5; + h[6] = (int)h6; + h[7] = (int)h7; + h[8] = (int)h8; + h[9] = (int)h9; +} + + +} diff --git a/src/org/whispersystems/curve25519/java/fe_tobytes.java b/src/org/whispersystems/curve25519/java/fe_tobytes.java new file mode 100644 index 00000000..d61f6a1f --- /dev/null +++ b/src/org/whispersystems/curve25519/java/fe_tobytes.java @@ -0,0 +1,127 @@ +package org.whispersystems.curve25519.java; + +public class fe_tobytes { + +//CONVERT #include "fe.h" + +/* +Preconditions: + |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc. + +Write p=2^255-19; q=floor(h/p). +Basic claim: q = floor(2^(-255)(h + 19 2^(-25)h9 + 2^(-1))). + +Proof: + Have |h|<=p so |q|<=1 so |19^2 2^(-255) q|<1/4. + Also have |h-2^230 h9|<2^231 so |19 2^(-255)(h-2^230 h9)|<1/4. + + Write y=2^(-1)-19^2 2^(-255)q-19 2^(-255)(h-2^230 h9). + Then 0> 25; + q = (h0 + q) >> 26; + q = (h1 + q) >> 25; + q = (h2 + q) >> 26; + q = (h3 + q) >> 25; + q = (h4 + q) >> 26; + q = (h5 + q) >> 25; + q = (h6 + q) >> 26; + q = (h7 + q) >> 25; + q = (h8 + q) >> 26; + q = (h9 + q) >> 25; + + /* Goal: Output h-(2^255-19)q, which is between 0 and 2^255-20. */ + h0 += 19 * q; + /* Goal: Output h-2^255 q, which is between 0 and 2^255-20. */ + + carry0 = h0 >> 26; h1 += carry0; h0 -= carry0 << 26; + carry1 = h1 >> 25; h2 += carry1; h1 -= carry1 << 25; + carry2 = h2 >> 26; h3 += carry2; h2 -= carry2 << 26; + carry3 = h3 >> 25; h4 += carry3; h3 -= carry3 << 25; + carry4 = h4 >> 26; h5 += carry4; h4 -= carry4 << 26; + carry5 = h5 >> 25; h6 += carry5; h5 -= carry5 << 25; + carry6 = h6 >> 26; h7 += carry6; h6 -= carry6 << 26; + carry7 = h7 >> 25; h8 += carry7; h7 -= carry7 << 25; + carry8 = h8 >> 26; h9 += carry8; h8 -= carry8 << 26; + carry9 = h9 >> 25; h9 -= carry9 << 25; + /* h10 = carry9 */ + + /* + Goal: Output h0+...+2^255 h10-2^255 q, which is between 0 and 2^255-20. + Have h0+...+2^230 h9 between 0 and 2^255-1; + evidently 2^255 h10-2^255 q = 0. + Goal: Output h0+...+2^230 h9. + */ + + s[0] = (byte)(h0 >> 0); + s[1] = (byte)(h0 >> 8); + s[2] = (byte)(h0 >> 16); + s[3] = (byte)((h0 >> 24) | (h1 << 2)); + s[4] = (byte)(h1 >> 6); + s[5] = (byte)(h1 >> 14); + s[6] = (byte)((h1 >> 22) | (h2 << 3)); + s[7] = (byte)(h2 >> 5); + s[8] = (byte)(h2 >> 13); + s[9] = (byte)((h2 >> 21) | (h3 << 5)); + s[10] = (byte)(h3 >> 3); + s[11] = (byte)(h3 >> 11); + s[12] = (byte)((h3 >> 19) | (h4 << 6)); + s[13] = (byte)(h4 >> 2); + s[14] = (byte)(h4 >> 10); + s[15] = (byte)(h4 >> 18); + s[16] = (byte)(h5 >> 0); + s[17] = (byte)(h5 >> 8); + s[18] = (byte)(h5 >> 16); + s[19] = (byte)((h5 >> 24) | (h6 << 1)); + s[20] = (byte)(h6 >> 7); + s[21] = (byte)(h6 >> 15); + s[22] = (byte)((h6 >> 23) | (h7 << 3)); + s[23] = (byte)(h7 >> 5); + s[24] = (byte)(h7 >> 13); + s[25] = (byte)((h7 >> 21) | (h8 << 4)); + s[26] = (byte)(h8 >> 4); + s[27] = (byte)(h8 >> 12); + s[28] = (byte)((h8 >> 20) | (h9 << 6)); + s[29] = (byte)(h9 >> 2); + s[30] = (byte)(h9 >> 10); + s[31] = (byte)(h9 >> 18); +} + + +} diff --git a/src/org/whispersystems/curve25519/java/ge_add.java b/src/org/whispersystems/curve25519/java/ge_add.java new file mode 100644 index 00000000..51bbd226 --- /dev/null +++ b/src/org/whispersystems/curve25519/java/ge_add.java @@ -0,0 +1,116 @@ +package org.whispersystems.curve25519.java; + +public class ge_add { + +//CONVERT #include "ge.h" + +/* +r = p + q +*/ + +@SuppressWarnings("all") +public static void ge_add(ge_p1p1 r,ge_p3 p,ge_cached q) +{ + int[] t0 = new int[10]; +//CONVERT #include "ge_add.h" + +/* qhasm: enter ge_add */ + +/* qhasm: fe X1 */ + +/* qhasm: fe Y1 */ + +/* qhasm: fe Z1 */ + +/* qhasm: fe Z2 */ + +/* qhasm: fe T1 */ + +/* qhasm: fe ZZ */ + +/* qhasm: fe YpX2 */ + +/* qhasm: fe YmX2 */ + +/* qhasm: fe T2d2 */ + +/* qhasm: fe X3 */ + +/* qhasm: fe Y3 */ + +/* qhasm: fe Z3 */ + +/* qhasm: fe T3 */ + +/* qhasm: fe YpX1 */ + +/* qhasm: fe YmX1 */ + +/* qhasm: fe A */ + +/* qhasm: fe B */ + +/* qhasm: fe C */ + +/* qhasm: fe D */ + +/* qhasm: YpX1 = Y1+X1 */ +/* asm 1: fe_add.fe_add(>YpX1=fe#1,YpX1=r.X,YmX1=fe#2,YmX1=r.Y,A=fe#3,A=r.Z,B=fe#2,B=r.Y,C=fe#4,C=r.T,ZZ=fe#1,ZZ=r.X,D=fe#5,D=t0,X3=fe#1,X3=r.X,Y3=fe#2,Y3=r.Y,Z3=fe#3,Z3=r.Z,T3=fe#4,T3=r.T,> 3] >> (i & 7)); + r[i] = (byte)(1 & (a[i >> 3] >>> (i & 7))); + } + + for (i = 0;i < 256;++i) + if (r[i] != 0) { + for (b = 1;b <= 6 && i + b < 256;++b) { + if (r[i + b] != 0) { + if (r[i] + (r[i + b] << b) <= 15) { + r[i] += r[i + b] << b; r[i + b] = 0; + } else if (r[i] - (r[i + b] << b) >= -15) { + r[i] -= r[i + b] << b; + for (k = i + b;k < 256;++k) { + if (r[k] == 0) { + r[k] = 1; + break; + } + r[k] = 0; + } + } else + break; + } + } + } + +} + +static ge_precomp Bi[]; + +static { + Bi = new ge_precomp[8]; + Bi[0] = new ge_precomp( + new int[]{ 25967493,-14356035,29566456,3660896,-12694345,4014787,27544626,-11754271,-6079156,2047605 }, + new int[]{ -12545711,934262,-2722910,3049990,-727428,9406986,12720692,5043384,19500929,-15469378 }, + new int[]{ -8738181,4489570,9688441,-14785194,10184609,-12363380,29287919,11864899,-24514362,-4438546 } + ); + Bi[1] = new ge_precomp( + new int[]{ 15636291,-9688557,24204773,-7912398,616977,-16685262,27787600,-14772189,28944400,-1550024 }, + new int[]{ 16568933,4717097,-11556148,-1102322,15682896,-11807043,16354577,-11775962,7689662,11199574 }, + new int[]{ 30464156,-5976125,-11779434,-15670865,23220365,15915852,7512774,10017326,-17749093,-9920357 } + ); + Bi[2] = new ge_precomp( + new int[]{ 10861363,11473154,27284546,1981175,-30064349,12577861,32867885,14515107,-15438304,10819380 }, + new int[]{ 4708026,6336745,20377586,9066809,-11272109,6594696,-25653668,12483688,-12668491,5581306 }, + new int[]{ 19563160,16186464,-29386857,4097519,10237984,-4348115,28542350,13850243,-23678021,-15815942 } + ); + Bi[3] = new ge_precomp( + new int[]{ 5153746,9909285,1723747,-2777874,30523605,5516873,19480852,5230134,-23952439,-15175766 }, + new int[]{ -30269007,-3463509,7665486,10083793,28475525,1649722,20654025,16520125,30598449,7715701 }, + new int[]{ 28881845,14381568,9657904,3680757,-20181635,7843316,-31400660,1370708,29794553,-1409300 } + ); + Bi[4] = new ge_precomp( + new int[]{ -22518993,-6692182,14201702,-8745502,-23510406,8844726,18474211,-1361450,-13062696,13821877 }, + new int[]{ -6455177,-7839871,3374702,-4740862,-27098617,-10571707,31655028,-7212327,18853322,-14220951 }, + new int[]{ 4566830,-12963868,-28974889,-12240689,-7602672,-2830569,-8514358,-10431137,2207753,-3209784 } + ); + Bi[5] = new ge_precomp( + new int[]{ -25154831,-4185821,29681144,7868801,-6854661,-9423865,-12437364,-663000,-31111463,-16132436 }, + new int[]{ 25576264,-2703214,7349804,-11814844,16472782,9300885,3844789,15725684,171356,6466918 }, + new int[]{ 23103977,13316479,9739013,-16149481,817875,-15038942,8965339,-14088058,-30714912,16193877 } + ); + Bi[6] = new ge_precomp( + new int[]{ -33521811,3180713,-2394130,14003687,-16903474,-16270840,17238398,4729455,-18074513,9256800 }, + new int[]{ -25182317,-4174131,32336398,5036987,-21236817,11360617,22616405,9761698,-19827198,630305 }, + new int[]{ -13720693,2639453,-24237460,-7406481,9494427,-5774029,-6554551,-15960994,-2449256,-14291300 } + ); + Bi[7] = new ge_precomp( + new int[]{ -3151181,-5046075,9282714,6866145,-31907062,-863023,-18940575,15033784,25105118,-7894876 }, + new int[]{ -24326370,15950226,-31801215,-14592823,-11662737,-5090925,1573892,-2625887,2198790,-15804619 }, + new int[]{ -3099351,10324967,-2241613,7453183,-5446979,-2735503,-13812022,-16236442,-32461234,-12290683 } + ); +} + +/* +r = a * A + b * B +where a = a[0]+256*a[1]+...+256^31 a[31]. +and b = b[0]+256*b[1]+...+256^31 b[31]. +B is the Ed25519 base point (x,4/5) with x positive. +*/ + +public static void ge_double_scalarmult_vartime(ge_p2 r,byte[] a,ge_p3 A,byte[] b) +{ + byte[] aslide = new byte[256]; + byte[] bslide = new byte[256]; + ge_cached Ai[] = new ge_cached[8]; /* A,3A,5A,7A,9A,11A,13A,15A */ + for (int count=0; count < 8; count++) + Ai[count] = new ge_cached(); + ge_p1p1 t = new ge_p1p1(); + ge_p3 u = new ge_p3(); + ge_p3 A2 = new ge_p3(); + int i; + + slide(aslide,a); + slide(bslide,b); + + ge_p3_to_cached.ge_p3_to_cached(Ai[0],A); + ge_p3_dbl.ge_p3_dbl(t,A); ge_p1p1_to_p3.ge_p1p1_to_p3(A2,t); + ge_add.ge_add(t,A2,Ai[0]); ge_p1p1_to_p3.ge_p1p1_to_p3(u,t); ge_p3_to_cached.ge_p3_to_cached(Ai[1],u); + ge_add.ge_add(t,A2,Ai[1]); ge_p1p1_to_p3.ge_p1p1_to_p3(u,t); ge_p3_to_cached.ge_p3_to_cached(Ai[2],u); + ge_add.ge_add(t,A2,Ai[2]); ge_p1p1_to_p3.ge_p1p1_to_p3(u,t); ge_p3_to_cached.ge_p3_to_cached(Ai[3],u); + ge_add.ge_add(t,A2,Ai[3]); ge_p1p1_to_p3.ge_p1p1_to_p3(u,t); ge_p3_to_cached.ge_p3_to_cached(Ai[4],u); + ge_add.ge_add(t,A2,Ai[4]); ge_p1p1_to_p3.ge_p1p1_to_p3(u,t); ge_p3_to_cached.ge_p3_to_cached(Ai[5],u); + ge_add.ge_add(t,A2,Ai[5]); ge_p1p1_to_p3.ge_p1p1_to_p3(u,t); ge_p3_to_cached.ge_p3_to_cached(Ai[6],u); + ge_add.ge_add(t,A2,Ai[6]); ge_p1p1_to_p3.ge_p1p1_to_p3(u,t); ge_p3_to_cached.ge_p3_to_cached(Ai[7],u); + + ge_p2_0.ge_p2_0(r); + + for (i = 255;i >= 0;--i) { + if (aslide[i] !=0 || bslide[i] != 0) break; + } + + for (;i >= 0;--i) { + ge_p2_dbl.ge_p2_dbl(t,r); + + if (aslide[i] > 0) { + ge_p1p1_to_p3.ge_p1p1_to_p3(u,t); + ge_add.ge_add(t,u,Ai[aslide[i]/2]); + } else if (aslide[i] < 0) { + ge_p1p1_to_p3.ge_p1p1_to_p3(u,t); + ge_sub.ge_sub(t,u,Ai[(-aslide[i])/2]); + } + + if (bslide[i] > 0) { + ge_p1p1_to_p3.ge_p1p1_to_p3(u,t); + ge_madd.ge_madd(t,u,Bi[bslide[i]/2]); + } else if (bslide[i] < 0) { + ge_p1p1_to_p3.ge_p1p1_to_p3(u,t); + ge_msub.ge_msub(t,u,Bi[(-bslide[i])/2]); + } + + ge_p1p1_to_p2.ge_p1p1_to_p2(r,t); + } +} + + +} diff --git a/src/org/whispersystems/curve25519/java/ge_frombytes.java b/src/org/whispersystems/curve25519/java/ge_frombytes.java new file mode 100644 index 00000000..6b0c3b9d --- /dev/null +++ b/src/org/whispersystems/curve25519/java/ge_frombytes.java @@ -0,0 +1,60 @@ +package org.whispersystems.curve25519.java; + +public class ge_frombytes { + +//CONVERT #include "ge.h" + +static int[] d = { +//CONVERT #include "d.h" +-10913610,13857413,-15372611,6949391,114729,-8787816,-6275908,-3247719,-18696448,-12055116 +} ; + +static int[] sqrtm1 = { +//CONVERT #include "sqrtm1.h" +-32595792,-7943725,9377950,3500415,12389472,-272473,-25146209,-2005654,326686,11406482 +} ; + +public static int ge_frombytes_negate_vartime(ge_p3 h,byte[] s) +{ + int[] u = new int[10]; + int[] v = new int[10]; + int[] v3 = new int[10]; + int[] vxx = new int[10]; + int[] check = new int[10]; + + fe_frombytes.fe_frombytes(h.Y,s); + fe_1.fe_1(h.Z); + fe_sq.fe_sq(u,h.Y); + fe_mul.fe_mul(v,u,d); + fe_sub.fe_sub(u,u,h.Z); /* u = y^2-1 */ + fe_add.fe_add(v,v,h.Z); /* v = dy^2+1 */ + + fe_sq.fe_sq(v3,v); + fe_mul.fe_mul(v3,v3,v); /* v3 = v^3 */ + fe_sq.fe_sq(h.X,v3); + fe_mul.fe_mul(h.X,h.X,v); + fe_mul.fe_mul(h.X,h.X,u); /* x = uv^7 */ + + fe_pow22523.fe_pow22523(h.X,h.X); /* x = (uv^7)^((q-5)/8) */ + fe_mul.fe_mul(h.X,h.X,v3); + fe_mul.fe_mul(h.X,h.X,u); /* x = uv^3(uv^7)^((q-5)/8) */ + + fe_sq.fe_sq(vxx,h.X); + fe_mul.fe_mul(vxx,vxx,v); + fe_sub.fe_sub(check,vxx,u); /* vx^2-u */ + if (fe_isnonzero.fe_isnonzero(check) != 0) { + fe_add.fe_add(check,vxx,u); /* vx^2+u */ + if (fe_isnonzero.fe_isnonzero(check) != 0) return -1; + fe_mul.fe_mul(h.X,h.X,sqrtm1); + } + + if (fe_isnegative.fe_isnegative(h.X) == ((s[31] >>> 7) & 0x01)) { + fe_neg.fe_neg(h.X,h.X); + } + + fe_mul.fe_mul(h.T,h.X,h.Y); + return 0; +} + + +} diff --git a/src/org/whispersystems/curve25519/java/ge_madd.java b/src/org/whispersystems/curve25519/java/ge_madd.java new file mode 100644 index 00000000..2dd4e5b8 --- /dev/null +++ b/src/org/whispersystems/curve25519/java/ge_madd.java @@ -0,0 +1,107 @@ +package org.whispersystems.curve25519.java; + +public class ge_madd { + +//CONVERT #include "ge.h" + +/* +r = p + q +*/ + +@SuppressWarnings("all") +public static void ge_madd(ge_p1p1 r,ge_p3 p,ge_precomp q) +{ + int[] t0 = new int[10]; +//CONVERT #include "ge_madd.h" + +/* qhasm: enter ge_madd */ + +/* qhasm: fe X1 */ + +/* qhasm: fe Y1 */ + +/* qhasm: fe Z1 */ + +/* qhasm: fe T1 */ + +/* qhasm: fe ypx2 */ + +/* qhasm: fe ymx2 */ + +/* qhasm: fe xy2d2 */ + +/* qhasm: fe X3 */ + +/* qhasm: fe Y3 */ + +/* qhasm: fe Z3 */ + +/* qhasm: fe T3 */ + +/* qhasm: fe YpX1 */ + +/* qhasm: fe YmX1 */ + +/* qhasm: fe A */ + +/* qhasm: fe B */ + +/* qhasm: fe C */ + +/* qhasm: fe D */ + +/* qhasm: YpX1 = Y1+X1 */ +/* asm 1: fe_add.fe_add(>YpX1=fe#1,YpX1=r.X,YmX1=fe#2,YmX1=r.Y,A=fe#3,A=r.Z,B=fe#2,B=r.Y,C=fe#4,C=r.T,D=fe#5,D=t0,X3=fe#1,X3=r.X,Y3=fe#2,Y3=r.Y,Z3=fe#3,Z3=r.Z,T3=fe#4,T3=r.T,YpX1=fe#1,YpX1=r.X,YmX1=fe#2,YmX1=r.Y,A=fe#3,A=r.Z,B=fe#2,B=r.Y,C=fe#4,C=r.T,D=fe#5,D=t0,X3=fe#1,X3=r.X,Y3=fe#2,Y3=r.Y,Z3=fe#3,Z3=r.Z,T3=fe#4,T3=r.T,XX=fe#1,XX=r.X,YY=fe#3,YY=r.Z,B=fe#4,B=r.T,A=fe#2,A=r.Y,AA=fe#5,AA=t0,Y3=fe#2,Y3=r.Y,Z3=fe#3,Z3=r.Z,X3=fe#1,X3=r.X,T3=fe#4,T3=r.T,>>= 31; /* 1: yes; 0: no */ + return y; +} + +static int negative(byte b) +{ + long x = b; /* 18446744073709551361..18446744073709551615: yes; 0..255: no */ + x >>>= 63; /* 1: yes; 0: no */ + return (int)x; +} + +static void cmov(ge_precomp t,ge_precomp u,int b) +{ + fe_cmov.fe_cmov(t.yplusx,u.yplusx,b); + fe_cmov.fe_cmov(t.yminusx,u.yminusx,b); + fe_cmov.fe_cmov(t.xy2d,u.xy2d,b); +} + +static void select(ge_precomp t,int pos,byte b) +{ + ge_precomp base[][] = (pos <= 7 ? ge_precomp_base_0_7.base : + (pos <= 15 ? ge_precomp_base_8_15.base : + (pos <= 23 ? ge_precomp_base_16_23.base : ge_precomp_base_24_31.base))); + + ge_precomp minust = new ge_precomp(); + int bnegative = negative(b); + int babs = b - (((-bnegative) & b) << 1); + + ge_precomp_0.ge_precomp_0(t); + cmov(t,base[pos][0],equal((byte)babs,(byte)1)); + cmov(t,base[pos][1],equal((byte)babs,(byte)2)); + cmov(t,base[pos][2],equal((byte)babs,(byte)3)); + cmov(t,base[pos][3],equal((byte)babs,(byte)4)); + cmov(t,base[pos][4],equal((byte)babs,(byte)5)); + cmov(t,base[pos][5],equal((byte)babs,(byte)6)); + cmov(t,base[pos][6],equal((byte)babs,(byte)7)); + cmov(t,base[pos][7],equal((byte)babs,(byte)8)); + fe_copy.fe_copy(minust.yplusx,t.yminusx); + fe_copy.fe_copy(minust.yminusx,t.yplusx); + fe_neg.fe_neg(minust.xy2d,t.xy2d); + cmov(t,minust,bnegative); +} + +/* +h = a * B +where a = a[0]+256*a[1]+...+256^31 a[31] +B is the Ed25519 base point (x,4/5) with x positive. + +Preconditions: + a[31] <= 127 +*/ + +@SuppressWarnings("all") +public static void ge_scalarmult_base(ge_p3 h,byte[] a) +{ + byte[] e = new byte[64]; + byte carry; + ge_p1p1 r = new ge_p1p1(); + ge_p2 s = new ge_p2(); + ge_precomp t = new ge_precomp(); + int i; + + for (i = 0;i < 32;++i) { + e[2 * i + 0] = (byte)((a[i] >>> 0) & 15); + e[2 * i + 1] = (byte)((a[i] >>> 4) & 15); + } + /* each e[i] is between 0 and 15 */ + /* e[63] is between 0 and 7 */ + + carry = 0; + for (i = 0;i < 63;++i) { + e[i] += carry; + carry = (byte)(e[i] + 8); + carry >>= 4; + e[i] -= carry << 4; + } + e[63] += carry; + /* each e[i] is between -8 and 8 */ + + ge_p3_0.ge_p3_0(h); + for (i = 1;i < 64;i += 2) { + select(t,i / 2,e[i]); + ge_madd.ge_madd(r,h,t); ge_p1p1_to_p3.ge_p1p1_to_p3(h,r); + } + + ge_p3_dbl.ge_p3_dbl(r,h); ge_p1p1_to_p2.ge_p1p1_to_p2(s,r); + ge_p2_dbl.ge_p2_dbl(r,s); ge_p1p1_to_p2.ge_p1p1_to_p2(s,r); + ge_p2_dbl.ge_p2_dbl(r,s); ge_p1p1_to_p2.ge_p1p1_to_p2(s,r); + ge_p2_dbl.ge_p2_dbl(r,s); ge_p1p1_to_p3.ge_p1p1_to_p3(h,r); + + for (i = 0;i < 64;i += 2) { + select(t,i / 2,e[i]); + ge_madd.ge_madd(r,h,t); ge_p1p1_to_p3.ge_p1p1_to_p3(h,r); + } +} + +} diff --git a/src/org/whispersystems/curve25519/java/ge_sub.java b/src/org/whispersystems/curve25519/java/ge_sub.java new file mode 100644 index 00000000..4dd24f49 --- /dev/null +++ b/src/org/whispersystems/curve25519/java/ge_sub.java @@ -0,0 +1,116 @@ +package org.whispersystems.curve25519.java; + +public class ge_sub { + +//CONVERT #include "ge.h" + +/* +r = p - q +*/ + +@SuppressWarnings("all") +public static void ge_sub(ge_p1p1 r,ge_p3 p,ge_cached q) +{ + int[] t0 = new int[10]; +//CONVERT #include "ge_sub.h" + +/* qhasm: enter ge_sub */ + +/* qhasm: fe X1 */ + +/* qhasm: fe Y1 */ + +/* qhasm: fe Z1 */ + +/* qhasm: fe Z2 */ + +/* qhasm: fe T1 */ + +/* qhasm: fe ZZ */ + +/* qhasm: fe YpX2 */ + +/* qhasm: fe YmX2 */ + +/* qhasm: fe T2d2 */ + +/* qhasm: fe X3 */ + +/* qhasm: fe Y3 */ + +/* qhasm: fe Z3 */ + +/* qhasm: fe T3 */ + +/* qhasm: fe YpX1 */ + +/* qhasm: fe YmX1 */ + +/* qhasm: fe A */ + +/* qhasm: fe B */ + +/* qhasm: fe C */ + +/* qhasm: fe D */ + +/* qhasm: YpX1 = Y1+X1 */ +/* asm 1: fe_add.fe_add(>YpX1=fe#1,YpX1=r.X,YmX1=fe#2,YmX1=r.Y,A=fe#3,A=r.Z,B=fe#2,B=r.Y,C=fe#4,C=r.T,ZZ=fe#1,ZZ=r.X,D=fe#5,D=t0,X3=fe#1,X3=r.X,Y3=fe#2,Y3=r.Y,Z3=fe#3,Z3=r.Z,T3=fe#4,T3=r.T, +//CONVERT #include "crypto_sign.h" +//CONVERT #include "crypto_hash_sha512.h" +//CONVERT #include "crypto_verify_32.h" +//CONVERT #include "ge.h" +//CONVERT #include "sc.h" + +public static int crypto_sign_open( + Sha512 sha512provider, + byte[] m, long mlen, + byte[] sm, long smlen, + byte[] pk +) +{ + byte[] pkcopy = new byte[32]; + byte[] rcopy = new byte[32]; + byte[] scopy = new byte[32]; + byte[] h = new byte[64]; + byte[] rcheck = new byte[32]; + ge_p3 A = new ge_p3(); + ge_p2 R = new ge_p2(); + + if (smlen < 64) return -1; + if ((sm[63] & 224) != 0) return -1; + if (ge_frombytes.ge_frombytes_negate_vartime(A,pk) != 0) return -1; + + byte[] pubkeyhash = new byte[64]; + sha512provider.calculateDigest(pubkeyhash,pk,32); + + System.arraycopy(pk, 0, pkcopy, 0, 32); + System.arraycopy(sm, 0, rcopy, 0, 32); + System.arraycopy(sm, 32, scopy, 0, 32); + + System.arraycopy(sm, 0, m, 0, (int)smlen); + System.arraycopy(pkcopy, 0, m, 32, 32); + sha512provider.calculateDigest(h,m,smlen); + sc_reduce.sc_reduce(h); + + ge_double_scalarmult.ge_double_scalarmult_vartime(R,h,A,scopy); + ge_tobytes.ge_tobytes(rcheck,R); + if (crypto_verify_32.crypto_verify_32(rcheck,rcopy) == 0) { + System.arraycopy(m, 64, m, 0, (int)(smlen - 64)); + //memset(m + smlen - 64,0,64); + return 0; + } + +//badsig: + //memset(m,0,smlen); + return -1; +} + + +} diff --git a/src/org/whispersystems/curve25519/java/sc_muladd.java b/src/org/whispersystems/curve25519/java/sc_muladd.java new file mode 100644 index 00000000..549f490a --- /dev/null +++ b/src/org/whispersystems/curve25519/java/sc_muladd.java @@ -0,0 +1,376 @@ +package org.whispersystems.curve25519.java; + +public class sc_muladd { + +//CONVERT #include "sc.h" +//CONVERT #include "long.h" +//CONVERT #include "crypto_uint32.h" +//CONVERT #include "long.h" + +public static long load_3(byte[] in, int index) +{ + long result; + result = ((long) in[index + 0]) & 0xFF; + result |= (((long) in[index + 1]) << 8) & 0xFF00; + result |= (((long) in[index + 2]) << 16) & 0xFF0000; + return result; +} + +public static long load_4(byte[] in, int index) +{ + long result; + result = (((long) in[index + 0]) & 0xFF); + result |= ((((long) in[index + 1]) << 8) & 0xFF00); + result |= ((((long) in[index + 2]) << 16) & 0xFF0000); + result |= ((((long) in[index + 3]) << 24) & 0xFF000000L); + return result; +} + +/* +Input: + a[0]+256*a[1]+...+256^31*a[31] = a + b[0]+256*b[1]+...+256^31*b[31] = b + c[0]+256*c[1]+...+256^31*c[31] = c + +Output: + s[0]+256*s[1]+...+256^31*s[31] = (ab+c) mod l + where l = 2^252 + 27742317777372353535851937790883648493. +*/ + +@SuppressWarnings("all") +public static void sc_muladd(byte[] s,byte[] a,byte[] b,byte[] c) +{ + long a0 = 2097151 & load_3(a, 0); + long a1 = 2097151 & (load_4(a, 2) >>> 5); + long a2 = 2097151 & (load_3(a, 5) >>> 2); + long a3 = 2097151 & (load_4(a, 7) >>> 7); + long a4 = 2097151 & (load_4(a, 10) >>> 4); + long a5 = 2097151 & (load_3(a, 13) >>> 1); + long a6 = 2097151 & (load_4(a, 15) >>> 6); + long a7 = 2097151 & (load_3(a, 18) >>> 3); + long a8 = 2097151 & load_3(a, 21); + long a9 = 2097151 & (load_4(a, 23) >>> 5); + long a10 = 2097151 & (load_3(a, 26) >>> 2); + long a11 = (load_4(a, 28) >>> 7); + long b0 = 2097151 & load_3(b, 0); + long b1 = 2097151 & (load_4(b, 2) >>> 5); + long b2 = 2097151 & (load_3(b, 5) >>> 2); + long b3 = 2097151 & (load_4(b, 7) >>> 7); + long b4 = 2097151 & (load_4(b, 10) >>> 4); + long b5 = 2097151 & (load_3(b, 13) >>> 1); + long b6 = 2097151 & (load_4(b, 15) >>> 6); + long b7 = 2097151 & (load_3(b, 18) >>> 3); + long b8 = 2097151 & load_3(b, 21); + long b9 = 2097151 & (load_4(b, 23) >>> 5); + long b10 = 2097151 & (load_3(b, 26) >>> 2); + long b11 = (load_4(b, 28) >>> 7); + long c0 = 2097151 & load_3(c, 0); + long c1 = 2097151 & (load_4(c, 2) >>> 5); + long c2 = 2097151 & (load_3(c, 5) >>> 2); + long c3 = 2097151 & (load_4(c, 7) >>> 7); + long c4 = 2097151 & (load_4(c, 10) >>> 4); + long c5 = 2097151 & (load_3(c, 13) >>> 1); + long c6 = 2097151 & (load_4(c, 15) >>> 6); + long c7 = 2097151 & (load_3(c, 18) >>> 3); + long c8 = 2097151 & load_3(c, 21); + long c9 = 2097151 & (load_4(c, 23) >>> 5); + long c10 = 2097151 & (load_3(c, 26) >>> 2); + long c11 = (load_4(c, 28) >>> 7); + long s0; + long s1; + long s2; + long s3; + long s4; + long s5; + long s6; + long s7; + long s8; + long s9; + long s10; + long s11; + long s12; + long s13; + long s14; + long s15; + long s16; + long s17; + long s18; + long s19; + long s20; + long s21; + long s22; + long s23; + long carry0; + long carry1; + long carry2; + long carry3; + long carry4; + long carry5; + long carry6; + long carry7; + long carry8; + long carry9; + long carry10; + long carry11; + long carry12; + long carry13; + long carry14; + long carry15; + long carry16; + long carry17; + long carry18; + long carry19; + long carry20; + long carry21; + long carry22; + + s0 = c0 + a0*b0; + s1 = c1 + a0*b1 + a1*b0; + s2 = c2 + a0*b2 + a1*b1 + a2*b0; + s3 = c3 + a0*b3 + a1*b2 + a2*b1 + a3*b0; + s4 = c4 + a0*b4 + a1*b3 + a2*b2 + a3*b1 + a4*b0; + s5 = c5 + a0*b5 + a1*b4 + a2*b3 + a3*b2 + a4*b1 + a5*b0; + s6 = c6 + a0*b6 + a1*b5 + a2*b4 + a3*b3 + a4*b2 + a5*b1 + a6*b0; + s7 = c7 + a0*b7 + a1*b6 + a2*b5 + a3*b4 + a4*b3 + a5*b2 + a6*b1 + a7*b0; + s8 = c8 + a0*b8 + a1*b7 + a2*b6 + a3*b5 + a4*b4 + a5*b3 + a6*b2 + a7*b1 + a8*b0; + s9 = c9 + a0*b9 + a1*b8 + a2*b7 + a3*b6 + a4*b5 + a5*b4 + a6*b3 + a7*b2 + a8*b1 + a9*b0; + s10 = c10 + a0*b10 + a1*b9 + a2*b8 + a3*b7 + a4*b6 + a5*b5 + a6*b4 + a7*b3 + a8*b2 + a9*b1 + a10*b0; + s11 = c11 + a0*b11 + a1*b10 + a2*b9 + a3*b8 + a4*b7 + a5*b6 + a6*b5 + a7*b4 + a8*b3 + a9*b2 + a10*b1 + a11*b0; + s12 = a1*b11 + a2*b10 + a3*b9 + a4*b8 + a5*b7 + a6*b6 + a7*b5 + a8*b4 + a9*b3 + a10*b2 + a11*b1; + s13 = a2*b11 + a3*b10 + a4*b9 + a5*b8 + a6*b7 + a7*b6 + a8*b5 + a9*b4 + a10*b3 + a11*b2; + s14 = a3*b11 + a4*b10 + a5*b9 + a6*b8 + a7*b7 + a8*b6 + a9*b5 + a10*b4 + a11*b3; + s15 = a4*b11 + a5*b10 + a6*b9 + a7*b8 + a8*b7 + a9*b6 + a10*b5 + a11*b4; + s16 = a5*b11 + a6*b10 + a7*b9 + a8*b8 + a9*b7 + a10*b6 + a11*b5; + s17 = a6*b11 + a7*b10 + a8*b9 + a9*b8 + a10*b7 + a11*b6; + s18 = a7*b11 + a8*b10 + a9*b9 + a10*b8 + a11*b7; + s19 = a8*b11 + a9*b10 + a10*b9 + a11*b8; + s20 = a9*b11 + a10*b10 + a11*b9; + s21 = a10*b11 + a11*b10; + s22 = a11*b11; + s23 = 0; + + carry0 = (s0 + (1<<20)) >> 21; s1 += carry0; s0 -= carry0 << 21; + carry2 = (s2 + (1<<20)) >> 21; s3 += carry2; s2 -= carry2 << 21; + carry4 = (s4 + (1<<20)) >> 21; s5 += carry4; s4 -= carry4 << 21; + carry6 = (s6 + (1<<20)) >> 21; s7 += carry6; s6 -= carry6 << 21; + carry8 = (s8 + (1<<20)) >> 21; s9 += carry8; s8 -= carry8 << 21; + carry10 = (s10 + (1<<20)) >> 21; s11 += carry10; s10 -= carry10 << 21; + carry12 = (s12 + (1<<20)) >> 21; s13 += carry12; s12 -= carry12 << 21; + carry14 = (s14 + (1<<20)) >> 21; s15 += carry14; s14 -= carry14 << 21; + carry16 = (s16 + (1<<20)) >> 21; s17 += carry16; s16 -= carry16 << 21; + carry18 = (s18 + (1<<20)) >> 21; s19 += carry18; s18 -= carry18 << 21; + carry20 = (s20 + (1<<20)) >> 21; s21 += carry20; s20 -= carry20 << 21; + carry22 = (s22 + (1<<20)) >> 21; s23 += carry22; s22 -= carry22 << 21; + + carry1 = (s1 + (1<<20)) >> 21; s2 += carry1; s1 -= carry1 << 21; + carry3 = (s3 + (1<<20)) >> 21; s4 += carry3; s3 -= carry3 << 21; + carry5 = (s5 + (1<<20)) >> 21; s6 += carry5; s5 -= carry5 << 21; + carry7 = (s7 + (1<<20)) >> 21; s8 += carry7; s7 -= carry7 << 21; + carry9 = (s9 + (1<<20)) >> 21; s10 += carry9; s9 -= carry9 << 21; + carry11 = (s11 + (1<<20)) >> 21; s12 += carry11; s11 -= carry11 << 21; + carry13 = (s13 + (1<<20)) >> 21; s14 += carry13; s13 -= carry13 << 21; + carry15 = (s15 + (1<<20)) >> 21; s16 += carry15; s15 -= carry15 << 21; + carry17 = (s17 + (1<<20)) >> 21; s18 += carry17; s17 -= carry17 << 21; + carry19 = (s19 + (1<<20)) >> 21; s20 += carry19; s19 -= carry19 << 21; + carry21 = (s21 + (1<<20)) >> 21; s22 += carry21; s21 -= carry21 << 21; + + s11 += s23 * 666643; + s12 += s23 * 470296; + s13 += s23 * 654183; + s14 -= s23 * 997805; + s15 += s23 * 136657; + s16 -= s23 * 683901; + s23 = 0; + + s10 += s22 * 666643; + s11 += s22 * 470296; + s12 += s22 * 654183; + s13 -= s22 * 997805; + s14 += s22 * 136657; + s15 -= s22 * 683901; + s22 = 0; + + s9 += s21 * 666643; + s10 += s21 * 470296; + s11 += s21 * 654183; + s12 -= s21 * 997805; + s13 += s21 * 136657; + s14 -= s21 * 683901; + s21 = 0; + + s8 += s20 * 666643; + s9 += s20 * 470296; + s10 += s20 * 654183; + s11 -= s20 * 997805; + s12 += s20 * 136657; + s13 -= s20 * 683901; + s20 = 0; + + s7 += s19 * 666643; + s8 += s19 * 470296; + s9 += s19 * 654183; + s10 -= s19 * 997805; + s11 += s19 * 136657; + s12 -= s19 * 683901; + s19 = 0; + + s6 += s18 * 666643; + s7 += s18 * 470296; + s8 += s18 * 654183; + s9 -= s18 * 997805; + s10 += s18 * 136657; + s11 -= s18 * 683901; + s18 = 0; + + carry6 = (s6 + (1<<20)) >> 21; s7 += carry6; s6 -= carry6 << 21; + carry8 = (s8 + (1<<20)) >> 21; s9 += carry8; s8 -= carry8 << 21; + carry10 = (s10 + (1<<20)) >> 21; s11 += carry10; s10 -= carry10 << 21; + carry12 = (s12 + (1<<20)) >> 21; s13 += carry12; s12 -= carry12 << 21; + carry14 = (s14 + (1<<20)) >> 21; s15 += carry14; s14 -= carry14 << 21; + carry16 = (s16 + (1<<20)) >> 21; s17 += carry16; s16 -= carry16 << 21; + + carry7 = (s7 + (1<<20)) >> 21; s8 += carry7; s7 -= carry7 << 21; + carry9 = (s9 + (1<<20)) >> 21; s10 += carry9; s9 -= carry9 << 21; + carry11 = (s11 + (1<<20)) >> 21; s12 += carry11; s11 -= carry11 << 21; + carry13 = (s13 + (1<<20)) >> 21; s14 += carry13; s13 -= carry13 << 21; + carry15 = (s15 + (1<<20)) >> 21; s16 += carry15; s15 -= carry15 << 21; + + s5 += s17 * 666643; + s6 += s17 * 470296; + s7 += s17 * 654183; + s8 -= s17 * 997805; + s9 += s17 * 136657; + s10 -= s17 * 683901; + s17 = 0; + + s4 += s16 * 666643; + s5 += s16 * 470296; + s6 += s16 * 654183; + s7 -= s16 * 997805; + s8 += s16 * 136657; + s9 -= s16 * 683901; + s16 = 0; + + s3 += s15 * 666643; + s4 += s15 * 470296; + s5 += s15 * 654183; + s6 -= s15 * 997805; + s7 += s15 * 136657; + s8 -= s15 * 683901; + s15 = 0; + + s2 += s14 * 666643; + s3 += s14 * 470296; + s4 += s14 * 654183; + s5 -= s14 * 997805; + s6 += s14 * 136657; + s7 -= s14 * 683901; + s14 = 0; + + s1 += s13 * 666643; + s2 += s13 * 470296; + s3 += s13 * 654183; + s4 -= s13 * 997805; + s5 += s13 * 136657; + s6 -= s13 * 683901; + s13 = 0; + + s0 += s12 * 666643; + s1 += s12 * 470296; + s2 += s12 * 654183; + s3 -= s12 * 997805; + s4 += s12 * 136657; + s5 -= s12 * 683901; + s12 = 0; + + carry0 = (s0 + (1<<20)) >> 21; s1 += carry0; s0 -= carry0 << 21; + carry2 = (s2 + (1<<20)) >> 21; s3 += carry2; s2 -= carry2 << 21; + carry4 = (s4 + (1<<20)) >> 21; s5 += carry4; s4 -= carry4 << 21; + carry6 = (s6 + (1<<20)) >> 21; s7 += carry6; s6 -= carry6 << 21; + carry8 = (s8 + (1<<20)) >> 21; s9 += carry8; s8 -= carry8 << 21; + carry10 = (s10 + (1<<20)) >> 21; s11 += carry10; s10 -= carry10 << 21; + + carry1 = (s1 + (1<<20)) >> 21; s2 += carry1; s1 -= carry1 << 21; + carry3 = (s3 + (1<<20)) >> 21; s4 += carry3; s3 -= carry3 << 21; + carry5 = (s5 + (1<<20)) >> 21; s6 += carry5; s5 -= carry5 << 21; + carry7 = (s7 + (1<<20)) >> 21; s8 += carry7; s7 -= carry7 << 21; + carry9 = (s9 + (1<<20)) >> 21; s10 += carry9; s9 -= carry9 << 21; + carry11 = (s11 + (1<<20)) >> 21; s12 += carry11; s11 -= carry11 << 21; + + s0 += s12 * 666643; + s1 += s12 * 470296; + s2 += s12 * 654183; + s3 -= s12 * 997805; + s4 += s12 * 136657; + s5 -= s12 * 683901; + s12 = 0; + + carry0 = s0 >> 21; s1 += carry0; s0 -= carry0 << 21; + carry1 = s1 >> 21; s2 += carry1; s1 -= carry1 << 21; + carry2 = s2 >> 21; s3 += carry2; s2 -= carry2 << 21; + carry3 = s3 >> 21; s4 += carry3; s3 -= carry3 << 21; + carry4 = s4 >> 21; s5 += carry4; s4 -= carry4 << 21; + carry5 = s5 >> 21; s6 += carry5; s5 -= carry5 << 21; + carry6 = s6 >> 21; s7 += carry6; s6 -= carry6 << 21; + carry7 = s7 >> 21; s8 += carry7; s7 -= carry7 << 21; + carry8 = s8 >> 21; s9 += carry8; s8 -= carry8 << 21; + carry9 = s9 >> 21; s10 += carry9; s9 -= carry9 << 21; + carry10 = s10 >> 21; s11 += carry10; s10 -= carry10 << 21; + carry11 = s11 >> 21; s12 += carry11; s11 -= carry11 << 21; + + s0 += s12 * 666643; + s1 += s12 * 470296; + s2 += s12 * 654183; + s3 -= s12 * 997805; + s4 += s12 * 136657; + s5 -= s12 * 683901; + s12 = 0; + + carry0 = s0 >> 21; s1 += carry0; s0 -= carry0 << 21; + carry1 = s1 >> 21; s2 += carry1; s1 -= carry1 << 21; + carry2 = s2 >> 21; s3 += carry2; s2 -= carry2 << 21; + carry3 = s3 >> 21; s4 += carry3; s3 -= carry3 << 21; + carry4 = s4 >> 21; s5 += carry4; s4 -= carry4 << 21; + carry5 = s5 >> 21; s6 += carry5; s5 -= carry5 << 21; + carry6 = s6 >> 21; s7 += carry6; s6 -= carry6 << 21; + carry7 = s7 >> 21; s8 += carry7; s7 -= carry7 << 21; + carry8 = s8 >> 21; s9 += carry8; s8 -= carry8 << 21; + carry9 = s9 >> 21; s10 += carry9; s9 -= carry9 << 21; + carry10 = s10 >> 21; s11 += carry10; s10 -= carry10 << 21; + + s[0] = (byte)(s0 >> 0); + s[1] = (byte)(s0 >> 8); + s[2] = (byte)((s0 >> 16) | (s1 << 5)); + s[3] = (byte)(s1 >> 3); + s[4] = (byte)(s1 >> 11); + s[5] = (byte)((s1 >> 19) | (s2 << 2)); + s[6] = (byte)(s2 >> 6); + s[7] = (byte)((s2 >> 14) | (s3 << 7)); + s[8] = (byte)(s3 >> 1); + s[9] = (byte)(s3 >> 9); + s[10] = (byte)((s3 >> 17) | (s4 << 4)); + s[11] = (byte)(s4 >> 4); + s[12] = (byte)(s4 >> 12); + s[13] = (byte)((s4 >> 20) | (s5 << 1)); + s[14] = (byte)(s5 >> 7); + s[15] = (byte)((s5 >> 15) | (s6 << 6)); + s[16] = (byte)(s6 >> 2); + s[17] = (byte)(s6 >> 10); + s[18] = (byte)((s6 >> 18) | (s7 << 3)); + s[19] = (byte)(s7 >> 5); + s[20] = (byte)(s7 >> 13); + s[21] = (byte)(s8 >> 0); + s[22] = (byte)(s8 >> 8); + s[23] = (byte)((s8 >> 16) | (s9 << 5)); + s[24] = (byte)(s9 >> 3); + s[25] = (byte)(s9 >> 11); + s[26] = (byte)((s9 >> 19) | (s10 << 2)); + s[27] = (byte)(s10 >> 6); + s[28] = (byte)((s10 >> 14) | (s11 << 7)); + s[29] = (byte)(s11 >> 1); + s[30] = (byte)(s11 >> 9); + s[31] = (byte)(s11 >> 17); +} + + +} diff --git a/src/org/whispersystems/curve25519/java/sc_reduce.java b/src/org/whispersystems/curve25519/java/sc_reduce.java new file mode 100644 index 00000000..f09c8f75 --- /dev/null +++ b/src/org/whispersystems/curve25519/java/sc_reduce.java @@ -0,0 +1,282 @@ +package org.whispersystems.curve25519.java; + +public class sc_reduce { + +//CONVERT #include "sc.h" +//CONVERT #include "long.h" +//CONVERT #include "crypto_uint32.h" +//CONVERT #include "long.h" + +public static long load_3(byte[] in, int index) +{ + long result; + result = ((long) in[index + 0]) & 0xFF; + result |= (((long) in[index + 1]) << 8) & 0xFF00; + result |= (((long) in[index + 2]) << 16) & 0xFF0000; + return result; +} + +public static long load_4(byte[] in, int index) +{ + long result; + result = (((long) in[index + 0]) & 0xFF); + result |= ((((long) in[index + 1]) << 8) & 0xFF00); + result |= ((((long) in[index + 2]) << 16) & 0xFF0000); + result |= ((((long) in[index + 3]) << 24) & 0xFF000000L); + return result; +} + +/* +Input: + s[0]+256*s[1]+...+256^63*s[63] = s + +Output: + s[0]+256*s[1]+...+256^31*s[31] = s mod l + where l = 2^252 + 27742317777372353535851937790883648493. + Overwrites s in place. +*/ +@SuppressWarnings("all") +public static void sc_reduce(byte[] s) +{ + long s0 = 2097151 & load_3(s, 0); + long s1 = 2097151 & (load_4(s, 2) >>> 5); + long s2 = 2097151 & (load_3(s, 5) >>> 2); + long s3 = 2097151 & (load_4(s, 7) >>> 7); + long s4 = 2097151 & (load_4(s, 10) >>> 4); + long s5 = 2097151 & (load_3(s, 13) >>> 1); + long s6 = 2097151 & (load_4(s, 15) >>> 6); + long s7 = 2097151 & (load_3(s, 18) >>> 3); + long s8 = 2097151 & load_3(s, 21); + long s9 = 2097151 & (load_4(s, 23) >>> 5); + long s10 = 2097151 & (load_3(s, 26) >>> 2); + long s11 = 2097151 & (load_4(s, 28) >>> 7); + long s12 = 2097151 & (load_4(s, 31) >>> 4); + long s13 = 2097151 & (load_3(s, 34) >>> 1); + long s14 = 2097151 & (load_4(s, 36) >>> 6); + long s15 = 2097151 & (load_3(s, 39) >>> 3); + long s16 = 2097151 & load_3(s, 42); + long s17 = 2097151 & (load_4(s, 44) >>> 5); + long s18 = 2097151 & (load_3(s, 47) >>> 2); + long s19 = 2097151 & (load_4(s, 49) >>> 7); + long s20 = 2097151 & (load_4(s, 52) >>> 4); + long s21 = 2097151 & (load_3(s, 55) >>> 1); + long s22 = 2097151 & (load_4(s, 57) >>> 6); + long s23 = (load_4(s, 60) >>> 3); + long carry0; + long carry1; + long carry2; + long carry3; + long carry4; + long carry5; + long carry6; + long carry7; + long carry8; + long carry9; + long carry10; + long carry11; + long carry12; + long carry13; + long carry14; + long carry15; + long carry16; + + s11 += s23 * 666643; + s12 += s23 * 470296; + s13 += s23 * 654183; + s14 -= s23 * 997805; + s15 += s23 * 136657; + s16 -= s23 * 683901; + s23 = 0; + + s10 += s22 * 666643; + s11 += s22 * 470296; + s12 += s22 * 654183; + s13 -= s22 * 997805; + s14 += s22 * 136657; + s15 -= s22 * 683901; + s22 = 0; + + s9 += s21 * 666643; + s10 += s21 * 470296; + s11 += s21 * 654183; + s12 -= s21 * 997805; + s13 += s21 * 136657; + s14 -= s21 * 683901; + s21 = 0; + + s8 += s20 * 666643; + s9 += s20 * 470296; + s10 += s20 * 654183; + s11 -= s20 * 997805; + s12 += s20 * 136657; + s13 -= s20 * 683901; + s20 = 0; + + s7 += s19 * 666643; + s8 += s19 * 470296; + s9 += s19 * 654183; + s10 -= s19 * 997805; + s11 += s19 * 136657; + s12 -= s19 * 683901; + s19 = 0; + + s6 += s18 * 666643; + s7 += s18 * 470296; + s8 += s18 * 654183; + s9 -= s18 * 997805; + s10 += s18 * 136657; + s11 -= s18 * 683901; + s18 = 0; + + carry6 = (s6 + (1<<20)) >> 21; s7 += carry6; s6 -= carry6 << 21; + carry8 = (s8 + (1<<20)) >> 21; s9 += carry8; s8 -= carry8 << 21; + carry10 = (s10 + (1<<20)) >> 21; s11 += carry10; s10 -= carry10 << 21; + carry12 = (s12 + (1<<20)) >> 21; s13 += carry12; s12 -= carry12 << 21; + carry14 = (s14 + (1<<20)) >> 21; s15 += carry14; s14 -= carry14 << 21; + carry16 = (s16 + (1<<20)) >> 21; s17 += carry16; s16 -= carry16 << 21; + + carry7 = (s7 + (1<<20)) >> 21; s8 += carry7; s7 -= carry7 << 21; + carry9 = (s9 + (1<<20)) >> 21; s10 += carry9; s9 -= carry9 << 21; + carry11 = (s11 + (1<<20)) >> 21; s12 += carry11; s11 -= carry11 << 21; + carry13 = (s13 + (1<<20)) >> 21; s14 += carry13; s13 -= carry13 << 21; + carry15 = (s15 + (1<<20)) >> 21; s16 += carry15; s15 -= carry15 << 21; + + s5 += s17 * 666643; + s6 += s17 * 470296; + s7 += s17 * 654183; + s8 -= s17 * 997805; + s9 += s17 * 136657; + s10 -= s17 * 683901; + s17 = 0; + + s4 += s16 * 666643; + s5 += s16 * 470296; + s6 += s16 * 654183; + s7 -= s16 * 997805; + s8 += s16 * 136657; + s9 -= s16 * 683901; + s16 = 0; + + s3 += s15 * 666643; + s4 += s15 * 470296; + s5 += s15 * 654183; + s6 -= s15 * 997805; + s7 += s15 * 136657; + s8 -= s15 * 683901; + s15 = 0; + + s2 += s14 * 666643; + s3 += s14 * 470296; + s4 += s14 * 654183; + s5 -= s14 * 997805; + s6 += s14 * 136657; + s7 -= s14 * 683901; + s14 = 0; + + s1 += s13 * 666643; + s2 += s13 * 470296; + s3 += s13 * 654183; + s4 -= s13 * 997805; + s5 += s13 * 136657; + s6 -= s13 * 683901; + s13 = 0; + + s0 += s12 * 666643; + s1 += s12 * 470296; + s2 += s12 * 654183; + s3 -= s12 * 997805; + s4 += s12 * 136657; + s5 -= s12 * 683901; + s12 = 0; + + carry0 = (s0 + (1<<20)) >> 21; s1 += carry0; s0 -= carry0 << 21; + carry2 = (s2 + (1<<20)) >> 21; s3 += carry2; s2 -= carry2 << 21; + carry4 = (s4 + (1<<20)) >> 21; s5 += carry4; s4 -= carry4 << 21; + carry6 = (s6 + (1<<20)) >> 21; s7 += carry6; s6 -= carry6 << 21; + carry8 = (s8 + (1<<20)) >> 21; s9 += carry8; s8 -= carry8 << 21; + carry10 = (s10 + (1<<20)) >> 21; s11 += carry10; s10 -= carry10 << 21; + + carry1 = (s1 + (1<<20)) >> 21; s2 += carry1; s1 -= carry1 << 21; + carry3 = (s3 + (1<<20)) >> 21; s4 += carry3; s3 -= carry3 << 21; + carry5 = (s5 + (1<<20)) >> 21; s6 += carry5; s5 -= carry5 << 21; + carry7 = (s7 + (1<<20)) >> 21; s8 += carry7; s7 -= carry7 << 21; + carry9 = (s9 + (1<<20)) >> 21; s10 += carry9; s9 -= carry9 << 21; + carry11 = (s11 + (1<<20)) >> 21; s12 += carry11; s11 -= carry11 << 21; + + s0 += s12 * 666643; + s1 += s12 * 470296; + s2 += s12 * 654183; + s3 -= s12 * 997805; + s4 += s12 * 136657; + s5 -= s12 * 683901; + s12 = 0; + + carry0 = s0 >> 21; s1 += carry0; s0 -= carry0 << 21; + carry1 = s1 >> 21; s2 += carry1; s1 -= carry1 << 21; + carry2 = s2 >> 21; s3 += carry2; s2 -= carry2 << 21; + carry3 = s3 >> 21; s4 += carry3; s3 -= carry3 << 21; + carry4 = s4 >> 21; s5 += carry4; s4 -= carry4 << 21; + carry5 = s5 >> 21; s6 += carry5; s5 -= carry5 << 21; + carry6 = s6 >> 21; s7 += carry6; s6 -= carry6 << 21; + carry7 = s7 >> 21; s8 += carry7; s7 -= carry7 << 21; + carry8 = s8 >> 21; s9 += carry8; s8 -= carry8 << 21; + carry9 = s9 >> 21; s10 += carry9; s9 -= carry9 << 21; + carry10 = s10 >> 21; s11 += carry10; s10 -= carry10 << 21; + carry11 = s11 >> 21; s12 += carry11; s11 -= carry11 << 21; + + s0 += s12 * 666643; + s1 += s12 * 470296; + s2 += s12 * 654183; + s3 -= s12 * 997805; + s4 += s12 * 136657; + s5 -= s12 * 683901; + s12 = 0; + + carry0 = s0 >> 21; s1 += carry0; s0 -= carry0 << 21; + carry1 = s1 >> 21; s2 += carry1; s1 -= carry1 << 21; + carry2 = s2 >> 21; s3 += carry2; s2 -= carry2 << 21; + carry3 = s3 >> 21; s4 += carry3; s3 -= carry3 << 21; + carry4 = s4 >> 21; s5 += carry4; s4 -= carry4 << 21; + carry5 = s5 >> 21; s6 += carry5; s5 -= carry5 << 21; + carry6 = s6 >> 21; s7 += carry6; s6 -= carry6 << 21; + carry7 = s7 >> 21; s8 += carry7; s7 -= carry7 << 21; + carry8 = s8 >> 21; s9 += carry8; s8 -= carry8 << 21; + carry9 = s9 >> 21; s10 += carry9; s9 -= carry9 << 21; + carry10 = s10 >> 21; s11 += carry10; s10 -= carry10 << 21; + + s[0] = (byte)(s0 >> 0); + s[1] = (byte)(s0 >> 8); + s[2] = (byte)((s0 >> 16) | (s1 << 5)); + s[3] = (byte)(s1 >> 3); + s[4] = (byte)(s1 >> 11); + s[5] = (byte)((s1 >> 19) | (s2 << 2)); + s[6] = (byte)(s2 >> 6); + s[7] = (byte)((s2 >> 14) | (s3 << 7)); + s[8] = (byte)(s3 >> 1); + s[9] = (byte)(s3 >> 9); + s[10] = (byte)((s3 >> 17) | (s4 << 4)); + s[11] = (byte)(s4 >> 4); + s[12] = (byte)(s4 >> 12); + s[13] = (byte)((s4 >> 20) | (s5 << 1)); + s[14] = (byte)(s5 >> 7); + s[15] = (byte)((s5 >> 15) | (s6 << 6)); + s[16] = (byte)(s6 >> 2); + s[17] = (byte)(s6 >> 10); + s[18] = (byte)((s6 >> 18) | (s7 << 3)); + s[19] = (byte)(s7 >> 5); + s[20] = (byte)(s7 >> 13); + s[21] = (byte)(s8 >> 0); + s[22] = (byte)(s8 >> 8); + s[23] = (byte)((s8 >> 16) | (s9 << 5)); + s[24] = (byte)(s9 >> 3); + s[25] = (byte)(s9 >> 11); + s[26] = (byte)((s9 >> 19) | (s10 << 2)); + s[27] = (byte)(s10 >> 6); + s[28] = (byte)((s10 >> 14) | (s11 << 7)); + s[29] = (byte)(s11 >> 1); + s[30] = (byte)(s11 >> 9); + s[31] = (byte)(s11 >> 17); +} + + +} diff --git a/src/org/whispersystems/curve25519/java/scalarmult.java b/src/org/whispersystems/curve25519/java/scalarmult.java new file mode 100644 index 00000000..4d7b59d0 --- /dev/null +++ b/src/org/whispersystems/curve25519/java/scalarmult.java @@ -0,0 +1,195 @@ +package org.whispersystems.curve25519.java; + +public class scalarmult { + +//CONVERT #include "crypto_scalarmult.h" +//CONVERT #include "fe.h" + +public static int crypto_scalarmult(byte[] q, + byte[] n, + byte[] p) +{ + byte[] e = new byte[32]; + int i; + int[] x1 = new int[10]; + int[] x2 = new int[10]; + int[] z2 = new int[10]; + int[] x3 = new int[10]; + int[] z3 = new int[10]; + int[] tmp0 = new int[10]; + int[] tmp1 = new int[10]; + int pos; + int swap; + int b; + + for (i = 0;i < 32;++i) e[i] = n[i]; +// e[0] &= 248; +// e[31] &= 127; +// e[31] |= 64; + fe_frombytes.fe_frombytes(x1,p); + fe_1.fe_1(x2); + fe_0.fe_0(z2); + fe_copy.fe_copy(x3,x1); + fe_1.fe_1(z3); + + swap = 0; + for (pos = 254;pos >= 0;--pos) { + b = e[pos / 8] >>> (pos & 7); + b &= 1; + swap ^= b; + fe_cswap.fe_cswap(x2,x3,swap); + fe_cswap.fe_cswap(z2,z3,swap); + swap = b; +//CONVERT #include "montgomery.h" + +/* qhasm: fe X2 */ + +/* qhasm: fe Z2 */ + +/* qhasm: fe X3 */ + +/* qhasm: fe Z3 */ + +/* qhasm: fe X4 */ + +/* qhasm: fe Z4 */ + +/* qhasm: fe X5 */ + +/* qhasm: fe Z5 */ + +/* qhasm: fe A */ + +/* qhasm: fe B */ + +/* qhasm: fe C */ + +/* qhasm: fe D */ + +/* qhasm: fe E */ + +/* qhasm: fe AA */ + +/* qhasm: fe BB */ + +/* qhasm: fe DA */ + +/* qhasm: fe CB */ + +/* qhasm: fe t0 */ + +/* qhasm: fe t1 */ + +/* qhasm: fe t2 */ + +/* qhasm: fe t3 */ + +/* qhasm: fe t4 */ + +/* qhasm: enter ladder */ + +/* qhasm: D = X3-Z3 */ +/* asm 1: fe_sub.fe_sub(>D=fe#5,D=tmp0,B=fe#6,B=tmp1,A=fe#1,A=x2,C=fe#2,C=z2,DA=fe#4,DA=z3,CB=fe#2,CB=z2,BB=fe#5,BB=tmp0,AA=fe#6,AA=tmp1,t0=fe#3,t0=x3,t1=fe#2,t1=z2,X4=fe#1,X4=x2,E=fe#6,E=tmp1,t2=fe#2,t2=z2,t3=fe#4,t3=z3,X5=fe#3,X5=x3,t4=fe#5,t4=tmp0,Z5=fe#4,x1,Z5=z3,x1,Z4=fe#2,Z4=z2, +//CONVERT #include "crypto_sign.h" +//CONVERT #include "crypto_hash_sha512.h" +//CONVERT #include "ge.h" +//CONVERT #include "sc.h" +//CONVERT #include "zeroize.h" + +/* NEW: Compare to pristine crypto_sign() + Uses explicit private key for nonce derivation and as scalar, + instead of deriving both from a master key. +*/ +static int crypto_sign_modified ( + Sha512 sha512provider, + byte[] sm, + byte[] m, long mlen, + byte[] sk, byte[] pk, + byte[] random +) +{ + byte[] nonce = new byte[64]; + byte[] hram = new byte[64]; + ge_p3 R = new ge_p3(); + int count=0; + + System.arraycopy(m, 0, sm, 64, (int)mlen); + System.arraycopy(sk, 0, sm, 32, 32); + + /* NEW : add prefix to separate hash uses - see .h */ + sm[0] = (byte)0xFE; + for (count = 1; count < 32; count++) + sm[count] = (byte)0xFF; + + /* NEW: add suffix of random data */ + System.arraycopy(random, 0, sm, (int)(mlen + 64), 64); + + sha512provider.calculateDigest(nonce,sm,mlen + 128); + System.arraycopy(pk, 0, sm, 32, 32); + + sc_reduce.sc_reduce(nonce); + ge_scalarmult_base.ge_scalarmult_base(R,nonce); + ge_p3_tobytes.ge_p3_tobytes(sm,R); + + sha512provider.calculateDigest(hram,sm,mlen + 64); + sc_reduce.sc_reduce(hram); + byte[] S = new byte[32]; + sc_muladd.sc_muladd(S,hram,sk,nonce); /* NEW: Use privkey directly */ + System.arraycopy(S, 0, sm, 32, 32); + + return 0; +} + + +} diff --git a/src/qora/account/Account.java b/src/qora/account/Account.java new file mode 100644 index 00000000..0c74d182 --- /dev/null +++ b/src/qora/account/Account.java @@ -0,0 +1,35 @@ +package qora.account; + +public class Account { + + public static final int ADDRESS_LENGTH = 25; + + protected String address; + + protected Account() { + } + + public Account(String address) { + this.address = address; + } + + public String getAddress() { + return address; + } + + // TOSTRING + + @Override + public int hashCode() { + return this.getAddress().hashCode(); + } + + // EQUALS + @Override + public boolean equals(Object b) { + if (!(b instanceof Account)) + return false; + + return this.getAddress().equals(((Account) b).getAddress()); + } +} diff --git a/src/qora/account/GenesisAccount.java b/src/qora/account/GenesisAccount.java new file mode 100644 index 00000000..170983d6 --- /dev/null +++ b/src/qora/account/GenesisAccount.java @@ -0,0 +1,9 @@ +package qora.account; + +public final class GenesisAccount extends PublicKeyAccount { + + public GenesisAccount() { + super(new byte[] { 1, 1, 1, 1, 1, 1, 1, 1 }); + } + +} diff --git a/src/qora/account/PrivateKeyAccount.java b/src/qora/account/PrivateKeyAccount.java new file mode 100644 index 00000000..96b3c220 --- /dev/null +++ b/src/qora/account/PrivateKeyAccount.java @@ -0,0 +1,30 @@ +package qora.account; + +import qora.crypto.Crypto; +import utils.Pair; + +public class PrivateKeyAccount extends PublicKeyAccount { + + private byte[] seed; + private Pair keyPair; + + public PrivateKeyAccount(byte[] seed) { + this.seed = seed; + this.keyPair = Crypto.createKeyPair(seed); + this.publicKey = keyPair.getB(); + this.address = Crypto.toAddress(this.publicKey); + } + + public byte[] getSeed() { + return this.seed; + } + + public byte[] getPrivateKey() { + return this.keyPair.getA(); + } + + public Pair getKeyPair() { + return this.keyPair; + } + +} diff --git a/src/qora/account/PublicKeyAccount.java b/src/qora/account/PublicKeyAccount.java new file mode 100644 index 00000000..2de9599a --- /dev/null +++ b/src/qora/account/PublicKeyAccount.java @@ -0,0 +1,21 @@ +package qora.account; + +import qora.crypto.Crypto; + +public class PublicKeyAccount extends Account { + + protected byte[] publicKey; + + public PublicKeyAccount(byte[] publicKey) { + this.publicKey = publicKey; + this.address = Crypto.toAddress(this.publicKey); + } + + protected PublicKeyAccount() { + } + + public byte[] getPublicKey() { + return publicKey; + } + +} diff --git a/src/qora/block/Block.java b/src/qora/block/Block.java new file mode 100644 index 00000000..4a5a0746 --- /dev/null +++ b/src/qora/block/Block.java @@ -0,0 +1,234 @@ +package qora.block; + +import java.math.BigDecimal; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +import org.json.simple.JSONObject; + +import com.google.common.primitives.Bytes; + +import database.DB; +import qora.account.PrivateKeyAccount; +import qora.account.PublicKeyAccount; +import qora.crypto.Crypto; +import qora.transaction.Transaction; + +/* + * Typical use-case scenarios: + * + * 1. Loading a Block from the database using height, signature, reference, etc. + * 2. Generating a new block, adding unconfirmed transactions + * 3. Receiving a block from another node + * + * Transaction count, transactions signature and total fees need to be maintained by Block. + * In scenario (1) these can be found in database. + * In scenarios (2) and (3) Transactions are added to the Block via addTransaction() method. + * Also in scenarios (2) and (3), Block is responsible for saving Transactions to DB. + * + * When is height set? + * In scenario (1) this can be found in database. + * In scenarios (2) and (3) this will need to be set after successful processing, + * but before Block is saved into database. + * + * GenerationSignature's data is: reference + generationTarget + generator's public key + * TransactionSignature's data is: generationSignature + transaction signatures + * Block signature is: generationSignature + transactionsSignature + */ + +public class Block { + + // Validation results + public static final int VALIDATE_OK = 1; + + // Database properties shared with all block types + protected int version; + protected byte[] reference; + protected int transactionCount; + protected BigDecimal totalFees; + protected byte[] transactionsSignature; + protected int height; + protected long timestamp; + protected BigDecimal generationTarget; + protected String generator; + protected byte[] generationSignature; + protected byte[] atBytes; + protected BigDecimal atFees; + + // Property lengths for serialisation + protected static final int VERSION_LENGTH = 4; + protected static final int REFERENCE_LENGTH = 64; + protected static final int TIMESTAMP_LENGTH = 8; + protected static final int GENERATION_TARGET_LENGTH = 8; + protected static final int GENERATOR_LENGTH = 32; + protected static final int TRANSACTIONS_SIGNATURE_LENGTH = 64; + protected static final int GENERATION_SIGNATURE_LENGTH = 64; + protected static final int TRANSACTION_COUNT_LENGTH = 8; + protected static final int BASE_LENGTH = VERSION_LENGTH + REFERENCE_LENGTH + TIMESTAMP_LENGTH + GENERATION_TARGET_LENGTH + GENERATOR_LENGTH + + TRANSACTIONS_SIGNATURE_LENGTH + GENERATION_SIGNATURE_LENGTH + TRANSACTION_COUNT_LENGTH; + + // Other length constants + public static final int MAX_BLOCK_BYTES = 1048576; + protected static final int TRANSACTION_SIZE_LENGTH = 4; + public static final int MAX_TRANSACTION_BYTES = MAX_BLOCK_BYTES - BASE_LENGTH - TRANSACTION_SIZE_LENGTH; + protected static final int AT_BYTES_LENGTH = 4; + protected static final int AT_FEES_LENGTH = 8; + protected static final int AT_LENGTH = AT_FEES_LENGTH + AT_BYTES_LENGTH; + + // Constructors + protected Block(int version, byte[] reference, long timestamp, BigDecimal generationTarget, String generator, byte[] generationSignature, byte[] atBytes, + BigDecimal atFees) { + this.version = version; + this.reference = reference; + this.timestamp = timestamp; + this.generationTarget = generationTarget; + this.generator = generator; + this.generationSignature = generationSignature; + + this.transactionCount = 0; + this.transactionsSignature = null; + this.totalFees = null; + + this.atBytes = atBytes; + this.atFees = atFees; + } + + // Getters/setters + + public int getVersion() { + return this.version; + } + + public byte[] getReference() { + return this.reference; + } + + public long getTimestamp() { + return this.timestamp; + } + + public BigDecimal getGenerationTarget() { + return this.generationTarget; + } + + public String getGenerator() { + return this.generator; + } + + public byte[] getGenerationSignature() { + return this.generationSignature; + } + + public byte[] getTransactionsSignature() { + return this.transactionsSignature; + } + + public BigDecimal getTotalFees() { + return null; + } + + public int getTransactionCount() { + return this.transactionCount; + } + + public byte[] getATBytes() { + return this.atBytes; + } + + public BigDecimal getATFees() { + return this.atFees; + } + + // More information + + public byte[] getSignature() { + if (this.generationSignature == null || this.transactionsSignature == null) + return null; + + return Bytes.concat(this.generationSignature, this.transactionsSignature); + } + + public int getDataLength() { + return 0; + } + + // Load/Save + + protected Block(Connection connection, byte[] signature) throws SQLException { + ResultSet rs = DB.executeUsingBytes(connection, + "SELECT version, reference, transaction_count, total_fees, " + + "transactions_signature, height, generation, generation_target, generator, generation_signature, " + + "AT_data, AT_fees FROM Blocks WHERE signature = ?", + signature); + + this.version = rs.getInt(1); + this.reference = DB.getResultSetBytes(rs.getBinaryStream(2), REFERENCE_LENGTH); + this.transactionCount = rs.getInt(3); + this.totalFees = rs.getBigDecimal(4); + this.transactionsSignature = DB.getResultSetBytes(rs.getBinaryStream(5), TRANSACTIONS_SIGNATURE_LENGTH); + this.height = rs.getInt(6); + this.timestamp = rs.getTimestamp(7).getTime(); + this.generationTarget = rs.getBigDecimal(8); + this.generator = rs.getString(9); + this.generationSignature = DB.getResultSetBytes(rs.getBinaryStream(10), GENERATION_SIGNATURE_LENGTH); + this.atBytes = DB.getResultSetBytes(rs.getBinaryStream(11)); + this.atFees = rs.getBigDecimal(12); + } + + protected void save(Connection connection) throws SQLException { + String sql = DB.formatInsertWithPlaceholders("Blocks", "version", "reference", "transaction_count", "total_fees", "transactions_signature", "height", + "generation", "generation_target", "generator", "generation_signature", "AT_data", "AT_fees"); + PreparedStatement preparedStatement = connection.prepareStatement(sql); + DB.bindInsertPlaceholders(preparedStatement, this.version, this.reference, this.transactionCount, this.totalFees, this.transactionsSignature, + this.height, this.timestamp, this.generationTarget, this.generator, this.generationSignature, this.atBytes, this.atFees); + preparedStatement.execute(); + + // Save transactions + // Save transaction-block mappings + } + + // Navigation + + // Converters + + public JSONObject toJSON() { + return null; + } + + public byte[] toBytes() { + return null; + } + + // Processing + + public boolean addTransaction(Transaction transaction) { + // Check there is space in block + // Add to block + // Update transaction count + // Update transactions signature + return false; // no room + } + + public byte[] calcSignature(PrivateKeyAccount signer) { + byte[] bytes = this.toBytes(); + + return Crypto.sign(signer, bytes); + } + + public boolean isSignatureValid(PublicKeyAccount signer) { + return false; + } + + public int isValid() { + return VALIDATE_OK; + } + + public void process() { + } + + public void orphan() { + } + +} diff --git a/src/qora/crypto/BrokenMD160.java b/src/qora/crypto/BrokenMD160.java new file mode 100644 index 00000000..bea0b2ca --- /dev/null +++ b/src/qora/crypto/BrokenMD160.java @@ -0,0 +1,329 @@ +package qora.crypto; + +/** + * BROKEN RIPEMD160 + *

+ * DO NOT USE in future code as this implementation is BROKEN and returns incorrect digests for some inputs. + *

+ * It is only "grand-fathered" here to produce correct QORA addresses. + */ + +@Deprecated +public class BrokenMD160 { + + private static final int[][] ArgArray = { + { 11, 14, 15, 12, 5, 8, 7, 9, 11, 13, 14, 15, 6, 7, 9, 8, 7, 6, 8, 13, 11, 9, 7, 15, 7, 12, 15, 9, 11, 7, 13, 12, 11, 13, 6, 7, 14, 9, 13, 15, 14, + 8, 13, 6, 5, 12, 7, 5, 11, 12, 14, 15, 14, 15, 9, 8, 9, 14, 5, 6, 8, 6, 5, 12, 9, 15, 5, 11, 6, 8, 13, 12, 5, 12, 13, 14, 11, 8, 5, 6 }, + { 8, 9, 9, 11, 13, 15, 15, 5, 7, 7, 8, 11, 14, 14, 12, 6, 9, 13, 15, 7, 12, 8, 9, 11, 7, 7, 12, 7, 6, 15, 13, 11, 9, 7, 15, 11, 8, 6, 6, 14, 12, 13, + 5, 14, 13, 13, 7, 5, 15, 5, 8, 11, 14, 14, 6, 14, 6, 9, 12, 9, 12, 5, 15, 8, 8, 5, 12, 9, 12, 5, 14, 6, 8, 13, 6, 5, 15, 13, 11, 11 } }; + private static final int[][] IndexArray = { + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 7, 4, 13, 1, 10, 6, 15, 3, 12, 0, 9, 5, 2, 14, 11, 8, 3, 10, 14, 4, 9, 15, 8, 1, 2, 7, 0, 6, + 13, 11, 5, 12, 1, 9, 11, 10, 0, 8, 12, 4, 13, 3, 7, 15, 14, 5, 6, 2, 4, 0, 5, 9, 7, 12, 2, 10, 14, 1, 3, 8, 11, 6, 15, 13 }, + { 5, 14, 7, 0, 9, 2, 11, 4, 13, 6, 15, 8, 1, 10, 3, 12, 6, 11, 3, 7, 0, 13, 5, 10, 14, 15, 8, 12, 4, 9, 1, 2, 15, 5, 1, 3, 7, 14, 6, 9, 11, 8, 12, + 2, 10, 0, 4, 13, 8, 6, 4, 1, 3, 11, 15, 0, 5, 12, 2, 13, 9, 7, 10, 14, 12, 15, 10, 4, 1, 5, 8, 7, 6, 2, 13, 14, 0, 3, 9, 11 } }; + private int[] MDbuf; + + public BrokenMD160() { + MDbuf = new int[5]; + MDbuf[0] = 0x67452301; + MDbuf[1] = 0xefcdab89; + MDbuf[2] = 0x98badcfe; + MDbuf[3] = 0x10325476; + MDbuf[4] = 0xc3d2e1f0; + working = new int[16]; + working_ptr = 0; + msglen = 0; + } + + public void reset() { + MDbuf = new int[5]; + MDbuf[0] = 0x67452301; + MDbuf[1] = 0xefcdab89; + MDbuf[2] = 0x98badcfe; + MDbuf[3] = 0x10325476; + MDbuf[4] = 0xc3d2e1f0; + working = new int[16]; + working_ptr = 0; + msglen = 0; + } + + private void compress(int[] X) { + int index = 0; + + int a, b, c, d, e; + int A, B, C, D, E; + int temp, s; + + A = a = MDbuf[0]; + B = b = MDbuf[1]; + C = c = MDbuf[2]; + D = d = MDbuf[3]; + E = e = MDbuf[4]; + + for (; index < 16; index++) { + // The 16 FF functions - round 1 */ + temp = a + (b ^ c ^ d) + X[IndexArray[0][index]]; + a = e; + e = d; + d = (c << 10) | (c >>> 22); + c = b; + s = ArgArray[0][index]; + b = ((temp << s) | (temp >>> (32 - s))) + a; + + // The 16 JJJ functions - parallel round 1 */ + temp = A + (B ^ (C | ~D)) + X[IndexArray[1][index]] + 0x50a28be6; + A = E; + E = D; + D = (C << 10) | (C >>> 22); + C = B; + s = ArgArray[1][index]; + B = ((temp << s) | (temp >>> (32 - s))) + A; + } + + for (; index < 32; index++) { + // The 16 GG functions - round 2 */ + temp = a + ((b & c) | (~b & d)) + X[IndexArray[0][index]] + 0x5a827999; + a = e; + e = d; + d = (c << 10) | (c >>> 22); + c = b; + s = ArgArray[0][index]; + b = ((temp << s) | (temp >>> (32 - s))) + a; + + // The 16 III functions - parallel round 2 */ + temp = A + ((B & D) | (C & ~D)) + X[IndexArray[1][index]] + 0x5c4dd124; + A = E; + E = D; + D = (C << 10) | (C >>> 22); + C = B; + s = ArgArray[1][index]; + B = ((temp << s) | (temp >>> (32 - s))) + A; + } + + for (; index < 48; index++) { + // The 16 HH functions - round 3 */ + temp = a + ((b | ~c) ^ d) + X[IndexArray[0][index]] + 0x6ed9eba1; + a = e; + e = d; + d = (c << 10) | (c >>> 22); + c = b; + s = ArgArray[0][index]; + b = ((temp << s) | (temp >>> (32 - s))) + a; + + // The 16 HHH functions - parallel round 3 */ + temp = A + ((B | ~C) ^ D) + X[IndexArray[1][index]] + 0x6d703ef3; + A = E; + E = D; + D = (C << 10) | (C >>> 22); + C = B; + s = ArgArray[1][index]; + B = ((temp << s) | (temp >>> (32 - s))) + A; + } + + for (; index < 64; index++) { + // The 16 II functions - round 4 */ + temp = a + ((b & d) | (c & ~d)) + X[IndexArray[0][index]] + 0x8f1bbcdc; + a = e; + e = d; + d = (c << 10) | (c >>> 22); + c = b; + s = ArgArray[0][index]; + b = ((temp << s) | (temp >>> (32 - s))) + a; + + // The 16 GGG functions - parallel round 4 */ + temp = A + ((B & C) | (~B & D)) + X[IndexArray[1][index]] + 0x7a6d76e9; + A = E; + E = D; + D = (C << 10) | (C >>> 22); + C = B; + s = ArgArray[1][index]; + B = ((temp << s) | (temp >>> (32 - s))) + A; + } + + for (; index < 80; index++) { + // The 16 JJ functions - round 5 */ + temp = a + (b ^ (c | ~d)) + X[IndexArray[0][index]] + 0xa953fd4e; + a = e; + e = d; + d = (c << 10) | (c >>> 22); + c = b; + s = ArgArray[0][index]; + b = ((temp << s) | (temp >>> (32 - s))) + a; + + // The 16 FFF functions - parallel round 5 */ + temp = A + (B ^ C ^ D) + X[IndexArray[1][index]]; + A = E; + E = D; + D = (C << 10) | (C >>> 22); + C = B; + s = ArgArray[1][index]; + B = ((temp << s) | (temp >>> (32 - s))) + A; + } + + /* combine results */ + D += c + MDbuf[1]; /* final result for MDbuf[0] */ + MDbuf[1] = MDbuf[2] + d + E; + MDbuf[2] = MDbuf[3] + e + A; + MDbuf[3] = MDbuf[4] + a + B; + MDbuf[4] = MDbuf[0] + b + C; + MDbuf[0] = D; + } + + private void MDfinish(int[] array, int lswlen, int mswlen) { + int[] X = array; /* message words */ + + /* append the bit m_n == 1 */ + X[(lswlen >> 2) & 15] ^= 1 << (((lswlen & 3) << 3) + 7); + + if ((lswlen & 63) > 55) { + /* length goes to next block */ + compress(X); + for (int i = 0; i < 14; i++) { + X[i] = 0; + } + } + + /* append length in bits */ + X[14] = lswlen << 3; + X[15] = (lswlen >> 29) | (mswlen << 3); + compress(X); + } + + private int[] working; + private int working_ptr; + private int msglen; + + public void update(byte input) { + working[working_ptr >> 2] ^= ((int) input) << ((working_ptr & 3) << 3); + working_ptr++; + if (working_ptr == 64) { + compress(working); + for (int j = 0; j < 16; j++) { + working[j] = 0; + } + working_ptr = 0; + } + msglen++; + } + + public void update(byte[] input) { + for (int i = 0; i < input.length; i++) { + working[working_ptr >> 2] ^= ((int) input[i]) << ((working_ptr & 3) << 3); + working_ptr++; + if (working_ptr == 64) { + compress(working); + for (int j = 0; j < 16; j++) { + working[j] = 0; + } + working_ptr = 0; + } + } + msglen += input.length; + } + + public void update(byte[] input, int offset, int len) { + if (offset + len >= input.length) { + for (int i = offset; i < input.length; i++) { + working[working_ptr >> 2] ^= ((int) input[i]) << ((working_ptr & 3) << 3); + working_ptr++; + if (working_ptr == 64) { + compress(working); + for (int j = 0; j < 16; j++) { + working[j] = 0; + } + working_ptr = 0; + } + } + msglen += input.length - offset; + } else { + for (int i = offset; i < offset + len; i++) { + working[working_ptr >> 2] ^= ((int) input[i]) << ((working_ptr & 3) << 3); + working_ptr++; + if (working_ptr == 64) { + compress(working); + for (int j = 0; j < 16; j++) { + working[j] = 0; + } + working_ptr = 0; + } + } + msglen += len; + } + } + + public void update(String s) { + byte[] bytearray = new byte[s.length()]; + for (int i = 0; i < bytearray.length; i++) { + bytearray[i] = (byte) s.charAt(i); + } + update(bytearray); + } + + public byte[] digestBin() { + MDfinish(working, msglen, 0); + byte[] res = new byte[20]; + for (int i = 0; i < 20; i++) { + res[i] = (byte) ((MDbuf[i >> 2] >>> ((i & 3) << 3)) & 0x000000FF); + } + return res; + } + + public byte[] digest(byte[] input) { + update(input); + return digestBin(); + } + + public String digest() { + MDfinish(working, msglen, 0); + byte[] res = new byte[20]; + for (int i = 0; i < 20; i++) { + res[i] = (byte) ((MDbuf[i >> 2] >>> ((i & 3) << 3)) & 0x000000FF); + } + + String hex = ""; + for (int i = 0; i < res.length; i++) { + hex += byteToHex(res[i]); + } + return hex; + } + + public byte[] digest(byte[] input, int offset, int len) { + update(input, offset, len); + return digestBin(); + } + + public int[] intdigest() { + int[] res = new int[5]; + for (int i = 0; i < 5; i++) { + res[i] = MDbuf[i]; + } + return res; + } + + public static String byteToHex(byte b) { + byte top = (byte) (((256 + b) / 16) & 15); + byte bottom = (byte) ((256 + b) & 15); + + String res; + + if (top > 9) { + res = "" + (char) ('a' + (top - 10)); + } else { + res = "" + (char) ('0' + top); + } + if (bottom > 9) { + res += (char) ('a' + (bottom - 10)); + } else { + res += (char) ('0' + bottom); + } + return res; + } + + public static String RIPEMD160String(String txt) { + BrokenMD160 r = new BrokenMD160(); + r.update(txt); + return r.digest(); + + } + +} \ No newline at end of file diff --git a/src/qora/crypto/Crypto.java b/src/qora/crypto/Crypto.java new file mode 100644 index 00000000..e5dcc77e --- /dev/null +++ b/src/qora/crypto/Crypto.java @@ -0,0 +1,130 @@ +package qora.crypto; + +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Arrays; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import qora.account.Account; +import qora.account.PrivateKeyAccount; +import utils.Base58; +import utils.Pair; + +public class Crypto { + + private static final Logger LOGGER = LogManager.getLogger(Crypto.class); + + public static final byte ADDRESS_VERSION = 58; + public static final byte AT_ADDRESS_VERSION = 23; + + public static byte[] digest(byte[] input) { + try { + // SHA2-256 + MessageDigest sha256 = MessageDigest.getInstance("SHA-256"); + return sha256.digest(input); + } catch (NoSuchAlgorithmException e) { + return null; + } + } + + public static byte[] doubleDigest(byte[] input) { + // Two rounds of SHA2-256 + return digest(digest(input)); + } + + public static Pair createKeyPair(byte[] seed) { + try { + // Generate private and public key pair + return Ed25519.createKeyPair(seed); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + return null; + } + } + + @SuppressWarnings("deprecation") + private static String toAddress(byte addressVersion, byte[] input) { + // SHA2-256 input to create new data and of known size + byte[] inputHash = digest(input); + + // Use BROKEN RIPEMD160 to create shorter address + BrokenMD160 brokenMD160 = new BrokenMD160(); + inputHash = brokenMD160.digest(inputHash); + + // Create address data using above hash and addressVersion (prepended) + byte[] addressBytes = new byte[inputHash.length + 1]; + System.arraycopy(inputHash, 0, addressBytes, 1, inputHash.length); + addressBytes[0] = addressVersion; + + // Generate checksum + byte[] checksum = doubleDigest(addressBytes); + + // Append checksum + byte[] addressWithChecksum = new byte[addressBytes.length + 4]; + System.arraycopy(addressBytes, 0, addressWithChecksum, 0, addressBytes.length); + System.arraycopy(checksum, 0, addressWithChecksum, addressBytes.length, 4); + + // Return Base58-encoded + return Base58.encode(addressWithChecksum); + } + + public static String toAddress(byte[] publicKey) { + return toAddress(ADDRESS_VERSION, publicKey); + } + + public static String toATAddress(byte[] signature) { + return toAddress(AT_ADDRESS_VERSION, signature); + } + + public static boolean isValidAddress(String address) { + byte[] addressBytes; + + try { + // Attempt Base58 decoding + addressBytes = Base58.decode(address); + } catch (NumberFormatException e) { + return false; + } + + // Check address length + if (addressBytes.length != Account.ADDRESS_LENGTH) + return false; + + // Check by address type + switch (addressBytes[0]) { + case ADDRESS_VERSION: + case AT_ADDRESS_VERSION: + byte[] addressWithoutChecksum = Arrays.copyOf(addressBytes, addressBytes.length - 4); + byte[] passedChecksum = Arrays.copyOfRange(addressWithoutChecksum, addressBytes.length - 4, addressBytes.length); + + byte[] generatedChecksum = doubleDigest(addressWithoutChecksum); + return Arrays.equals(passedChecksum, generatedChecksum); + + default: + return false; + } + } + + public static byte[] sign(PrivateKeyAccount account, byte[] message) { + try { + // GET SIGNATURE + return Ed25519.sign(account.getKeyPair(), message); + } catch (Exception e) { + LOGGER.error(e.getMessage(),e); + return new byte[64]; + } + } + + public static boolean verify(byte[] publicKey, byte[] signature, byte[] message) { + try { + // VERIFY SIGNATURE + return Ed25519.verify(signature, message, publicKey); + } catch (Exception e) { + LOGGER.error(e.getMessage(),e); + return false; + } + } + +} diff --git a/src/qora/crypto/CryptoBytes.java b/src/qora/crypto/CryptoBytes.java new file mode 100644 index 00000000..b48b554f --- /dev/null +++ b/src/qora/crypto/CryptoBytes.java @@ -0,0 +1,36 @@ +package qora.crypto; + +//Punisher.NaCl; + +public class CryptoBytes +{ + public static Boolean ConstantTimeEquals(byte[] x, int xOffset, byte[] y, int yOffset, int length) throws Exception + { + if (x == null) throw new Exception("x"); + if (xOffset < 0) throw new Exception("xOffset" + "xOffset < 0"); + if (y == null) throw new Exception("y"); + if (yOffset < 0) throw new Exception("yOffset" + "yOffset < 0"); + if (length < 0) throw new Exception("length" + "length < 0"); + if (x.length - xOffset < length) throw new Exception("xOffset + length > x.Length"); + if (y.length - yOffset < length) throw new Exception("yOffset + length > y.Length"); + + return InternalConstantTimeEquals(x, xOffset, y, yOffset, length); + } + + public static boolean InternalConstantTimeEquals(byte[] x, int xOffset, byte[] y, int yOffset, int length) + { + int result = 0; + for (int i = 0; i < length; i++) + { + result |= x[xOffset + i] ^ y[yOffset + i]; + } + return result == 0; // Check const time + } + + public static void Wipe(byte[] data) + { + for (int i = 0; i < data.length; i++) + data[i] = 0; + } + +} diff --git a/src/qora/crypto/Ed25519.java b/src/qora/crypto/Ed25519.java new file mode 100644 index 00000000..65c9cc7e --- /dev/null +++ b/src/qora/crypto/Ed25519.java @@ -0,0 +1,196 @@ +package qora.crypto; + +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + +import org.whispersystems.curve25519.java.*; + +import utils.Pair; + +public class Ed25519 { + + public static byte[] getSharedSecret(byte[] public_key, byte[] private_key) + { + byte[] shared_secret = new byte[32]; + + byte[] e = new byte[32]; + int i; + + int[] x1 = new int[10]; + int[] x2 = new int[10]; + int[] z2 = new int[10]; + int[] x3 = new int[10]; + int[] z3 = new int[10]; + int[] tmp0 = new int[10]; + int[] tmp1 = new int[10]; + + int pos; + int swap; + int b; + + /* copy the private key and make sure it's valid */ + for (i = 0; i < 32; ++i) { + e[i] = private_key[i]; + } + + e[0] &= 248; + e[31] &= 63; + e[31] |= 64; + + /* unpack the public key and convert edwards to montgomery */ + /* due to CodesInChaos: montgomeryX = (edwardsY + 1)*inverse(1 - edwardsY) mod p */ + fe_frombytes.fe_frombytes(x1, public_key); + fe_1.fe_1(tmp1); + fe_add.fe_add(tmp0, x1, tmp1); + fe_sub.fe_sub(tmp1, tmp1, x1); + fe_invert.fe_invert(tmp1, tmp1); + fe_mul.fe_mul(x1, tmp0, tmp1); + + fe_1.fe_1(x2); + fe_0.fe_0(z2); + fe_copy.fe_copy(x3, x1); + fe_1.fe_1(z3); + + swap = 0; + for (pos = 254; pos >= 0; --pos) { + b = e[pos / 8] >> (pos & 7); + b &= 1; + swap ^= b; + fe_cswap.fe_cswap(x2, x3, swap); + fe_cswap.fe_cswap(z2, z3, swap); + swap = b; + + /* from montgomery.h */ + fe_sub.fe_sub(tmp0, x3, z3); + fe_sub.fe_sub(tmp1, x2, z2); + fe_add.fe_add(x2, x2, z2); + fe_add.fe_add(z2, x3, z3); + fe_mul.fe_mul(z3, tmp0, x2); + fe_mul.fe_mul(z2, z2, tmp1); + fe_sq.fe_sq(tmp0, tmp1); + fe_sq.fe_sq(tmp1, x2); + fe_add.fe_add(x3, z3, z2); + fe_sub.fe_sub(z2, z3, z2); + fe_mul.fe_mul(x2, tmp1, tmp0); + fe_sub.fe_sub(tmp1, tmp1, tmp0); + fe_sq.fe_sq(z2, z2); + fe_mul121666.fe_mul121666(z3, tmp1); + fe_sq.fe_sq(x3, x3); + fe_add.fe_add(tmp0, tmp0, z3); + fe_mul.fe_mul(z3, x1, z2); + fe_mul.fe_mul(z2, tmp1, tmp0); + } + + fe_cswap.fe_cswap(x2, x3, swap); + fe_cswap.fe_cswap(z2, z3, swap); + + fe_invert.fe_invert(z2, z2); + fe_mul.fe_mul(x2, x2, z2); + fe_tobytes.fe_tobytes(shared_secret, x2); + + return shared_secret; + } + + public static boolean verify(byte[] signature, byte[] message, byte[] publicKey) throws Exception + { + byte[] h = new byte[64]; + byte[] checker = new byte[32]; + + ge_p3 A = new ge_p3(); + ge_p2 R = new ge_p2(); + + if ((signature[63] & 224) != 0) { + return false; + } + + if (ge_frombytes.ge_frombytes_negate_vartime(A, publicKey) != 0) { + return false; + } + + MessageDigest sha512 = MessageDigest.getInstance("SHA-512"); + + sha512.update(signature, 0, 32); + sha512.update(publicKey, 0, 32); + sha512.update(message, 0, message.length); + + h = sha512.digest(); + + sc_reduce.sc_reduce(h); + + byte[] sm32 = new byte[32]; + System.arraycopy(signature, 32, sm32, 0, 32); + + ge_double_scalarmult.ge_double_scalarmult_vartime(R, h, A, sm32); + ge_tobytes.ge_tobytes(checker, R); + + Boolean result = CryptoBytes.ConstantTimeEquals(checker, 0, signature, 0, 32); + + return result; + } + + public static byte[] sign(Pair keyPair, byte[] message) throws NoSuchAlgorithmException + { + byte[] private_key = keyPair.getA(); + byte[] public_key = keyPair.getB(); + + byte[] signature = new byte[64]; + + byte[] hram = new byte[64]; + byte[] r = new byte[64]; + ge_p3 R = new ge_p3(); + + MessageDigest sha512 = MessageDigest.getInstance("SHA-512"); + sha512.update(private_key, 32, 32); + sha512.update(message, 0, message.length); + r = sha512.digest(); + + sc_reduce.sc_reduce(r); + ge_scalarmult_base.ge_scalarmult_base(R, r); + ge_p3_tobytes.ge_p3_tobytes(signature, R); + + sha512 = MessageDigest.getInstance("SHA-512"); + sha512.update(signature, 0, 32); + sha512.update(public_key, 0, 32); + sha512.update(message, 0, message.length); + hram = sha512.digest(); + + sc_reduce.sc_reduce(hram); + + byte[] sm32 = new byte[32]; + sc_muladd.sc_muladd(sm32, hram, private_key, r); + System.arraycopy(sm32, 0, signature, 32, 32); + CryptoBytes.Wipe(sm32); + + return signature; + } + + public static Pair createKeyPair(byte[] seed) + { + byte[] private_key = new byte[64]; + byte[] public_key = new byte[32]; + + ge_p3 A = new ge_p3(); + + sha512(seed, 32, private_key); + + private_key[0] &= 248; + private_key[31] &= 63; + private_key[31] |= 64; + + ge_scalarmult_base.ge_scalarmult_base(A, private_key); + ge_p3_tobytes.ge_p3_tobytes(public_key, A); + + return new Pair(private_key, public_key); + } + + public static void sha512(byte[] in, long length, byte[] out) { + try { + MessageDigest messageDigest = MessageDigest.getInstance("SHA-512"); + messageDigest.update(in, 0, (int)length); + byte[] digest = messageDigest.digest(); + System.arraycopy(digest, 0, out, 0, digest.length); + } catch (NoSuchAlgorithmException e) { + throw new AssertionError(e); + } + } +} \ No newline at end of file diff --git a/src/qora/transaction/PaymentTransaction.java b/src/qora/transaction/PaymentTransaction.java new file mode 100644 index 00000000..573114e6 --- /dev/null +++ b/src/qora/transaction/PaymentTransaction.java @@ -0,0 +1,117 @@ +package qora.transaction; + +import java.math.BigDecimal; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +import org.json.simple.JSONObject; + +import database.DB; +import database.NoDataFoundException; + +public class PaymentTransaction extends Transaction { + + // Properties + // private PublicKeyAccount sender; + private String sender; + private String recipient; + private BigDecimal amount; + + // Property lengths + private static final int SENDER_LENGTH = 32; + private static final int RECIPIENT_LENGTH = 32; + private static final int AMOUNT_LENGTH = 8; + private static final int TYPELESS_LENGTH = BASE_TYPELESS_LENGTH + SENDER_LENGTH + RECIPIENT_LENGTH + AMOUNT_LENGTH; + + // Constructors + + public PaymentTransaction(String sender, String recipient, BigDecimal amount, BigDecimal fee, long timestamp, byte[] reference, byte[] signature) { + super(TransactionType.Payment, fee, sender, timestamp, reference, signature); + + this.sender = sender; + this.recipient = recipient; + this.amount = amount; + } + + public PaymentTransaction(String sender, String recipient, BigDecimal amount, BigDecimal fee, long timestamp, byte[] reference) { + this(sender, recipient, amount, fee, timestamp, reference, null); + } + + // Getters/Setters + + public String getSender() { + return this.sender; + } + + public String getRecipient() { + return this.recipient; + } + + public BigDecimal getAmount() { + return this.amount; + } + + // More information + + public int getDataLength() { + return TYPE_LENGTH + TYPELESS_LENGTH; + } + + // Load/Save + + public PaymentTransaction(Connection connection, byte[] signature) throws SQLException { + super(connection, TransactionType.Payment, signature); + + ResultSet rs = DB.executeUsingBytes(connection, "SELECT sender, recipient, amount FROM PaymentTransactions WHERE signature = ?", signature); + if (rs == null) + throw new NoDataFoundException(); + + this.sender = rs.getString(1); + this.recipient = rs.getString(2); + this.amount = rs.getBigDecimal(3).setScale(8); + } + + @Override + public void save(Connection connection) throws SQLException { + super.save(connection); + + String sql = DB.formatInsertWithPlaceholders("PaymentTransactions", "signature", "sender", "recipient", "amount"); + PreparedStatement preparedStatement = connection.prepareStatement(sql); + DB.bindInsertPlaceholders(preparedStatement, this.signature, this.sender, this.recipient, this.amount); + preparedStatement.execute(); + } + + // Converters + + public static Transaction parse(byte[] data) throws Exception { + // TODO + return null; + } + + @Override + public JSONObject toJSON() { + // TODO + return null; + } + + public byte[] toBytes() { + // TODO + return new byte[0]; + } + + // Processing + + public int isValid() { + // TODO + return VALIDATE_OK; + } + + public void process() { + } + + public void orphan() { + } + +} diff --git a/src/qora/transaction/Transaction.java b/src/qora/transaction/Transaction.java new file mode 100644 index 00000000..768c24b9 --- /dev/null +++ b/src/qora/transaction/Transaction.java @@ -0,0 +1,222 @@ +package qora.transaction; + +import java.math.BigDecimal; +import java.math.MathContext; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.time.Instant; +import java.util.Map; +import static java.util.Arrays.stream; +import static java.util.stream.Collectors.toMap; + +import org.json.simple.JSONObject; + +import database.DB; +import database.NoDataFoundException; +import qora.account.PrivateKeyAccount; +import qora.account.PublicKeyAccount; +import qora.crypto.Crypto; +import settings.Settings; + +public abstract class Transaction { + + // Transaction types + public enum TransactionType { + Genesis(1), Payment(2); + + public final int value; + + private final static Map map = stream(TransactionType.values()).collect(toMap(type -> type.value, type -> type)); + + TransactionType(int value) { + this.value = value; + } + + public static TransactionType valueOf(int value) { + return map.get(value); + } + } + + // Validation results + public static final int VALIDATE_OK = 1; + + // Minimum fee + public static final BigDecimal MINIMUM_FEE = BigDecimal.ONE; + + // Cached info to make transaction processing faster + protected static final BigDecimal maxBytePerFee = BigDecimal.valueOf(Settings.getInstance().getMaxBytePerFee()); + protected static final BigDecimal minFeePerByte = BigDecimal.ONE.divide(maxBytePerFee, MathContext.DECIMAL32); + + // Database properties shared with all transaction types + protected TransactionType type; + protected String creator; + protected long timestamp; + protected byte[] reference; + protected BigDecimal fee; + protected byte[] signature; + + // Derived/cached properties + // maybe: protected PublicKeyAccount creatorAccount; + + // Property lengths + protected static final int TYPE_LENGTH = 4; + protected static final int TIMESTAMP_LENGTH = 8; + protected static final int REFERENCE_LENGTH = 64; + protected static final int FEE_LENGTH = 8; + protected static final int SIGNATURE_LENGTH = 64; + protected static final int BASE_TYPELESS_LENGTH = TIMESTAMP_LENGTH + REFERENCE_LENGTH + FEE_LENGTH + SIGNATURE_LENGTH; + + // Constructors + + protected Transaction(TransactionType type, BigDecimal fee, String creator, long timestamp, byte[] reference, byte[] signature) { + this.fee = fee; + this.type = type; + this.creator = creator; + this.timestamp = timestamp; + this.reference = reference; + this.signature = signature; + } + + protected Transaction(TransactionType type, BigDecimal fee, String creator, long timestamp, byte[] reference) { + this(type, fee, creator, timestamp, reference, null); + } + + // Getters/setters + + public TransactionType getType() { + return this.type; + } + + public String getCreator() { + return this.creator; + } + + public long getTimestamp() { + return this.timestamp; + } + + public byte[] getReference() { + return this.reference; + } + + public BigDecimal getFee() { + return this.fee; + } + + public byte[] getSignature() { + return this.signature; + } + + // More information + + public long getDeadline() { + // 24 hour deadline to include transaction in a block + return this.timestamp + (24 * 60 * 60 * 1000); + } + + public abstract int getDataLength(); + + public boolean hasMinimumFee() { + return this.fee.compareTo(MINIMUM_FEE) >= 0; + } + + public BigDecimal feePerByte() { + return this.fee.divide(new BigDecimal(this.getDataLength()), MathContext.DECIMAL32); + } + + public boolean hasMinimumFeePerByte() { + return this.feePerByte().compareTo(minFeePerByte) >= 0; + } + + public BigDecimal calcRecommendedFee() { + BigDecimal recommendedFee = BigDecimal.valueOf(this.getDataLength()).divide(maxBytePerFee, MathContext.DECIMAL32).setScale(8); + + // security margin + recommendedFee = recommendedFee.add(new BigDecimal("0.0000001")); + + if (recommendedFee.compareTo(MINIMUM_FEE) <= 0) { + recommendedFee = MINIMUM_FEE; + } else { + recommendedFee = recommendedFee.setScale(0, BigDecimal.ROUND_UP); + } + + return recommendedFee.setScale(8); + } + + // Load/Save + + protected Transaction(Connection connection, TransactionType type, byte[] signature) throws SQLException { + ResultSet rs = DB.executeUsingBytes(connection, "SELECT reference, creator, creation, fee FROM Transactions WHERE signature = ?", signature); + if (rs == null) + throw new NoDataFoundException(); + + this.type = type; + this.reference = DB.getResultSetBytes(rs.getBinaryStream(1), REFERENCE_LENGTH); + this.creator = rs.getString(2); + this.timestamp = rs.getTimestamp(3).getTime(); + this.fee = rs.getBigDecimal(4).setScale(8); + this.signature = signature; + } + + protected void save(Connection connection) throws SQLException { + String sql = DB.formatInsertWithPlaceholders("Transactions", "signature", "reference", "type", "creator", "creation", "fee", "milestone_block"); + PreparedStatement preparedStatement = connection.prepareStatement(sql); + DB.bindInsertPlaceholders(preparedStatement, this.signature, this.reference, this.type.value, this.creator, + Timestamp.from(Instant.ofEpochSecond(this.timestamp)), this.fee, null); + preparedStatement.execute(); + } + + // Navigation + + /* + * public Block getBlock() { BlockTransaction blockTx = BlockTransaction.fromTransactionSignature(this.signature); if (blockTx == null) return null; + * + * return Block.fromSignature(blockTx.getSignature()); } + * + */ + + public Transaction getParent(Connection connection) throws SQLException { + if (this.reference == null) + return null; + + return TransactionFactory.fromSignature(connection, this.reference); + } + + public Transaction getChild(Connection connection) throws SQLException { + if (this.signature == null) + return null; + + return TransactionFactory.fromReference(connection, this.signature); + } + + // Converters + + public abstract JSONObject toJSON(); + + public abstract byte[] toBytes(); + + // Processing + + public byte[] calcSignature(PrivateKeyAccount signer) { + byte[] bytes = this.toBytes(); + + return Crypto.sign(signer, bytes); + } + + public boolean isSignatureValid(PublicKeyAccount signer) { + if (this.signature == null) + return false; + + return Crypto.verify(signer.getPublicKey(), this.signature, this.toBytes()); + } + + public abstract int isValid(); + + public abstract void process(); + + public abstract void orphan(); + +} diff --git a/src/qora/transaction/TransactionFactory.java b/src/qora/transaction/TransactionFactory.java new file mode 100644 index 00000000..3fda28b0 --- /dev/null +++ b/src/qora/transaction/TransactionFactory.java @@ -0,0 +1,45 @@ +package qora.transaction; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; + +import database.DB; +import qora.transaction.Transaction.TransactionType; + +public class TransactionFactory { + + public static Transaction fromSignature(Connection connection, byte[] signature) throws SQLException { + ResultSet resultSet = DB.executeUsingBytes(connection, "SELECT type, signature FROM Transactions WHERE signature = ?", signature); + return fromResultSet(connection, resultSet); + } + + public static Transaction fromReference(Connection connection, byte[] reference) throws SQLException { + ResultSet resultSet = DB.executeUsingBytes(connection, "SELECT type, signature FROM Transactions WHERE reference = ?", reference); + return fromResultSet(connection, resultSet); + } + + private static Transaction fromResultSet(Connection connection, ResultSet resultSet) throws SQLException { + if (resultSet == null) + return null; + + TransactionType type = TransactionType.valueOf(resultSet.getInt(1)); + if (type == null) + return null; + + byte[] signature = DB.getResultSetBytes(resultSet.getBinaryStream(2), Transaction.SIGNATURE_LENGTH); + + switch (type) { + case Genesis: + // return new GenesisTransaction(connection, signature); + return null; + + case Payment: + return new PaymentTransaction(connection, signature); + + default: + return null; + } + } + +} diff --git a/src/settings/Settings.java b/src/settings/Settings.java new file mode 100644 index 00000000..fca4fbc9 --- /dev/null +++ b/src/settings/Settings.java @@ -0,0 +1,13 @@ +package settings; + +public class Settings { + + public static Settings getInstance() { + return new Settings(); + } + + public int getMaxBytePerFee() { + return 1024; + } + +} diff --git a/src/test/common.java b/src/test/common.java new file mode 100644 index 00000000..885fae0a --- /dev/null +++ b/src/test/common.java @@ -0,0 +1,21 @@ +package test; + +import static org.junit.Assert.fail; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; + +public class common { + + public static Connection getConnection() { + try { + return DriverManager.getConnection("jdbc:hsqldb:file:db/test;create=true;close_result=true;sql.strict_exec=true;sql.enforce_names=true;sql.syntax_mys=true", "SA", ""); + } catch (SQLException e) { + e.printStackTrace(); + fail(); + return null; + } + } + +} diff --git a/src/test/connections.java b/src/test/connections.java new file mode 100644 index 00000000..31851e34 --- /dev/null +++ b/src/test/connections.java @@ -0,0 +1,76 @@ +package test; + +import static org.junit.Assert.*; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; + +import org.junit.Test; + +public class connections { + + @Test + public void testConnection() { + try { + Connection c = DriverManager.getConnection("jdbc:hsqldb:file:db/test", "SA", ""); + c.close(); + } catch (SQLException e) { + e.printStackTrace(); + fail(); + } + } + + @Test + public void testSimultaneousConnections() { + try { + Connection c1 = DriverManager.getConnection("jdbc:hsqldb:file:db/test", "SA", ""); + Connection c2 = DriverManager.getConnection("jdbc:hsqldb:file:db/test", "SA", ""); + c1.close(); + c2.close(); + } catch (SQLException e) { + e.printStackTrace(); + fail(); + } + } + + @Test + public void testExistOnlyConnection() { + try { + Connection c = DriverManager.getConnection("jdbc:hsqldb:file:db/test;ifexists=true", "SA", ""); + c.close(); + } catch (SQLException e) { + e.printStackTrace(); + fail(); + } + } + + @Test + public void testConnectionAfterShutdown() { + try { + Connection c = DriverManager.getConnection("jdbc:hsqldb:file:db/test", "SA", ""); + Statement s = c.createStatement(); + s.execute("SHUTDOWN COMPACT"); + c.close(); + + c = DriverManager.getConnection("jdbc:hsqldb:file:db/test", "SA", ""); + c.close(); + } catch (SQLException e) { + e.printStackTrace(); + fail(); + } + } + + @Test + public void testComplexConnection() { + try { + Connection c = DriverManager.getConnection("jdbc:hsqldb:file:db/test;create=false;close_result=true;sql.strict_exec=true;sql.enforce_names=true", "SA", ""); + c.close(); + } catch (SQLException e) { + e.printStackTrace(); + fail(); + } + } + +} diff --git a/src/test/crypto.java b/src/test/crypto.java new file mode 100644 index 00000000..4abb7aa3 --- /dev/null +++ b/src/test/crypto.java @@ -0,0 +1,39 @@ +package test; + +import static org.junit.Assert.*; + +import org.junit.Test; + +import com.google.common.hash.HashCode; + +import qora.crypto.Crypto; + +public class crypto { + + @Test + public void testCryptoDigest() { + byte[] input = HashCode.fromString("00").asBytes(); + byte[] digest = Crypto.digest(input); + byte[] expected = HashCode.fromString("6e340b9cffb37a989ca544e6bb780a2c78901d3fb33738768511a30617afa01d").asBytes(); + + assertArrayEquals(digest, expected); + } + + @Test + public void testCryptoDoubleDigest() { + byte[] input = HashCode.fromString("00").asBytes(); + byte[] digest = Crypto.doubleDigest(input); + byte[] expected = HashCode.fromString("1406e05881e299367766d313e26c05564ec91bf721d31726bd6e46e60689539a").asBytes(); + + assertArrayEquals(digest, expected); + } + + @Test + public void testCryptoQoraAddress() { + byte[] publicKey = HashCode.fromString("775ada64a48a30b3bfc4f1db16bca512d4088704975a62bde78781ce0cba90d6").asBytes(); + String expected = "QUD9y7NZqTtNwvSAUfewd7zKUGoVivVnTW"; + + assertEquals(expected, Crypto.toAddress(publicKey)); + } + +} diff --git a/src/test/load.java b/src/test/load.java new file mode 100644 index 00000000..33922162 --- /dev/null +++ b/src/test/load.java @@ -0,0 +1,82 @@ +package test; + +import static org.junit.Assert.*; + +import java.sql.Connection; +import java.sql.SQLException; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import qora.transaction.PaymentTransaction; +import qora.transaction.Transaction; +import qora.transaction.TransactionFactory; +import utils.Base58; + +public class load { + + private static Connection connection; + + @Before + public void connect() throws SQLException { + connection = common.getConnection(); + } + + @After + public void disconnect() { + try { + connection.createStatement().execute("SHUTDOWN"); + } catch (SQLException e) { + fail(); + } + } + + @Test + public void testLoadPaymentTransaction() throws SQLException { + String signature58 = "1211ZPwG3hk5evWzXCZi9hMDRpwumWmkENjwWkeTCik9xA5uoYnxzF7rwR5hmHH3kG2RXo7ToCAaRc7dvnynByJt"; + byte[] signature = Base58.decode(signature58); + + PaymentTransaction paymentTransaction = new PaymentTransaction(connection, signature); + + assertEquals(paymentTransaction.getSender(), "QXwu8924WdgPoRmtiWQBUMF6eedmp1Hu2E"); + assertEquals(paymentTransaction.getCreator(), "QXwu8924WdgPoRmtiWQBUMF6eedmp1Hu2E"); + assertEquals(paymentTransaction.getRecipient(), "QZsv8vbJ6QfrBNba4LMp5UtHhAzhrxvVUU"); + assertEquals(paymentTransaction.getTimestamp(), 1416209264000L); + assertEquals(Base58.encode(paymentTransaction.getReference()), "31dC6kHHBeG5vYb8LMaZDjLEmhc9kQB2VUApVd8xWncSRiXu7yMejdprjYFMP2rUnzZxWd4KJhkq6LsV7rQvU1kY"); + } + + @Test + public void testLoadFactory() throws SQLException { + String signature58 = "1211ZPwG3hk5evWzXCZi9hMDRpwumWmkENjwWkeTCik9xA5uoYnxzF7rwR5hmHH3kG2RXo7ToCAaRc7dvnynByJt"; + byte[] signature = Base58.decode(signature58); + + while (true) { + Transaction transaction = TransactionFactory.fromSignature(connection, signature); + if (transaction == null) + break; + + PaymentTransaction payment = (PaymentTransaction) transaction; + System.out.println("Transaction " + Base58.encode(payment.getSignature()) + ": " + payment.getAmount().toString() + " QORA from " + payment.getSender() + " to " + payment.getRecipient()); + + signature = payment.getReference(); + } + } + + @Test + public void testLoadNonexistentTransaction() throws SQLException { + String signature58 = "1111222233334444"; + byte[] signature = Base58.decode(signature58); + + try { + PaymentTransaction payment = new PaymentTransaction(connection, signature); + System.out.println("Transaction " + Base58.encode(payment.getSignature()) + ": " + payment.getAmount().toString() + " QORA from " + payment.getSender() + " to " + payment.getRecipient()); + } catch (SQLException e) { + System.out.println(e.getMessage()); + return; + } + + fail(); + } + +} diff --git a/src/test/migrate.java b/src/test/migrate.java new file mode 100644 index 00000000..cb27a546 --- /dev/null +++ b/src/test/migrate.java @@ -0,0 +1,596 @@ +package test; + +import static org.junit.Assert.*; + +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import java.net.URL; +import java.nio.charset.Charset; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.json.simple.JSONArray; +import org.json.simple.JSONObject; +import org.json.simple.JSONValue; +import org.json.simple.parser.ParseException; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import com.google.common.hash.HashCode; + +import utils.Base58; + +public class migrate { + + private static Connection c; + private static PreparedStatement startTransactionPStmt; + private static PreparedStatement commitPStmt; + + @Before + public void connect() throws SQLException { + c = common.getConnection(); + startTransactionPStmt = c.prepareStatement("START TRANSACTION"); + commitPStmt = c.prepareStatement("COMMIT"); + } + + @After + public void disconnect() { + try { + c.createStatement().execute("SHUTDOWN"); + } catch (SQLException e) { + fail(); + } + } + + public Object fetchBlockJSON(int height) { + InputStream is; + try { + is = new URL("http://localhost:9085/blocks/byheight/" + height).openStream(); + } catch (IOException e) { + return null; + } + + try { + BufferedReader reader = new BufferedReader(new InputStreamReader(is, Charset.forName("UTF-8"))); + return JSONValue.parseWithException(reader); + } catch (IOException | ParseException e) { + return null; + } finally { + try { + is.close(); + } catch (IOException e) { + } + } + } + + public String formatWithPlaceholders(String... columns) { + String[] placeholders = new String[columns.length]; + Arrays.setAll(placeholders, (int i) -> "?"); + + StringBuilder output = new StringBuilder(); + output.append("("); + output.append(String.join(", ", columns)); + output.append(") VALUES ("); + output.append(String.join(", ", placeholders)); + output.append(")"); + return output.toString(); + } + + public void startTransaction() throws SQLException { + startTransactionPStmt.execute(); + } + + public void commit() throws SQLException { + commitPStmt.execute(); + } + + @Test + public void testMigration() throws SQLException, UnsupportedEncodingException { + Statement stmt = c.createStatement(); + stmt.execute("DELETE FROM Blocks"); + + PreparedStatement blocksPStmt = c + .prepareStatement("INSERT INTO Blocks " + formatWithPlaceholders("signature", "version", "reference", "transaction_count", "total_fees", + "transactions_signature", "height", "generation", "generation_target", "generator", "generation_signature", "AT_data", "AT_fees")); + + PreparedStatement txPStmt = c.prepareStatement( + "INSERT INTO Transactions " + formatWithPlaceholders("signature", "reference", "type", "creator", "creation", "fee", "milestone_block")); + + PreparedStatement recipientPStmt = c.prepareStatement("INSERT INTO TransactionRecipients " + formatWithPlaceholders("signature", "recipient")); + + PreparedStatement genesisPStmt = c.prepareStatement("INSERT INTO GenesisTransactions " + formatWithPlaceholders("signature", "recipient", "amount")); + PreparedStatement paymentPStmt = c + .prepareStatement("INSERT INTO PaymentTransactions " + formatWithPlaceholders("signature", "sender", "recipient", "amount")); + PreparedStatement registerNamePStmt = c + .prepareStatement("INSERT INTO RegisterNameTransactions " + formatWithPlaceholders("signature", "registrant", "name", "owner", "data")); + PreparedStatement updateNamePStmt = c + .prepareStatement("INSERT INTO UpdateNameTransactions " + formatWithPlaceholders("signature", "owner", "name", "new_owner", "new_data")); + PreparedStatement sellNamePStmt = c + .prepareStatement("INSERT INTO SellNameTransactions " + formatWithPlaceholders("signature", "owner", "name", "amount")); + PreparedStatement cancelSellNamePStmt = c + .prepareStatement("INSERT INTO CancelSellNameTransactions " + formatWithPlaceholders("signature", "owner", "name")); + PreparedStatement buyNamePStmt = c + .prepareStatement("INSERT INTO BuyNameTransactions " + formatWithPlaceholders("signature", "buyer", "name", "seller", "amount")); + PreparedStatement createPollPStmt = c + .prepareStatement("INSERT INTO CreatePollTransactions " + formatWithPlaceholders("signature", "creator", "poll", "description")); + PreparedStatement createPollOptionPStmt = c + .prepareStatement("INSERT INTO CreatePollTransactionOptions " + formatWithPlaceholders("signature", "option")); + PreparedStatement voteOnPollPStmt = c + .prepareStatement("INSERT INTO VoteOnPollTransactions " + formatWithPlaceholders("signature", "voter", "poll", "option_index")); + PreparedStatement arbitraryPStmt = c + .prepareStatement("INSERT INTO ArbitraryTransactions " + formatWithPlaceholders("signature", "creator", "service", "data_hash")); + PreparedStatement issueAssetPStmt = c.prepareStatement("INSERT INTO IssueAssetTransactions " + + formatWithPlaceholders("signature", "creator", "asset_name", "description", "quantity", "is_divisible")); + PreparedStatement transferAssetPStmt = c + .prepareStatement("INSERT INTO TransferAssetTransactions " + formatWithPlaceholders("signature", "sender", "recipient", "asset", "amount")); + PreparedStatement createAssetOrderPStmt = c.prepareStatement("INSERT INTO CreateAssetOrderTransactions " + + formatWithPlaceholders("signature", "creator", "have_asset", "have_amount", "want_asset", "want_amount")); + PreparedStatement cancelAssetOrderPStmt = c + .prepareStatement("INSERT INTO CancelAssetOrderTransactions " + formatWithPlaceholders("signature", "creator", "asset_order")); + PreparedStatement multiPaymentPStmt = c.prepareStatement("INSERT INTO MultiPaymentTransactions " + formatWithPlaceholders("signature", "sender")); + PreparedStatement deployATPStmt = c.prepareStatement("INSERT INTO DeployATTransactions " + + formatWithPlaceholders("signature", "creator", "AT_name", "description", "AT_type", "AT_tags", "creation_bytes", "amount")); + PreparedStatement messagePStmt = c.prepareStatement("INSERT INTO MessageTransactions " + + formatWithPlaceholders("signature", "sender", "recipient", "is_text", "is_encrypted", "amount", "asset", "data")); + + PreparedStatement sharedPaymentPStmt = c + .prepareStatement("INSERT INTO SharedTransactionPayments " + formatWithPlaceholders("signature", "recipient", "amount", "asset")); + + PreparedStatement blockTxPStmt = c.prepareStatement("INSERT INTO BlockTransactions " + formatWithPlaceholders("block", "sequence", "signature")); + + int height = 1; + byte[] milestone_block = null; + while (true) { + JSONObject json = (JSONObject) fetchBlockJSON(height); + if (json == null) + break; + + if (height % 1000 == 0) + System.out.println("Height: " + height); + + JSONArray transactions = (JSONArray) json.get("transactions"); + + startTransaction(); + + // Blocks: + // signature, version, reference, transaction_count, total_fees, transactions_signature, height, generation, generation_target, generator, + // generation_signature + // varchar, tinyint, varchar, int, decimal, varchar, int, timestamp, decimal, varchar, varchar + byte[] blockSignature = Base58.decode((String) json.get("signature")); + byte[] blockReference = Base58.decode((String) json.get("reference")); + byte[] blockTransactionsSignature = Base58.decode((String) json.get("transactionsSignature")); + byte[] blockGeneratorSignature = Base58.decode((String) json.get("generatorSignature")); + + blocksPStmt.setBinaryStream(1, new ByteArrayInputStream(blockSignature)); + blocksPStmt.setInt(2, ((Long) json.get("version")).intValue()); + blocksPStmt.setBinaryStream(3, new ByteArrayInputStream(blockReference)); + blocksPStmt.setInt(4, transactions.size()); + blocksPStmt.setBigDecimal(5, BigDecimal.valueOf(Double.valueOf((String) json.get("fee")).doubleValue())); + blocksPStmt.setBinaryStream(6, new ByteArrayInputStream(blockTransactionsSignature)); + blocksPStmt.setInt(7, height); + blocksPStmt.setTimestamp(8, new Timestamp((Long) json.get("timestamp"))); + blocksPStmt.setBigDecimal(9, BigDecimal.valueOf((Long) json.get("generatingBalance"))); + blocksPStmt.setString(10, (String) json.get("generator")); + blocksPStmt.setBinaryStream(11, new ByteArrayInputStream(blockGeneratorSignature)); + + String blockATs = (String) json.get("blockATs"); + if (blockATs != null && blockATs.length() > 0) { + HashCode atBytes = HashCode.fromString(blockATs); + + blocksPStmt.setBinaryStream(12, new ByteArrayInputStream(atBytes.asBytes())); + blocksPStmt.setBigDecimal(13, BigDecimal.valueOf(((Long) json.get("atFees")).longValue(), 8)); + } else { + blocksPStmt.setNull(12, java.sql.Types.VARBINARY); + blocksPStmt.setNull(13, java.sql.Types.DECIMAL); + } + + blocksPStmt.execute(); + blocksPStmt.clearParameters(); + + // Transactions: + // signature, reference, type, creator, creation, fee, milestone_block + // varchar, varchar, int, varchar, timestamp, decimal, varchar + for (int txIndex = 0; txIndex < transactions.size(); ++txIndex) { + JSONObject transaction = (JSONObject) transactions.get(txIndex); + + byte[] txSignature = Base58.decode((String) transaction.get("signature")); + txPStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + + String txReference58 = (String) transaction.get("reference"); + byte[] txReference = txReference58.isEmpty() ? null : Base58.decode(txReference58); + int type = ((Long) transaction.get("type")).intValue(); + + if (txReference != null) + txPStmt.setBinaryStream(2, new ByteArrayInputStream(txReference)); + else if (height == 1 && type == 1) + txPStmt.setNull(2, java.sql.Types.VARCHAR); // genesis transactions only + else + fail(); + + txPStmt.setInt(3, type); + + switch (type) { + case 1: // genesis + txPStmt.setNull(4, java.sql.Types.VARCHAR); // genesis transactions only + break; + + case 2: // payment + case 12: // transfer asset + case 15: // multi-payment + txPStmt.setString(4, (String) transaction.get("sender")); + break; + + case 3: // register name + txPStmt.setString(4, (String) transaction.get("registrant")); + break; + + case 4: // update name + case 5: // sell name + case 6: // cancel sell name + txPStmt.setString(4, (String) transaction.get("owner")); + break; + + case 7: // buy name + txPStmt.setString(4, (String) transaction.get("buyer")); + break; + + case 8: // create poll + case 9: // vote on poll + case 10: // arbitrary transaction + case 11: // issue asset + case 13: // create asset order + case 14: // cancel asset order + case 16: // deploy CIYAM AT + case 17: // message + txPStmt.setString(4, (String) transaction.get("creator")); + break; + + default: + fail(); + } + + txPStmt.setTimestamp(5, new Timestamp((Long) transaction.get("timestamp"))); + txPStmt.setBigDecimal(6, BigDecimal.valueOf(Double.valueOf((String) transaction.get("fee")).doubleValue())); + + if (milestone_block != null) + txPStmt.setBinaryStream(7, new ByteArrayInputStream(milestone_block)); + else if (height == 1 && type == 1) + txPStmt.setNull(7, java.sql.Types.VARCHAR); // genesis transactions only + else + fail(); + + txPStmt.execute(); + txPStmt.clearParameters(); + + JSONArray multiPayments = null; + if (type == 15) + multiPayments = (JSONArray) transaction.get("payments"); + + List recipients = new ArrayList(); + switch (type) { + case 1: // genesis + case 2: // payment + case 12: // transfer asset + case 17: // message + recipients.add((String) transaction.get("recipient")); + break; + + case 3: // register name + case 4: // update name + // parse Name data for "owner" + break; + + case 5: // sell name + case 6: // cancel sell name + case 8: // create poll + case 9: // vote on poll + case 10: // arbitrary transaction + case 13: // create asset order + case 14: // cancel asset order + case 16: // deploy CIYAM AT + // no recipients + break; + + case 7: // buy name + recipients.add((String) transaction.get("seller")); + break; + + case 11: // issue asset + recipients.add((String) transaction.get("creator")); + break; + + case 15: // multi-payment + assertNotNull(multiPayments); + for (Object payment : multiPayments) { + String recipient = (String) ((JSONObject) payment).get("recipient"); + recipients.add(recipient); + } + break; + + default: + fail(); + } + + for (String recipient : recipients) { + recipientPStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + recipientPStmt.setString(2, recipient); + + recipientPStmt.execute(); + recipientPStmt.clearParameters(); + } + + // Transaction-type-specific processing + switch (type) { + case 1: // genesis + genesisPStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + genesisPStmt.setString(2, recipients.get(0)); + genesisPStmt.setBigDecimal(3, BigDecimal.valueOf(Double.valueOf((String) transaction.get("amount")).doubleValue())); + + genesisPStmt.execute(); + genesisPStmt.clearParameters(); + break; + + case 2: // payment + paymentPStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + paymentPStmt.setString(2, (String) transaction.get("sender")); + paymentPStmt.setString(3, recipients.get(0)); + paymentPStmt.setBigDecimal(4, BigDecimal.valueOf(Double.valueOf((String) transaction.get("amount")).doubleValue())); + + paymentPStmt.execute(); + paymentPStmt.clearParameters(); + break; + + case 3: // register name + registerNamePStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + registerNamePStmt.setString(2, (String) transaction.get("registrant")); + registerNamePStmt.setString(3, (String) transaction.get("name")); + registerNamePStmt.setString(4, (String) transaction.get("owner")); + registerNamePStmt.setString(5, (String) transaction.get("value")); + + registerNamePStmt.execute(); + registerNamePStmt.clearParameters(); + break; + + case 4: // update name + updateNamePStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + updateNamePStmt.setString(2, (String) transaction.get("owner")); + updateNamePStmt.setString(3, (String) transaction.get("name")); + updateNamePStmt.setString(4, (String) transaction.get("newOwner")); + updateNamePStmt.setString(5, (String) transaction.get("newValue")); + + updateNamePStmt.execute(); + updateNamePStmt.clearParameters(); + break; + + case 5: // sell name + sellNamePStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + sellNamePStmt.setString(2, (String) transaction.get("owner")); + sellNamePStmt.setString(3, (String) transaction.get("name")); + sellNamePStmt.setBigDecimal(4, BigDecimal.valueOf(Double.valueOf((String) transaction.get("amount")).doubleValue())); + + sellNamePStmt.execute(); + sellNamePStmt.clearParameters(); + break; + + case 6: // cancel sell name + cancelSellNamePStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + cancelSellNamePStmt.setString(2, (String) transaction.get("owner")); + cancelSellNamePStmt.setString(3, (String) transaction.get("name")); + + cancelSellNamePStmt.execute(); + cancelSellNamePStmt.clearParameters(); + break; + + case 7: // buy name + buyNamePStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + buyNamePStmt.setString(2, (String) transaction.get("buyer")); + buyNamePStmt.setString(3, (String) transaction.get("name")); + buyNamePStmt.setString(4, (String) transaction.get("seller")); + buyNamePStmt.setBigDecimal(5, BigDecimal.valueOf(Double.valueOf((String) transaction.get("amount")).doubleValue())); + + buyNamePStmt.execute(); + buyNamePStmt.clearParameters(); + break; + + case 8: // create poll + createPollPStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + createPollPStmt.setString(2, (String) transaction.get("creator")); + createPollPStmt.setString(3, (String) transaction.get("name")); + createPollPStmt.setString(4, (String) transaction.get("description")); + + createPollPStmt.execute(); + createPollPStmt.clearParameters(); + + // options + JSONArray options = (JSONArray) transaction.get("options"); + for (Object option : options) { + createPollOptionPStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + createPollOptionPStmt.setString(2, (String) option); + + createPollOptionPStmt.execute(); + createPollOptionPStmt.clearParameters(); + } + break; + + case 9: // vote on poll + voteOnPollPStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + voteOnPollPStmt.setString(2, (String) transaction.get("creator")); + voteOnPollPStmt.setString(3, (String) transaction.get("poll")); + voteOnPollPStmt.setInt(4, ((Long) transaction.get("option")).intValue()); + + voteOnPollPStmt.execute(); + voteOnPollPStmt.clearParameters(); + break; + + case 10: // arbitrary transactions + arbitraryPStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + arbitraryPStmt.setString(2, (String) transaction.get("creator")); + arbitraryPStmt.setInt(3, ((Long) transaction.get("service")).intValue()); + arbitraryPStmt.setString(4, "TODO"); + + arbitraryPStmt.execute(); + arbitraryPStmt.clearParameters(); + + if (multiPayments != null) + for (Object paymentObj : multiPayments) { + JSONObject payment = (JSONObject) paymentObj; + + sharedPaymentPStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + sharedPaymentPStmt.setString(2, (String) payment.get("recipient")); + sharedPaymentPStmt.setBigDecimal(3, BigDecimal.valueOf(Double.valueOf((String) payment.get("amount")).doubleValue())); + sharedPaymentPStmt.setLong(4, ((Long) payment.get("asset")).longValue()); + + sharedPaymentPStmt.execute(); + sharedPaymentPStmt.clearParameters(); + } + break; + + case 11: // issue asset + issueAssetPStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + issueAssetPStmt.setString(2, (String) transaction.get("creator")); + issueAssetPStmt.setString(3, (String) transaction.get("name")); + issueAssetPStmt.setString(4, (String) transaction.get("description")); + issueAssetPStmt.setBigDecimal(5, BigDecimal.valueOf(((Long) transaction.get("quantity")).longValue())); + issueAssetPStmt.setBoolean(6, (Boolean) transaction.get("divisible")); + + issueAssetPStmt.execute(); + issueAssetPStmt.clearParameters(); + break; + + case 12: // transfer asset + transferAssetPStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + transferAssetPStmt.setString(2, (String) transaction.get("sender")); + transferAssetPStmt.setString(3, (String) transaction.get("recipient")); + transferAssetPStmt.setLong(4, ((Long) transaction.get("asset")).longValue()); + transferAssetPStmt.setBigDecimal(5, BigDecimal.valueOf(Double.valueOf((String) transaction.get("amount")).doubleValue())); + + transferAssetPStmt.execute(); + transferAssetPStmt.clearParameters(); + break; + + case 13: // create asset order + createAssetOrderPStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + createAssetOrderPStmt.setString(2, (String) transaction.get("creator")); + + JSONObject assetOrder = (JSONObject) transaction.get("order"); + createAssetOrderPStmt.setLong(3, ((Long) assetOrder.get("have")).longValue()); + createAssetOrderPStmt.setBigDecimal(4, BigDecimal.valueOf(Double.valueOf((String) assetOrder.get("amount")).doubleValue())); + createAssetOrderPStmt.setLong(5, ((Long) assetOrder.get("want")).longValue()); + createAssetOrderPStmt.setBigDecimal(6, BigDecimal.valueOf(Double.valueOf((String) assetOrder.get("price")).doubleValue())); + + createAssetOrderPStmt.execute(); + createAssetOrderPStmt.clearParameters(); + break; + + case 14: // cancel asset order + cancelAssetOrderPStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + cancelAssetOrderPStmt.setString(2, (String) transaction.get("creator")); + cancelAssetOrderPStmt.setString(3, (String) transaction.get("order")); + + cancelAssetOrderPStmt.execute(); + cancelAssetOrderPStmt.clearParameters(); + break; + + case 15: // multi-payment + multiPaymentPStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + multiPaymentPStmt.setString(2, (String) transaction.get("sender")); + + multiPaymentPStmt.execute(); + multiPaymentPStmt.clearParameters(); + + for (Object paymentObj : multiPayments) { + JSONObject payment = (JSONObject) paymentObj; + + sharedPaymentPStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + sharedPaymentPStmt.setString(2, (String) payment.get("recipient")); + sharedPaymentPStmt.setBigDecimal(3, BigDecimal.valueOf(Double.valueOf((String) payment.get("amount")).doubleValue())); + sharedPaymentPStmt.setLong(4, ((Long) payment.get("asset")).longValue()); + + sharedPaymentPStmt.execute(); + sharedPaymentPStmt.clearParameters(); + } + break; + + case 16: // deploy AT + HashCode creationBytes = HashCode.fromString((String) transaction.get("creationBytes")); + InputStream creationBytesStream = new ByteArrayInputStream(creationBytes.asBytes()); + + deployATPStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + deployATPStmt.setString(2, (String) transaction.get("creator")); + deployATPStmt.setString(3, (String) transaction.get("name")); + deployATPStmt.setString(4, (String) transaction.get("description")); + deployATPStmt.setString(5, (String) transaction.get("atType")); + deployATPStmt.setString(6, (String) transaction.get("tags")); + deployATPStmt.setBinaryStream(7, creationBytesStream); + deployATPStmt.setBigDecimal(8, BigDecimal.valueOf(Double.valueOf((String) transaction.get("amount")).doubleValue())); + + deployATPStmt.execute(); + deployATPStmt.clearParameters(); + break; + + case 17: // message + boolean isText = (Boolean) transaction.get("isText"); + boolean isEncrypted = (Boolean) transaction.get("encrypted"); + String messageData = (String) transaction.get("data"); + + InputStream messageDataStream; + if (isText && !isEncrypted) { + messageDataStream = new ByteArrayInputStream(messageData.getBytes("UTF-8")); + } else { + HashCode messageBytes = HashCode.fromString(messageData); + messageDataStream = new ByteArrayInputStream(messageBytes.asBytes()); + } + + messagePStmt.setBinaryStream(1, new ByteArrayInputStream(txSignature)); + messagePStmt.setString(2, (String) transaction.get("creator")); + messagePStmt.setString(3, (String) transaction.get("recipient")); + messagePStmt.setBoolean(4, isText); + messagePStmt.setBoolean(5, isEncrypted); + messagePStmt.setBigDecimal(6, BigDecimal.valueOf(Double.valueOf((String) transaction.get("amount")).doubleValue())); + + if (transaction.containsKey("asset")) + messagePStmt.setLong(7, ((Long) transaction.get("asset")).longValue()); + else + messagePStmt.setLong(7, 0L); // QORA simulated asset + + messagePStmt.setBinaryStream(8, messageDataStream); + + messagePStmt.execute(); + messagePStmt.clearParameters(); + break; + + default: + // fail(); + } + + blockTxPStmt.setBinaryStream(1, new ByteArrayInputStream(blockSignature)); + blockTxPStmt.setInt(2, txIndex); + blockTxPStmt.setBinaryStream(3, new ByteArrayInputStream(txSignature)); + + blockTxPStmt.execute(); + blockTxPStmt.clearParameters(); + + commit(); + } + + // new milestone block every 500 blocks? + if (milestone_block == null || (height % 500) == 0) + milestone_block = blockSignature; + + ++height; + } + } + +} diff --git a/src/test/save.java b/src/test/save.java new file mode 100644 index 00000000..0e7d9a2a --- /dev/null +++ b/src/test/save.java @@ -0,0 +1,51 @@ +package test; + +import static org.junit.Assert.*; + +import java.math.BigDecimal; +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; +import java.time.Instant; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import qora.transaction.PaymentTransaction; +import utils.Base58; + +public class save { + + private static Connection connection; + + @Before + public void connect() throws SQLException { + connection = common.getConnection(); + Statement stmt = connection.createStatement(); + stmt.execute("SET DATABASE SQL SYNTAX MYS TRUE"); + } + + @After + public void disconnect() { + try { + connection.createStatement().execute("SHUTDOWN"); + } catch (SQLException e) { + fail(); + } + } + + @Test + public void testSavePaymentTransaction() throws SQLException { + String reference58 = "rrrr"; + byte[] reference = Base58.decode(reference58); + String signature58 = "ssss"; + byte[] signature = Base58.decode(signature58); + + PaymentTransaction paymentTransaction = new PaymentTransaction("Qsender", "Qrecipient", BigDecimal.valueOf(12345L), BigDecimal.ONE, + Instant.now().getEpochSecond(), reference, signature); + + paymentTransaction.save(connection); + } + +} diff --git a/src/test/updates.java b/src/test/updates.java new file mode 100644 index 00000000..f0363bbb --- /dev/null +++ b/src/test/updates.java @@ -0,0 +1,269 @@ +package test; + +import static org.junit.Assert.*; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class updates { + + private static Connection c; + + @Before + public void connect() throws SQLException { + c = common.getConnection(); + Statement stmt = c.createStatement(); + stmt.execute("SET DATABASE DEFAULT TABLE TYPE CACHED"); + } + + @After + public void disconnect() { + try { + c.createStatement().execute("SHUTDOWN"); + } catch (SQLException e) { + fail(); + } + } + + public boolean databaseUpdating() throws SQLException { + int databaseVersion = fetchDatabaseVersion(); + + Statement stmt = c.createStatement(); + + // Try not to add too many constraints as much of these checks will be performed during transaction validation + // Also some constraints might be too harsh on competing unconfirmed transactions + + switch (databaseVersion) { + case 0: + // create from new + stmt.execute("CREATE TABLE DatabaseInfo ( version INTEGER NOT NULL )"); + stmt.execute("INSERT INTO DatabaseInfo VALUES ( 0 )"); + stmt.execute("CREATE DOMAIN BlockSignature AS VARBINARY(128)"); + stmt.execute("CREATE DOMAIN Signature AS VARBINARY(64)"); + stmt.execute("CREATE DOMAIN QoraAddress AS VARCHAR(36)"); + stmt.execute("CREATE DOMAIN QoraAmount AS DECIMAL(19, 8)"); + stmt.execute("CREATE DOMAIN RegisteredName AS VARCHAR(400) COLLATE SQL_TEXT_UCC"); + stmt.execute("CREATE DOMAIN NameData AS VARCHAR(4000)"); + stmt.execute("CREATE DOMAIN PollName AS VARCHAR(400) COLLATE SQL_TEXT_UCC"); + stmt.execute("CREATE DOMAIN PollOption AS VARCHAR(400) COLLATE SQL_TEXT_UCC"); + stmt.execute("CREATE DOMAIN DataHash AS VARCHAR(100)"); + stmt.execute("CREATE DOMAIN AssetID AS BIGINT"); + stmt.execute("CREATE DOMAIN AssetName AS VARCHAR(400) COLLATE SQL_TEXT_UCC"); + stmt.execute("CREATE DOMAIN AssetOrderID AS VARCHAR(100)"); + stmt.execute("CREATE DOMAIN ATName AS VARCHAR(200) COLLATE SQL_TEXT_UCC"); + stmt.execute("CREATE DOMAIN ATType AS VARCHAR(200) COLLATE SQL_TEXT_UCC"); + break; + + case 1: + // Blocks + stmt.execute("CREATE TABLE Blocks (signature BlockSignature PRIMARY KEY, version TINYINT NOT NULL, reference BlockSignature, " + + "transaction_count INTEGER NOT NULL, total_fees QoraAmount NOT NULL, transactions_signature Signature NOT NULL, " + + "height INTEGER NOT NULL, generation TIMESTAMP NOT NULL, generation_target QoraAmount NOT NULL, " + + "generator QoraAddress NOT NULL, generation_signature Signature NOT NULL, AT_data VARBINARY(20000), AT_fees QoraAmount)"); + stmt.execute("CREATE INDEX BlockHeightIndex ON Blocks (height)"); + stmt.execute("CREATE INDEX BlockGeneratorIndex ON Blocks (generator)"); + break; + + case 2: + // Generic transactions (null reference, creator and milestone_block for genesis transactions) + stmt.execute("CREATE TABLE Transactions (signature Signature PRIMARY KEY, reference Signature, type TINYINT NOT NULL, " + + "creator QoraAddress, creation TIMESTAMP NOT NULL, fee QoraAmount NOT NULL, milestone_block BlockSignature)"); + stmt.execute("CREATE INDEX TransactionTypeIndex ON Transactions (type)"); + stmt.execute("CREATE INDEX TransactionCreationIndex ON Transactions (creation)"); + // Transaction-Block mapping ("signature" is unique as a transaction cannot be included in more than one block) + stmt.execute("CREATE TABLE BlockTransactions (block BlockSignature, sequence INTEGER, signature Signature, " + + "PRIMARY KEY (block, sequence), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE, " + + "FOREIGN KEY (block) REFERENCES Blocks (signature) ON DELETE CASCADE)"); + // Unconfirmed transactions + // Do we need this? If a transaction doesn't have a corresponding BlockTransactions record then it's unconfirmed? + stmt.execute("CREATE TABLE UnconfirmedTransactions (signature Signature PRIMARY KEY, expiry TIMESTAMP NOT NULL)"); + stmt.execute("CREATE INDEX UnconfirmedTransactionExpiryIndex ON UnconfirmedTransactions (expiry)"); + // Transaction recipients + stmt.execute("CREATE TABLE TransactionRecipients (signature Signature, recipient QoraAddress NOT NULL, " + + "FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + break; + + case 3: + // Genesis Transactions + stmt.execute("CREATE TABLE GenesisTransactions (signature Signature, recipient QoraAddress NOT NULL, " + + "amount QoraAmount NOT NULL, PRIMARY KEY (signature), " + + "FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + break; + + case 4: + // Payment Transactions + stmt.execute("CREATE TABLE PaymentTransactions (signature Signature, sender QoraAddress NOT NULL, recipient QoraAddress NOT NULL, " + + "amount QoraAmount NOT NULL, PRIMARY KEY (signature), " + + "FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + break; + + case 5: + // Register Name Transactions + stmt.execute("CREATE TABLE RegisterNameTransactions (signature Signature, registrant QoraAddress NOT NULL, name RegisteredName NOT NULL, " + + "owner QoraAddress NOT NULL, data NameData NOT NULL, " + + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + break; + + case 6: + // Update Name Transactions + stmt.execute("CREATE TABLE UpdateNameTransactions (signature Signature, owner QoraAddress NOT NULL, name RegisteredName NOT NULL, " + + "new_owner QoraAddress NOT NULL, new_data NameData NOT NULL, " + + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + break; + + case 7: + // Sell Name Transactions + stmt.execute("CREATE TABLE SellNameTransactions (signature Signature, owner QoraAddress NOT NULL, name RegisteredName NOT NULL, " + + "amount QoraAmount NOT NULL, PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + break; + + case 8: + // Cancel Sell Name Transactions + stmt.execute("CREATE TABLE CancelSellNameTransactions (signature Signature, owner QoraAddress NOT NULL, name RegisteredName NOT NULL, " + + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + break; + + case 9: + // Buy Name Transactions + stmt.execute("CREATE TABLE BuyNameTransactions (signature Signature, buyer QoraAddress NOT NULL, name RegisteredName NOT NULL, " + + "seller QoraAddress NOT NULL, amount QoraAmount NOT NULL, " + + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + break; + + case 10: + // Create Poll Transactions + stmt.execute("CREATE TABLE CreatePollTransactions (signature Signature, creator QoraAddress NOT NULL, poll PollName NOT NULL, " + + "description VARCHAR(4000) NOT NULL, " + + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + // Poll options. NB: option is implicitly NON NULL and UNIQUE due to being part of compound primary key + stmt.execute("CREATE TABLE CreatePollTransactionOptions (signature Signature, option PollOption, " + + "PRIMARY KEY (signature, option), FOREIGN KEY (signature) REFERENCES CreatePollTransactions (signature) ON DELETE CASCADE)"); + // For the future: add flag to polls to allow one or multiple votes per voter + break; + + case 11: + // Vote On Poll Transactions + stmt.execute("CREATE TABLE VoteOnPollTransactions (signature Signature, voter QoraAddress NOT NULL, poll PollName NOT NULL, " + + "option_index INTEGER NOT NULL, " + + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + break; + + case 12: + // Arbitrary/Multi-payment Transaction Payments + stmt.execute("CREATE TABLE SharedTransactionPayments (signature Signature, recipient QoraAddress NOT NULL, " + + "amount QoraAmount NOT NULL, asset AssetID NOT NULL, " + + "PRIMARY KEY (signature, recipient, asset), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + break; + + case 13: + // Arbitrary Transactions + stmt.execute("CREATE TABLE ArbitraryTransactions (signature Signature, creator QoraAddress NOT NULL, service TINYINT NOT NULL, " + + "data_hash DataHash NOT NULL, " + + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + // NB: Actual data payload stored elsewhere + // For the future: data payload should be encrypted, at the very least with transaction's reference as the seed for the encryption key + break; + + case 14: + // Issue Asset Transactions + stmt.execute("CREATE TABLE IssueAssetTransactions (signature Signature, creator QoraAddress NOT NULL, asset_name AssetName NOT NULL, " + + "description VARCHAR(4000) NOT NULL, quantity BIGINT NOT NULL, is_divisible BOOLEAN NOT NULL, " + + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + // For the future: maybe convert quantity from BIGINT to QoraAmount, regardless of divisibility + break; + + case 15: + // Transfer Asset Transactions + stmt.execute("CREATE TABLE TransferAssetTransactions (signature Signature, sender QoraAddress NOT NULL, recipient QoraAddress NOT NULL, " + + "asset AssetID NOT NULL, amount QoraAmount NOT NULL, " + + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + break; + + case 16: + // Create Asset Order Transactions + stmt.execute("CREATE TABLE CreateAssetOrderTransactions (signature Signature, creator QoraAddress NOT NULL, " + + "have_asset AssetID NOT NULL, have_amount QoraAmount NOT NULL, " + + "want_asset AssetID NOT NULL, want_amount QoraAmount NOT NULL, " + + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + break; + + case 17: + // Cancel Asset Order Transactions + stmt.execute("CREATE TABLE CancelAssetOrderTransactions (signature Signature, creator QoraAddress NOT NULL, " + + "asset_order AssetOrderID NOT NULL, " + + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + break; + + case 18: + // Multi-payment Transactions + stmt.execute("CREATE TABLE MultiPaymentTransactions (signature Signature, sender QoraAddress NOT NULL, " + + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + break; + + case 19: + // Deploy CIYAM AT Transactions + stmt.execute("CREATE TABLE DeployATTransactions (signature Signature, creator QoraAddress NOT NULL, AT_name ATName NOT NULL, " + + "description VARCHAR(2000) NOT NULL, AT_type ATType NOT NULL, AT_tags VARCHAR(200) NOT NULL, " + + "creation_bytes VARBINARY(100000) NOT NULL, amount QoraAmount NOT NULL, " + + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + break; + + case 20: + // Message Transactions + stmt.execute("CREATE TABLE MessageTransactions (signature Signature, sender QoraAddress NOT NULL, recipient QoraAddress NOT NULL, " + + "is_text BOOLEAN NOT NULL, is_encrypted BOOLEAN NOT NULL, amount QoraAmount NOT NULL, asset AssetID NOT NULL, data VARBINARY(4000) NOT NULL, " + + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + break; + + default: + // nothing to do + return false; + } + + // database was updated + return true; + } + + public int fetchDatabaseVersion() throws SQLException { + int databaseVersion = 0; + + try { + Statement stmt = c.createStatement(); + if (stmt.execute("SELECT version FROM DatabaseInfo")) { + ResultSet rs = stmt.getResultSet(); + assertNotNull(rs); + + assertTrue(rs.next()); + + databaseVersion = rs.getInt(1); + } + } catch (SQLException e) { + // empty database? + } + + return databaseVersion; + } + + public void incrementDatabaseVersion() throws SQLException { + Statement stmt = c.createStatement(); + assertFalse(stmt.execute("UPDATE DatabaseInfo SET version = version + 1")); + } + + @Test + public void testUpdates() { + try { + while (databaseUpdating()) + incrementDatabaseVersion(); + } catch (SQLException e) { + e.printStackTrace(); + fail(); + } + } + +} diff --git a/src/utils/Base58.java b/src/utils/Base58.java new file mode 100644 index 00000000..7724fdf1 --- /dev/null +++ b/src/utils/Base58.java @@ -0,0 +1,218 @@ +/** + * Copyright 2011 Google Inc. + * Copyright 2013-2014 Ronald W Hoffman + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package utils; + +import java.io.UnsupportedEncodingException; +import java.math.BigInteger; +import java.util.Arrays; + +/** + * Provides Base-58 encoding and decoding + */ +public class Base58 { + + /** Alphabet used for encoding and decoding */ + + private static final String ALPHABET_STR = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"; + + private static final char[] ALPHABET = + ALPHABET_STR.toCharArray(); + + /** Lookup index for US-ASCII characters (code points 0-127) */ + private static final int[] INDEXES = new int[128]; + static { + for (int i=0; i=0 && codePoint { + + private T a; + private U b; + + public Pair() { + } + + public Pair(T a, U b) { + this.a = a; + this.b = b; + } + + public void setA(T a) { + this.a = a; + } + + public T getA() { + return a; + } + + public void setB(U b) { + this.b = b; + } + + public U getB() { + return b; + } + +}