Attachment #204285 for bug #237809

View | Details | Raw Unified | Return to bug 237809
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= i2p	4	PORTNAME= i2p
5	DISTVERSION= 0.9.38	5	DISTVERSION= 0.9.40
6	CATEGORIES= security java net-p2p	6	CATEGORIES= security java net-p2p
7	MASTER_SITES= SF/${PORTNAME:tl}/${PORTVERSION} \	7	MASTER_SITES= SF/${PORTNAME:tl}/${PORTVERSION} \
8	http://download.i2p2.no/releases/${PORTVERSION}/ \	8	http://download.i2p2.no/releases/${PORTVERSION}/ \

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1548602826	1	TIMESTAMP = 1557365594
2	SHA256 (i2psource_0.9.38.tar.bz2) = 65fe327fdd11272a764c9e1c6ae1f38b151cea9003216b861c7ff2b281ca2970	2	SHA256 (i2psource_0.9.40.tar.bz2) = 5d31e0a324dfe429135ac17595b3cab3e81d85d4aa7a720db402dec47bfeda23
3	SIZE (i2psource_0.9.38.tar.bz2) = 30702106	3	SIZE (i2psource_0.9.40.tar.bz2) = 30808508

Line 0 Link Here

(-)files/patch-apps_i2pcontrol_java_com_thetransactioncompany_jsonrpc2_package-info.java (+11 lines)
	1	--- apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/package-info.java.orig 2019-04-17 11:52:29.174848000 -0400
	2	+++ apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/package-info.java 2019-04-17 11:55:57.085931000 -0400
	3	@@ -13,7 +13,7 @@
	4	* exception of <i>batching / multicall</i>. This feature is deliberately left
	5	* out as it tends to confuse users (judging by posts in the JSON-RPC forum).
	6	*
	7	- * <p>See the <a href="http://www.jsonrpc.org/specification"></a>JSON-RPC 2.0
	8	+ * <p>See the <a href="http://www.jsonrpc.org/specification">JSON-RPC 2.0
	9	* specification</a> for more information or write to the
	10	* <a href="https://groups.google.com/forum/#!forum/json-rpc">user group</a> if
	11	* you have questions.




--- apps/i2pcontrol/java/org/mindrot/jbcrypt/BCrypt.java.orig	2019-04-17 11:58:51.939865000 -0400
+++ apps/i2pcontrol/java/org/mindrot/jbcrypt/BCrypt.java	2019-04-17 11:58:57.299331000 -0400
@@ -32,25 +32,25 @@
  * call the hashpw method with a random salt, like this:
  * <p>
  * <code>
- * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt()); <br />
+ * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt());
  * </code>
  * <p>
  * To check whether a plaintext password matches one that has been
  * hashed previously, use the checkpw method:
  * <p>
  * <code>
- * if (BCrypt.checkpw(candidate_password, stored_hash))<br />
- * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It matches");<br />
- * else<br />
- * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It does not match");<br />
+ * if (BCrypt.checkpw(candidate_password, stored_hash))
+ * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It matches");
+ * else
+ * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It does not match");
  * </code>
  * <p>
  * The gensalt() method takes an optional parameter (log_rounds)
  * that determines the computational complexity of the hashing:
  * <p>
  * <code>
- * String strong_salt = BCrypt.gensalt(10)<br />
- * String stronger_salt = BCrypt.gensalt(12)<br />
+ * String strong_salt = BCrypt.gensalt(10)
+ * String stronger_salt = BCrypt.gensalt(12)
  * </code>
  * <p>
  * The amount of work increases exponentially (2**log_rounds), so 




--- apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java.orig	2018-06-26 11:12:11 UTC
+++ apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
@@ -28,6 +28,7 @@ import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
 import net.i2p.client.streaming.I2PSocketOptions;
+import net.i2p.client.streaming.RouterRestartException;
 import net.i2p.crypto.SigAlgo;
 import net.i2p.crypto.SigType;
 import net.i2p.data.Certificate;
@@ -354,7 +355,7 @@ public class I2PSocketManagerFull implements I2PSocket
      * @throws ConnectException (since 0.9.17; I2PServerSocket interface always declared it)
      * @throws SocketTimeoutException if a timeout was previously set with setSoTimeout and the timeout has been reached.
      */
-    public I2PSocket receiveSocket() throws I2PException, ConnectException, SocketTimeoutException {
+    public I2PSocket receiveSocket() throws I2PException, RouterRestartException, ConnectException, SocketTimeoutException {
         verifySession();
         Connection con = _connectionManager.getConnectionHandler().accept(_connectionManager.getSoTimeout());
         I2PSocketFull sock = new I2PSocketFull(con, _context);

Return to bug 237809

Line 0 Link Here

(-)files/patch-apps_i2pcontrol_java_org_mindrot_jbcrypt_BCrypt.java (+35 lines)
	1	--- apps/i2pcontrol/java/org/mindrot/jbcrypt/BCrypt.java.orig 2019-04-17 11:58:51.939865000 -0400
	2	+++ apps/i2pcontrol/java/org/mindrot/jbcrypt/BCrypt.java 2019-04-17 11:58:57.299331000 -0400
	3	@@ -32,25 +32,25 @@
	4	* call the hashpw method with a random salt, like this:
	5	* <p>
	6	* <code>
	7	- * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt()); <br />
	8	+ * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt());
	9	* </code>
	10	* <p>
	11	* To check whether a plaintext password matches one that has been
	12	* hashed previously, use the checkpw method:
	13	* <p>
	14	* <code>
	15	- * if (BCrypt.checkpw(candidate_password, stored_hash))<br />
	16	- *     System.out.println("It matches");<br />
	17	- * else<br />
	18	- *     System.out.println("It does not match");<br />
	19	+ * if (BCrypt.checkpw(candidate_password, stored_hash))
	20	+ *     System.out.println("It matches");
	21	+ * else
	22	+ *     System.out.println("It does not match");
	23	* </code>
	24	* <p>
	25	* The gensalt() method takes an optional parameter (log_rounds)
	26	* that determines the computational complexity of the hashing:
	27	* <p>
	28	* <code>
	29	- * String strong_salt = BCrypt.gensalt(10)<br />
	30	- * String stronger_salt = BCrypt.gensalt(12)<br />
	31	+ * String strong_salt = BCrypt.gensalt(10)
	32	+ * String stronger_salt = BCrypt.gensalt(12)
	33	* </code>
	34	* <p>
	35	* The amount of work increases exponentially (2**log_rounds), so

Lines 1-19 Link Here

(-)files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PSocketManagerFull.java (-19 lines)
1	--- apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java.orig 2018-06-26 11:12:11 UTC
2	+++ apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
3	@@ -28,6 +28,7 @@ import net.i2p.client.streaming.I2PServerSocket;
4	import net.i2p.client.streaming.I2PSocket;
5	import net.i2p.client.streaming.I2PSocketManager;
6	import net.i2p.client.streaming.I2PSocketOptions;
7	+import net.i2p.client.streaming.RouterRestartException;
8	import net.i2p.crypto.SigAlgo;
9	import net.i2p.crypto.SigType;
10	import net.i2p.data.Certificate;
11	@@ -354,7 +355,7 @@ public class I2PSocketManagerFull implements I2PSocket
12	* @throws ConnectException (since 0.9.17; I2PServerSocket interface always declared it)
13	* @throws SocketTimeoutException if a timeout was previously set with setSoTimeout and the timeout has been reached.
14	*/
15	- public I2PSocket receiveSocket() throws I2PException, ConnectException, SocketTimeoutException {
16	+ public I2PSocket receiveSocket() throws I2PException, RouterRestartException, ConnectException, SocketTimeoutException {
17	verifySession();
18	Connection con = _connectionManager.getConnectionHandler().accept(_connectionManager.getSoTimeout());
19	I2PSocketFull sock = new I2PSocketFull(con, _context);