From 5decf18eb5ca3f94c8ec199792f67b984662d312 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 29 Aug 2014 13:40:53 +0000
Subject: [PATCH] import, @since
---
core/java/src/net/i2p/crypto/DSAEngine.java | 9 +++++----
core/java/src/net/i2p/crypto/eddsa/EdDSAEngine.java | 1 +
core/java/src/net/i2p/crypto/eddsa/EdDSAKey.java | 2 ++
core/java/src/net/i2p/crypto/eddsa/EdDSAPrivateKey.java | 2 ++
core/java/src/net/i2p/crypto/eddsa/EdDSAPublicKey.java | 2 ++
core/java/src/net/i2p/crypto/eddsa/KeyFactory.java | 1 +
core/java/src/net/i2p/crypto/eddsa/KeyPairGenerator.java | 2 ++
core/java/src/net/i2p/crypto/eddsa/Utils.java | 4 ++++
core/java/src/net/i2p/crypto/eddsa/math/Curve.java | 2 ++
core/java/src/net/i2p/crypto/eddsa/math/Encoding.java | 2 ++
core/java/src/net/i2p/crypto/eddsa/math/Field.java | 2 ++
.../java/src/net/i2p/crypto/eddsa/math/FieldElement.java | 5 +++++
.../java/src/net/i2p/crypto/eddsa/math/GroupElement.java | 2 ++
core/java/src/net/i2p/crypto/eddsa/math/ScalarOps.java | 5 +++++
.../net/i2p/crypto/eddsa/spec/EdDSAGenParameterSpec.java | 2 ++
.../net/i2p/crypto/eddsa/spec/EdDSANamedCurveSpec.java | 2 ++
.../net/i2p/crypto/eddsa/spec/EdDSANamedCurveTable.java | 2 ++
.../net/i2p/crypto/eddsa/spec/EdDSAParameterSpec.java | 2 ++
.../net/i2p/crypto/eddsa/spec/EdDSAPrivateKeySpec.java | 2 ++
.../net/i2p/crypto/eddsa/spec/EdDSAPublicKeySpec.java | 2 ++
20 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/core/java/src/net/i2p/crypto/DSAEngine.java b/core/java/src/net/i2p/crypto/DSAEngine.java
index 8b0383b379..e4a8e67588 100644
--- a/core/java/src/net/i2p/crypto/DSAEngine.java
+++ b/core/java/src/net/i2p/crypto/DSAEngine.java
@@ -42,6 +42,7 @@ import java.security.interfaces.ECKey;
import java.security.interfaces.RSAKey;
import net.i2p.I2PAppContext;
+import net.i2p.crypto.eddsa.EdDSAEngine;
import net.i2p.crypto.eddsa.EdDSAKey;
import net.i2p.data.Hash;
import net.i2p.data.Signature;
@@ -517,7 +518,7 @@ public class DSAEngine {
java.security.Signature jsig;
if (type.getBaseAlgorithm() == SigAlgo.EdDSA)
- jsig = new net.i2p.crypto.eddsa.EdDSAEngine(type.getDigestInstance());
+ jsig = new EdDSAEngine(type.getDigestInstance());
else
jsig = java.security.Signature.getInstance(type.getAlgorithmName());
PublicKey pubKey = SigUtil.toJavaKey(verifyingKey);
@@ -566,7 +567,7 @@ public class DSAEngine {
String algo = getRawAlgo(type);
java.security.Signature jsig;
if (type.getBaseAlgorithm() == SigAlgo.EdDSA)
- jsig = new net.i2p.crypto.eddsa.EdDSAEngine(); // Ignore algo, EdDSAKey includes a hash specification.
+ jsig = new EdDSAEngine(); // Ignore algo, EdDSAKey includes a hash specification.
else
jsig = java.security.Signature.getInstance(algo);
jsig.initVerify(pubKey);
@@ -608,7 +609,7 @@ public class DSAEngine {
java.security.Signature jsig;
if (type.getBaseAlgorithm() == SigAlgo.EdDSA)
- jsig = new net.i2p.crypto.eddsa.EdDSAEngine(type.getDigestInstance());
+ jsig = new EdDSAEngine(type.getDigestInstance());
else
jsig = java.security.Signature.getInstance(type.getAlgorithmName());
PrivateKey privKey = SigUtil.toJavaKey(privateKey);
@@ -651,7 +652,7 @@ public class DSAEngine {
java.security.Signature jsig;
if (type.getBaseAlgorithm() == SigAlgo.EdDSA)
- jsig = new net.i2p.crypto.eddsa.EdDSAEngine(); // Ignore algo, EdDSAKey includes a hash specification.
+ jsig = new EdDSAEngine(); // Ignore algo, EdDSAKey includes a hash specification.
else
jsig = java.security.Signature.getInstance(algo);
jsig.initSign(privKey, _context.random());
diff --git a/core/java/src/net/i2p/crypto/eddsa/EdDSAEngine.java b/core/java/src/net/i2p/crypto/eddsa/EdDSAEngine.java
index a7c41fba37..6cf9b4d859 100644
--- a/core/java/src/net/i2p/crypto/eddsa/EdDSAEngine.java
+++ b/core/java/src/net/i2p/crypto/eddsa/EdDSAEngine.java
@@ -16,6 +16,7 @@ import net.i2p.crypto.eddsa.math.GroupElement;
import net.i2p.crypto.eddsa.math.ScalarOps;
/**
+ * @since 0.9.15
* @author str4d
*
*/
diff --git a/core/java/src/net/i2p/crypto/eddsa/EdDSAKey.java b/core/java/src/net/i2p/crypto/eddsa/EdDSAKey.java
index e093660f06..d710d8c2f6 100644
--- a/core/java/src/net/i2p/crypto/eddsa/EdDSAKey.java
+++ b/core/java/src/net/i2p/crypto/eddsa/EdDSAKey.java
@@ -4,6 +4,8 @@ import net.i2p.crypto.eddsa.spec.EdDSAParameterSpec;
/**
* Common interface for all EdDSA keys.
+ *
+ * @since 0.9.15
* @author str4d
*
*/
diff --git a/core/java/src/net/i2p/crypto/eddsa/EdDSAPrivateKey.java b/core/java/src/net/i2p/crypto/eddsa/EdDSAPrivateKey.java
index bbe7e1c6d3..d3945976aa 100644
--- a/core/java/src/net/i2p/crypto/eddsa/EdDSAPrivateKey.java
+++ b/core/java/src/net/i2p/crypto/eddsa/EdDSAPrivateKey.java
@@ -8,6 +8,8 @@ import net.i2p.crypto.eddsa.spec.EdDSAPrivateKeySpec;
/**
* An EdDSA private key.
+ *
+ * @since 0.9.15
* @author str4d
*
*/
diff --git a/core/java/src/net/i2p/crypto/eddsa/EdDSAPublicKey.java b/core/java/src/net/i2p/crypto/eddsa/EdDSAPublicKey.java
index e7505013ae..8e436bd1d8 100644
--- a/core/java/src/net/i2p/crypto/eddsa/EdDSAPublicKey.java
+++ b/core/java/src/net/i2p/crypto/eddsa/EdDSAPublicKey.java
@@ -8,6 +8,8 @@ import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec;
/**
* An EdDSA public key.
+ *
+ * @since 0.9.15
* @author str4d
*
*/
diff --git a/core/java/src/net/i2p/crypto/eddsa/KeyFactory.java b/core/java/src/net/i2p/crypto/eddsa/KeyFactory.java
index e4daf36eb1..950130ac98 100644
--- a/core/java/src/net/i2p/crypto/eddsa/KeyFactory.java
+++ b/core/java/src/net/i2p/crypto/eddsa/KeyFactory.java
@@ -12,6 +12,7 @@ import net.i2p.crypto.eddsa.spec.EdDSAPrivateKeySpec;
import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec;
/**
+ * @since 0.9.15
* @author str4d
*
*/
diff --git a/core/java/src/net/i2p/crypto/eddsa/KeyPairGenerator.java b/core/java/src/net/i2p/crypto/eddsa/KeyPairGenerator.java
index 81508f77c7..a3db1035ab 100644
--- a/core/java/src/net/i2p/crypto/eddsa/KeyPairGenerator.java
+++ b/core/java/src/net/i2p/crypto/eddsa/KeyPairGenerator.java
@@ -17,6 +17,8 @@ import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec;
/**
* Default strength is 256
+ *
+ * @since 0.9.15
*/
public class KeyPairGenerator extends KeyPairGeneratorSpi {
private static final int DEFAULT_STRENGTH = 256;
diff --git a/core/java/src/net/i2p/crypto/eddsa/Utils.java b/core/java/src/net/i2p/crypto/eddsa/Utils.java
index 3d743f81bf..8c8bb2ea39 100644
--- a/core/java/src/net/i2p/crypto/eddsa/Utils.java
+++ b/core/java/src/net/i2p/crypto/eddsa/Utils.java
@@ -1,6 +1,10 @@
package net.i2p.crypto.eddsa;
/**
+ * Basic utilities for eddsa.
+ * Not for external use, not maintained as a public API.
+ *
+ * @since 0.9.15
* @author str4d
*
*/
diff --git a/core/java/src/net/i2p/crypto/eddsa/math/Curve.java b/core/java/src/net/i2p/crypto/eddsa/math/Curve.java
index 38f690e3fa..4cbc74757a 100644
--- a/core/java/src/net/i2p/crypto/eddsa/math/Curve.java
+++ b/core/java/src/net/i2p/crypto/eddsa/math/Curve.java
@@ -5,6 +5,8 @@ import java.io.Serializable;
/**
* A twisted Edwards curve.
* Points on the curve satisfy -x^2 + y^2 = 1 + d x^2y^2
+ *
+ * @since 0.9.15
* @author str4d
*
*/
diff --git a/core/java/src/net/i2p/crypto/eddsa/math/Encoding.java b/core/java/src/net/i2p/crypto/eddsa/math/Encoding.java
index 4a3681fa77..932165beef 100644
--- a/core/java/src/net/i2p/crypto/eddsa/math/Encoding.java
+++ b/core/java/src/net/i2p/crypto/eddsa/math/Encoding.java
@@ -3,6 +3,8 @@ package net.i2p.crypto.eddsa.math;
/**
* Common interface for all (b-1)-bit encodings of elements
* of EdDSA finite fields.
+ *
+ * @since 0.9.15
* @author str4d
*
*/
diff --git a/core/java/src/net/i2p/crypto/eddsa/math/Field.java b/core/java/src/net/i2p/crypto/eddsa/math/Field.java
index 040b3ffe01..ce89b78519 100644
--- a/core/java/src/net/i2p/crypto/eddsa/math/Field.java
+++ b/core/java/src/net/i2p/crypto/eddsa/math/Field.java
@@ -4,6 +4,8 @@ import java.io.Serializable;
/**
* An EdDSA finite field. Includes several pre-computed values.
+ *
+ * @since 0.9.15
* @author str4d
*
*/
diff --git a/core/java/src/net/i2p/crypto/eddsa/math/FieldElement.java b/core/java/src/net/i2p/crypto/eddsa/math/FieldElement.java
index a2b10b9f1c..4d9fc6a528 100644
--- a/core/java/src/net/i2p/crypto/eddsa/math/FieldElement.java
+++ b/core/java/src/net/i2p/crypto/eddsa/math/FieldElement.java
@@ -1,5 +1,10 @@
package net.i2p.crypto.eddsa.math;
+/**
+ *
+ * @since 0.9.15
+ *
+ */
public abstract class FieldElement {
protected final Field f;
diff --git a/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java b/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java
index e8afdc90b9..1e416abe05 100644
--- a/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java
+++ b/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java
@@ -6,6 +6,8 @@ import net.i2p.crypto.eddsa.Utils;
/**
* A point (x,y) on an EdDSA curve.
+ *
+ * @since 0.9.15
* @author str4d
*
*/
diff --git a/core/java/src/net/i2p/crypto/eddsa/math/ScalarOps.java b/core/java/src/net/i2p/crypto/eddsa/math/ScalarOps.java
index 7073bd73fb..d90a80bcbe 100644
--- a/core/java/src/net/i2p/crypto/eddsa/math/ScalarOps.java
+++ b/core/java/src/net/i2p/crypto/eddsa/math/ScalarOps.java
@@ -1,5 +1,10 @@
package net.i2p.crypto.eddsa.math;
+/**
+ *
+ * @since 0.9.15
+ *
+ */
public interface ScalarOps {
/**
* Reduce the given scalar mod l.
diff --git a/core/java/src/net/i2p/crypto/eddsa/spec/EdDSAGenParameterSpec.java b/core/java/src/net/i2p/crypto/eddsa/spec/EdDSAGenParameterSpec.java
index 860bc5b9f8..2b3bfcd931 100644
--- a/core/java/src/net/i2p/crypto/eddsa/spec/EdDSAGenParameterSpec.java
+++ b/core/java/src/net/i2p/crypto/eddsa/spec/EdDSAGenParameterSpec.java
@@ -5,6 +5,8 @@ import java.security.spec.AlgorithmParameterSpec;
/**
* Implementation of AlgorithmParameterSpec that holds the name of a named
* EdDSA curve specification.
+ *
+ * @since 0.9.15
* @author str4d
*
*/
diff --git a/core/java/src/net/i2p/crypto/eddsa/spec/EdDSANamedCurveSpec.java b/core/java/src/net/i2p/crypto/eddsa/spec/EdDSANamedCurveSpec.java
index f5d63c8418..e51f277389 100644
--- a/core/java/src/net/i2p/crypto/eddsa/spec/EdDSANamedCurveSpec.java
+++ b/core/java/src/net/i2p/crypto/eddsa/spec/EdDSANamedCurveSpec.java
@@ -6,6 +6,8 @@ import net.i2p.crypto.eddsa.math.ScalarOps;
/**
* EdDSA Curve specification that can also be referred to by name.
+ *
+ * @since 0.9.15
* @author str4d
*
*/
diff --git a/core/java/src/net/i2p/crypto/eddsa/spec/EdDSANamedCurveTable.java b/core/java/src/net/i2p/crypto/eddsa/spec/EdDSANamedCurveTable.java
index 076e2e660d..07fba43c33 100644
--- a/core/java/src/net/i2p/crypto/eddsa/spec/EdDSANamedCurveTable.java
+++ b/core/java/src/net/i2p/crypto/eddsa/spec/EdDSANamedCurveTable.java
@@ -10,6 +10,8 @@ import net.i2p.crypto.eddsa.math.ed25519.Ed25519ScalarOps;
/**
* The named EdDSA curves.
+ *
+ * @since 0.9.15
* @author str4d
*
*/
diff --git a/core/java/src/net/i2p/crypto/eddsa/spec/EdDSAParameterSpec.java b/core/java/src/net/i2p/crypto/eddsa/spec/EdDSAParameterSpec.java
index f24677476d..4ace0fb62c 100644
--- a/core/java/src/net/i2p/crypto/eddsa/spec/EdDSAParameterSpec.java
+++ b/core/java/src/net/i2p/crypto/eddsa/spec/EdDSAParameterSpec.java
@@ -12,6 +12,8 @@ import java.io.Serializable;
/**
* Parameter specification for an EdDSA algorithm.
+ *
+ * @since 0.9.15
* @author str4d
*
*/
diff --git a/core/java/src/net/i2p/crypto/eddsa/spec/EdDSAPrivateKeySpec.java b/core/java/src/net/i2p/crypto/eddsa/spec/EdDSAPrivateKeySpec.java
index f09585e56a..26f5c3a2d4 100644
--- a/core/java/src/net/i2p/crypto/eddsa/spec/EdDSAPrivateKeySpec.java
+++ b/core/java/src/net/i2p/crypto/eddsa/spec/EdDSAPrivateKeySpec.java
@@ -8,6 +8,8 @@ import java.util.Arrays;
import net.i2p.crypto.eddsa.math.GroupElement;
/**
+ *
+ * @since 0.9.15
* @author str4d
*
*/
diff --git a/core/java/src/net/i2p/crypto/eddsa/spec/EdDSAPublicKeySpec.java b/core/java/src/net/i2p/crypto/eddsa/spec/EdDSAPublicKeySpec.java
index 1a27edb718..0389260a0c 100644
--- a/core/java/src/net/i2p/crypto/eddsa/spec/EdDSAPublicKeySpec.java
+++ b/core/java/src/net/i2p/crypto/eddsa/spec/EdDSAPublicKeySpec.java
@@ -5,6 +5,8 @@ import java.security.spec.KeySpec;
import net.i2p.crypto.eddsa.math.GroupElement;
/**
+ *
+ * @since 0.9.15
* @author str4d
*
*/
--
GitLab