From 8c98ef73289f5a51148fc11a4857587651d08d42 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 17 Feb 2014 13:14:23 +0000
Subject: [PATCH] update version
---
.../java/src/net/i2p/i2ptunnel/web/EditBean.java | 4 ++--
.../java/src/net/i2p/i2ptunnel/web/IndexBean.java | 2 +-
.../client/streaming/I2PSocketManagerFactory.java | 2 +-
.../src/java/src/i2p/susi/dns/AddressBean.java | 2 +-
core/java/src/net/i2p/client/I2PClient.java | 6 +++---
core/java/src/net/i2p/client/I2PClientImpl.java | 2 +-
core/java/src/net/i2p/client/I2PSimpleClient.java | 2 +-
core/java/src/net/i2p/crypto/DSAEngine.java | 12 ++++++------
core/java/src/net/i2p/crypto/SigType.java | 2 +-
core/java/src/net/i2p/data/Certificate.java | 4 ++--
core/java/src/net/i2p/data/KeyCertificate.java | 2 +-
core/java/src/net/i2p/data/KeysAndCert.java | 2 +-
core/java/src/net/i2p/data/PrivateKeyFile.java | 2 +-
core/java/src/net/i2p/data/SigningPublicKey.java | 6 +++---
.../net/i2p/router/networkdb/kademlia/StoreJob.java | 6 +++---
15 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
index 85365e28d2..0ad858ecda 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
@@ -178,7 +178,7 @@ public class EditBean extends IndexBean {
return getBooleanProperty(tunnel, "i2cp.encryptLeaseSet");
}
- /** @since 0.9.11 */
+ /** @since 0.9.12 */
public int getSigType(int tunnel) {
return getProperty(tunnel, I2PClient.PROP_SIGTYPE, 0);
}
@@ -351,7 +351,7 @@ public class EditBean extends IndexBean {
return Addresses.getAllAddresses();
}
- /** @since 0.9.11 */
+ /** @since 0.9.12 */
public boolean isAdvanced() {
return _context.getBooleanProperty("routerconsole.advanced");
}
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
index 6dfa4bba89..0750f1d07c 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
@@ -964,7 +964,7 @@ public class IndexBean {
_certSigner = val;
}
- /** @since 0.9.11 */
+ /** @since 0.9.12 */
public void setSigType(String val) {
if (val != null) {
_otherOptions.put(I2PClient.PROP_SIGTYPE, val);
diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java
index 493a0d2726..624abd3430 100644
--- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java
+++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java
@@ -260,7 +260,7 @@ public class I2PSocketManagerFactory {
/**
* @param opts may be null
- * @since 0.9.11
+ * @since 0.9.12
*/
private static SigType getSigType(Properties opts) {
if (opts != null) {
diff --git a/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java b/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java
index eef101c1e4..70b29e72fa 100644
--- a/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java
+++ b/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java
@@ -238,7 +238,7 @@ public class AddressBean
/**
* Do this the easy way
- * @since 0.9.11
+ * @since 0.9.12
*/
public String getSigType() {
// (4 / 3) * (pubkey length + signing key length)
diff --git a/core/java/src/net/i2p/client/I2PClient.java b/core/java/src/net/i2p/client/I2PClient.java
index bbfd6811ae..c4503608cf 100644
--- a/core/java/src/net/i2p/client/I2PClient.java
+++ b/core/java/src/net/i2p/client/I2PClient.java
@@ -41,9 +41,9 @@ public interface I2PClient {
/** @since 0.8.1 */
public final static String PROP_RELIABILITY_NONE = "none";
- /** @since 0.9.11 */
+ /** @since 0.9.12 */
public static final String PROP_SIGTYPE = "i2cp.destination.sigType";
- /** @since 0.9.11 */
+ /** @since 0.9.12 */
public static final SigType DEFAULT_SIGTYPE = SigType.DSA_SHA1;
/**
@@ -97,7 +97,7 @@ public interface I2PClient {
*
* @param destKeyStream location to write out the destination, PrivateKey, and SigningPrivateKey,
* format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile}
- * @since 0.9.11
+ * @since 0.9.12
*/
public Destination createDestination(OutputStream destKeyStream, SigType type) throws I2PException, IOException;
diff --git a/core/java/src/net/i2p/client/I2PClientImpl.java b/core/java/src/net/i2p/client/I2PClientImpl.java
index e29cdc3426..e0c7feea9f 100644
--- a/core/java/src/net/i2p/client/I2PClientImpl.java
+++ b/core/java/src/net/i2p/client/I2PClientImpl.java
@@ -58,7 +58,7 @@ class I2PClientImpl implements I2PClient {
*
* @param destKeyStream location to write out the destination, PrivateKey, and SigningPrivateKey,
* format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile}
- * @since 0.9.11
+ * @since 0.9.12
*/
public Destination createDestination(OutputStream destKeyStream, SigType type) throws I2PException, IOException {
Certificate cert;
diff --git a/core/java/src/net/i2p/client/I2PSimpleClient.java b/core/java/src/net/i2p/client/I2PSimpleClient.java
index 8e198daf9f..38286f2b1b 100644
--- a/core/java/src/net/i2p/client/I2PSimpleClient.java
+++ b/core/java/src/net/i2p/client/I2PSimpleClient.java
@@ -33,7 +33,7 @@ public class I2PSimpleClient implements I2PClient {
/**
* @deprecated Don't do this
* @throws UnsupportedOperationException always
- * @since 0.9.11
+ * @since 0.9.12
*/
public Destination createDestination(OutputStream destKeyStream, SigType type) throws I2PException, IOException {
throw new UnsupportedOperationException();
diff --git a/core/java/src/net/i2p/crypto/DSAEngine.java b/core/java/src/net/i2p/crypto/DSAEngine.java
index 16c63e8ea9..b80dac38c6 100644
--- a/core/java/src/net/i2p/crypto/DSAEngine.java
+++ b/core/java/src/net/i2p/crypto/DSAEngine.java
@@ -93,7 +93,7 @@ public class DSAEngine {
}
/**
- * Verify using any sig type as of 0.9.11 (DSA only prior to that)
+ * Verify using any sig type as of 0.9.12 (DSA only prior to that)
*/
public boolean verifySignature(Signature signature, byte signedData[], int offset, int size, SigningPublicKey verifyingKey) {
boolean rv;
@@ -266,7 +266,7 @@ public class DSAEngine {
}
/**
- * Sign using any key type as of 0.9.11 (DSA-SHA1 only prior to that)
+ * Sign using any key type as of 0.9.12 (DSA-SHA1 only prior to that)
*
* @return null on error
*/
@@ -495,7 +495,7 @@ public class DSAEngine {
/**
* Generic verify DSA_SHA1, ECDSA, or RSA
* @throws GeneralSecurityException if algorithm unvailable or on other errors
- * @since 0.9.9 added off/len 0.9.11
+ * @since 0.9.9 added off/len 0.9.12
*/
private boolean altVerifySig(Signature signature, byte[] data, int offset, int len, SigningPublicKey verifyingKey)
throws GeneralSecurityException {
@@ -555,7 +555,7 @@ public class DSAEngine {
/**
* Alternate to verifySignature() using java.security libraries.
* @throws GeneralSecurityException if algorithm unvailable or on other errors
- * @since 0.8.7 added off/len 0.9.11
+ * @since 0.8.7 added off/len 0.9.12
*/
private boolean altVerifySigSHA1(Signature signature, byte[] data, int offset,
int len, SigningPublicKey verifyingKey) throws GeneralSecurityException {
@@ -574,7 +574,7 @@ public class DSAEngine {
/**
* Generic sign DSA_SHA1, ECDSA, or RSA
* @throws GeneralSecurityException if algorithm unvailable or on other errors
- * @since 0.9.9 added off/len 0.9.11
+ * @since 0.9.9 added off/len 0.9.12
*/
private Signature altSign(byte[] data, int offset, int len,
SigningPrivateKey privateKey) throws GeneralSecurityException {
@@ -624,7 +624,7 @@ public class DSAEngine {
/**
* Alternate to sign() using java.security libraries.
* @throws GeneralSecurityException if algorithm unvailable or on other errors
- * @since 0.8.7 added off/len args 0.9.11
+ * @since 0.8.7 added off/len args 0.9.12
*/
private Signature altSignSHA1(byte[] data, int offset, int len,
SigningPrivateKey privateKey) throws GeneralSecurityException {
diff --git a/core/java/src/net/i2p/crypto/SigType.java b/core/java/src/net/i2p/crypto/SigType.java
index a37d65dfb0..c5e32f048d 100644
--- a/core/java/src/net/i2p/crypto/SigType.java
+++ b/core/java/src/net/i2p/crypto/SigType.java
@@ -177,7 +177,7 @@ public enum SigType {
*
* @param stype number or name
* @return null if not found
- * @since 0.9.9 moved from SU3File in 0.9.11
+ * @since 0.9.9 moved from SU3File in 0.9.12
*/
public static SigType parseSigType(String stype) {
try {
diff --git a/core/java/src/net/i2p/data/Certificate.java b/core/java/src/net/i2p/data/Certificate.java
index a4a1b3148d..49fc560e6f 100644
--- a/core/java/src/net/i2p/data/Certificate.java
+++ b/core/java/src/net/i2p/data/Certificate.java
@@ -42,7 +42,7 @@ public class Certificate extends DataStructureImpl {
public final static int CERTIFICATE_LENGTH_SIGNED_WITH_HASH = Signature.SIGNATURE_BYTES + Hash.HASH_LENGTH;
/** Contains multiple certs */
public final static int CERTIFICATE_TYPE_MULTIPLE = 4;
- /** @since 0.9.11 */
+ /** @since 0.9.12 */
public final static int CERTIFICATE_TYPE_KEY = 5;
/**
@@ -218,7 +218,7 @@ public class Certificate extends DataStructureImpl {
* Up-convert this to a KeyCertificate
*
* @throws DataFormatException if cert type != CERTIFICATE_TYPE_KEY
- * @since 0.9.11
+ * @since 0.9.12
*/
public KeyCertificate toKeyCertificate() throws DataFormatException {
if (_type != CERTIFICATE_TYPE_KEY)
diff --git a/core/java/src/net/i2p/data/KeyCertificate.java b/core/java/src/net/i2p/data/KeyCertificate.java
index 5726c80b14..f4251ce211 100644
--- a/core/java/src/net/i2p/data/KeyCertificate.java
+++ b/core/java/src/net/i2p/data/KeyCertificate.java
@@ -11,7 +11,7 @@ import net.i2p.crypto.SigType;
*
* The crypto type is assumed to be always 0x0000 (ElG) for now.
*
- * @since 0.9.11
+ * @since 0.9.12
*/
public class KeyCertificate extends Certificate {
diff --git a/core/java/src/net/i2p/data/KeysAndCert.java b/core/java/src/net/i2p/data/KeysAndCert.java
index 33a1de2944..fc58a422ca 100644
--- a/core/java/src/net/i2p/data/KeysAndCert.java
+++ b/core/java/src/net/i2p/data/KeysAndCert.java
@@ -81,7 +81,7 @@ public class KeysAndCert extends DataStructureImpl {
/**
* @throws IllegalStateException if was already set
- * @since 0.9.11
+ * @since 0.9.12
*/
public void setPadding(byte[] padding) {
if (_padding != null)
diff --git a/core/java/src/net/i2p/data/PrivateKeyFile.java b/core/java/src/net/i2p/data/PrivateKeyFile.java
index b97d762574..c9c202f5bc 100644
--- a/core/java/src/net/i2p/data/PrivateKeyFile.java
+++ b/core/java/src/net/i2p/data/PrivateKeyFile.java
@@ -227,7 +227,7 @@ public class PrivateKeyFile {
/**
* Change cert type - caller must also call write().
* Side effect - creates new Destination object.
- * @since 0.9.11
+ * @since 0.9.12
*/
public Certificate setKeyCert(SigType type) {
if (type == SigType.DSA_SHA1)
diff --git a/core/java/src/net/i2p/data/SigningPublicKey.java b/core/java/src/net/i2p/data/SigningPublicKey.java
index c7ec32bb8c..50dba72137 100644
--- a/core/java/src/net/i2p/data/SigningPublicKey.java
+++ b/core/java/src/net/i2p/data/SigningPublicKey.java
@@ -116,7 +116,7 @@ public class SigningPublicKey extends SimpleDataStructure {
* Up-convert this from an untyped (type 0) SPK to a typed SPK based on the Key Cert given
*
* @throws IllegalArgumentException if this is already typed to a different type
- * @since 0.9.11
+ * @since 0.9.12
*/
public SigningPublicKey toTypedKey(KeyCertificate kcert) {
if (_data == null)
@@ -147,7 +147,7 @@ public class SigningPublicKey extends SimpleDataStructure {
*
* @return leading padding length > 0 or null
* @throws IllegalArgumentException if this is already typed to a different type
- * @since 0.9.11
+ * @since 0.9.12
*/
public byte[] getPadding(KeyCertificate kcert) {
if (_data == null)
@@ -169,7 +169,7 @@ public class SigningPublicKey extends SimpleDataStructure {
/**
* Write the data up to a max of 128 bytes.
* If longer, the rest will be written in the KeyCertificate.
- * @since 0.9.11
+ * @since 0.9.12
*/
public void writeTruncatedBytes(OutputStream out) throws DataFormatException, IOException {
if (_type.getPubkeyLen() <= KEYSIZE_BYTES)
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java
index 9b54d208a9..ad2322c478 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java
@@ -501,11 +501,11 @@ class StoreJob extends JobImpl {
return VersionComparator.comp(v, MIN_ENCRYPTION_VERSION) >= 0;
}
- private static final String MIN_KEYCERT_VERSION = "0.9.11";
+ private static final String MIN_KEYCERT_VERSION = "0.9.12";
/**
* Does he support key certs (assumed with a non-DSA key)?
- * @since 0.9.11
+ * @since 0.9.12
*/
private static boolean supportsKeyCerts(RouterInfo ri) {
String v = ri.getOption("router.version");
@@ -518,7 +518,7 @@ class StoreJob extends JobImpl {
/**
* Does he support more than 6 leasesets?
- * @since 0.9.11
+ * @since 0.9.12
*/
private static boolean supportsBigLeaseSets(RouterInfo ri) {
String v = ri.getOption("router.version");
--
GitLab