From c74c24ec2249f5f2eb7c5cbe16d6eb623562b9fb Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Fri, 29 Apr 2016 12:13:30 +0000
Subject: [PATCH 1/3] Add ADD_ONION and DEL_ONION support to jtorctl patch

---
 patches/jtorctl.patch | 121 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 119 insertions(+), 2 deletions(-)

diff --git a/patches/jtorctl.patch b/patches/jtorctl.patch
index 167af82d2..7d346eff0 100644
--- a/patches/jtorctl.patch
+++ b/patches/jtorctl.patch
@@ -1,8 +1,125 @@
+diff --git a/net/freehaven/tor/control/TorControlCommands.java b/net/freehaven/tor/control/TorControlCommands.java
+index 36482d5..14486e3 100644
+--- a/net/freehaven/tor/control/TorControlCommands.java
++++ b/net/freehaven/tor/control/TorControlCommands.java
+@@ -144,5 +144,8 @@ public interface TorControlCommands {
+         "No such OR",
+     };
+ 
++    public static final String HS_ADDRESS = "onionAddress";
++    public static final String HS_PRIVKEY = "onionPrivKey";
++
+ }
+ 
 diff --git a/net/freehaven/tor/control/TorControlConnection.java b/net/freehaven/tor/control/TorControlConnection.java
-index 9524612..38b1879 100644
+index 9524612..c0f2070 100644
 --- a/net/freehaven/tor/control/TorControlConnection.java
 +++ b/net/freehaven/tor/control/TorControlConnection.java
-@@ -740,7 +740,7 @@ public class TorControlConnection implements TorControlCommands {
+@@ -736,11 +736,111 @@ public class TorControlConnection implements TorControlCommands {
+         sendAndWaitForResponse("TAKEOWNERSHIP\r\n", null);
+     }
+ 
++    /**
++     * Tells Tor to generate and set up a new onion service using the best
++     * supported algorithm.
++     * <p/>
++     * ADD_ONION was added in Tor 0.2.7.1-alpha.
++     */
++    public Map<String,String> addOnion(Map<Integer,String> portLines)
++                                       throws IOException {
++        return addOnion("NEW:BEST", portLines, null);
++    }
++
++    /**
++     * Tells Tor to generate and set up a new onion service using the best
++     * supported algorithm.
++     * <p/>
++     * ADD_ONION was added in Tor 0.2.7.1-alpha.
++     */
++    public Map<String,String> addOnion(Map<Integer,String> portLines,
++                                       boolean ephemeral, boolean detach)
++                                       throws IOException {
++        return addOnion("NEW:BEST", portLines, ephemeral, detach);
++    }
++
++    /**
++     * Tells Tor to set up an onion service using the provided private key.
++     * <p/>
++     * ADD_ONION was added in Tor 0.2.7.1-alpha.
++     */
++    public Map<String,String> addOnion(String privKey,
++                                       Map<Integer,String> portLines)
++                                       throws IOException {
++        return addOnion(privKey, portLines, null);
++    }
++
++    /**
++     * Tells Tor to set up an onion service using the provided private key.
++     * <p/>
++     * ADD_ONION was added in Tor 0.2.7.1-alpha.
++     */
++    public Map<String,String> addOnion(String privKey,
++                                       Map<Integer,String> portLines,
++                                       boolean ephemeral, boolean detach)
++                                       throws IOException {
++        List<String> flags = new ArrayList<String>();
++        if (ephemeral)
++            flags.add("DiscardPK");
++        if (detach)
++            flags.add("Detach");
++        return addOnion(privKey, portLines, flags);
++    }
++
++    /**
++     * Tells Tor to set up an onion service.
++     * <p/>
++     * ADD_ONION was added in Tor 0.2.7.1-alpha.
++     */
++    public Map<String,String> addOnion(String privKey,
++                                       Map<Integer,String> portLines,
++                                       List<String> flags)
++                                       throws IOException {
++        if (privKey.indexOf(':') < 0)
++            throw new IllegalArgumentException("Invalid privKey");
++        if (portLines == null || portLines.size() < 1)
++            throw new IllegalArgumentException("Must provide at least one port line");
++        StringBuilder b = new StringBuilder();
++        b.append("ADD_ONION ").append(privKey);
++        if (flags != null && flags.size() > 0) {
++            b.append(" Flags=");
++            String separator = "";
++            for (String flag : flags) {
++                b.append(separator).append(flag);
++                separator = ",";
++            }
++        }
++        for (Map.Entry<Integer,String> portLine : portLines.entrySet()) {
++            int virtPort = portLine.getKey();
++            String target = portLine.getValue();
++            b.append(" Port=").append(virtPort);
++            if (target != null && target.length() > 0)
++                b.append(",").append(target);
++        }
++        b.append("\r\n");
++        List<ReplyLine> lst = sendAndWaitForResponse(b.toString(), null);
++        Map<String,String> ret = new HashMap<String,String>();
++        ret.put(HS_ADDRESS, (lst.get(0)).msg.split("=", 2)[1]);
++        if (lst.size() > 2)
++            ret.put(HS_PRIVKEY, (lst.get(1)).msg.split("=", 2)[1]);
++        return ret;
++    }
++
++    /**
++     * Tells Tor to take down an onion service previously set up with
++     * addOnion(). The hostname excludes the .onion extension.
++     * <p/>
++     * DEL_ONION was added in Tor 0.2.7.1-alpha.
++     */
++    public void delOnion(String hostname) throws IOException {
++        sendAndWaitForResponse("DEL_ONION " + hostname + "\r\n", null);
++    }
++
+     /** Tells Tor to forget any cached client state relating to the hidden
       * service with the given hostname (excluding the .onion extension).
       */
      public void forgetHiddenService(String hostname) throws IOException {

From 27b4d0ef1f9c04ffea741dc5027fc6c20c0268a0 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Fri, 6 May 2016 12:02:34 +0100
Subject: [PATCH 2/3] Updated jtorctl binary with new patch.

---
 briar-android/libs/jtorctl-briar.jar | Bin 20193 -> 21074 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/briar-android/libs/jtorctl-briar.jar b/briar-android/libs/jtorctl-briar.jar
index 134f85dbcb386b866b1cb9023a9f1fa29e308f84..a299bcdb39e4ec965dd35fc56263dabecce069ad 100644
GIT binary patch
delta 9848
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
Bj#~f#

delta 8954
zcmZX4WmFtp(=G1q!GpU6hr!*Q1lK_WAy^19zzpv0?oMzB79e<l!QI_Gcy5yCz3=^=
z@Am4mdUtp2U3Jd+QN6lqvJiG73l>X586JTE1_cELh9nj&ABQD`@b{{$ENn>1VtYqS
z&#+g>BDhCPxJ^u-43p$=`SIc-ER2RSGKw4vIA0nD21e%h_<t&>zg50KH(?R}fcj=Q
z48(uX0CEr9KPU>#;6HDV(6j%8qA(r)K?zS-GN7V&sGoFZ2*viS8P2RPQOvml%rU+7
zBy_rK=VLJ#QV|m*P}X_qq<QdwJ);oS_Z1e#iw2ENL@D78<!^)Z@VIo1%9|FyJ2kmi
zxR)*dsLDVo{?&Q~wC*nTIY0INx#E5L?xh}69rU!`E5j?FkuCexD<6#hDPEL8<Xl*G
zuMC7$cg34kBBHSOs_yN6u6L_~2l0^+jb#~Fg=5OA7#u9$IXdap^o>z?aL9GrC0<mG
z|Be8;YNJ(n+%+~LVw>BPvV_!#!<2}mT_c*4=hGK(+dVHbD1a5i#NtEIm@d*+3f`=g
z;n}GjP4*hTOF`W|Yb+N0bcUSQ^#)l-7}X%piLhm}^N+7Ri@!x72@DMZy((i9WO)pk
z>xr`Tg=}$~hc9Mm4oS1-giEDvk9X@KY4x&wu2v^TSpeahH!VLTXWDr)mKHL89JNYQ
zX1&YZdUGe5B|x%F?@UI~kVz&Z+%@rYxDnRNjjVm>n<N%$SnU`9$vOFe2;2<3;$H<h
zo!|4An4Jgl_(9h>h3-at;@XWI&*^zix$d;UT^8roNTyEbgmoT8qMhYeb27IzM?Oj5
zz$Z*EBlZ{vNQ#4Oo%8UP@CJ+HdGq$p5)H6Qw3_%`m*u&dxgzsUuw!SO^YCuQLdBJ5
zy&dvd{6N)$PsX{=*GLoaS!{>r@D_*z>}~y&{mt{pCk9--yK?FO?v(HDk>=4CY0deZ
z68!V<2_E@mo2GR;<l`Z1+R2+1^~8Bj)<;Y+vvV*KHpvq$m<kU8;CL<xrsBTS1XE4j
zyJUeXukcmIhW*9KG2GaHB1o_9j^)lxjakj!J+GQsr!W#+2B+4McB~jL*@JxjIJJQh
z1H`vTY1i!bf#dg$dtUtBz#E9Kaeb{FxVdAN7>%>LmBBP*4gVB%(@1(z72V-^^}O;%
zvZi^ee&HyG5DUSkQI;fqh8)G9-Td5psi)H)WWRlj7$LcGdgb{Ok|rn5^axj<d|hdJ
zhWUAk>@@;^z=DMO+moTF6ObJ$3)~%16Qt^?L6p3TJ9bJ0@N&zcsj}g+-}(ioI{LUT
z@7Uw4Ejt=1VyK-YVFWA&66`-fUAf3uHe707>5<*MO%I;0Lus1W`x!*MWn^v@QaeRp
zyR?qU$z(8ORe{maOWpfD`vyQZ=LP<e?QZ<mrLVNR^bPvfw(Pj7ImoEXMbeSGr=gL>
zs-zG5?SuME>oMsp!EM9)(kr(L5kjn->3e1grwGT7A&a6bCM5LZ`LjD0o})eNVj$!(
zTHBsy^9NNx0GD8Pw$mI`IW!Wcpi~_;%}&Q$6ONoUP;#6f@m-%naq%^kIG>KCTERp*
z)#bwy>(dF`dQpH`0Z3pP6CfSjYG)-_tdso6q&LSx{1O&kCq8p;SG;aRb0dT}5)EVe
znr!TCs@@liHeF%yg37r}kMTVV>0ImJ_6?Sc5-f#RdvxEktZWWT5D2i5<761ESzgtN
zvof@a0$!TNY^i^+8fAsbvl>uONjSgHT5ZCFM!gF9xEP(nZwt~yCXRIjOhx9U5!hsf
z83cjLzTY!Ppod7Y=d0;&LWd>v^<_>D4c|RD+m*`Oe*0;GcR&GMn6~tGCf`$Wm!9_!
zJs-60#1b%RV(uoQRIV+kx%DFz5=T~kr#b!lJeo~qN19iV*8L{6jUNEmP>a26^rDkl
zM4w}ev!+GhpaFdz$51plg+q|e0&LuN6Nx{eBMW?PV_jS_XGyxY!H`sidy@s~-@cCw
zCl#hkLyLy{G%TV$X9Ib(*&f85d%HXnOyGl`Lc^iCWlA-1zc(1WT4i1su4GzUH9$<{
z9UR9aLdzY_Tq1%am5Sbo=(}RhZHR?NX^Qg@eLCoLga(4NLz|y?9hoIk?G2C9-5&Ln
z=d+QMd$KWCgV~u-rL#JnB;0(dQIacsPfkog2?8w(a|}D+k}AyfRAKL1^5VvUi1dRV
zuXY24N?>@j=9XYO9N-)OnO4p;d$rp&a9A>dGEd(9C1|K?+eY<;@YiDD0Ln}-tLl6F
zGK1Ox5U7`z!8i+F@pau+v(z5r<)^vAXE&G!Wm8D{wEXkOP0!MSN!@OSXMaBuYX#p3
zrY@n{Z%04hr(pD9weG_w<ZP{FJR!f(CIi!-M7#Wz7-nphKl>Pe<m?*cOna(Z6dm0b
z9|FE7VFIWi$2k#ka&X-fJ|Nn2Cj3(A>Yf}m#{xmneNqoX!xLom`{2F|^<eNmuyg@0
zkDh{;uZhiQRFwqoRbL8*oG;GOfS8C_s!LDi<9eQ4Ox<EaPNRVza$&xrq0J)ZCBvb<
zLo^gNe}aQqJ6ghc;gS~OQshQ9C*pwkIFIP0;N|6h;K31ZMS;K}=8Z|<v_B{PVu<O=
zcmiR+lqg(aW!}}#Qd?|#s`_Ck?o)hDIY=Czo=?4Yg`Pb66N0*b@!YRHQ5B=QSWe%4
zVV$3%xMgU9qn-MM3MbhEObliCmGUb@7`ly(C?9f1n}B_Vn@aFvz)Rr4-ix7aDYLPo
zaW&x6S4ahwX27<$vS&-J*PZ3nJ4^@KzXGNIm_9aONUzmVdCfYbS6Nz9>7k#NK32nx
zYcHeyh6HWY(cZ~Te>%+|`Lly<rDJK003Wh13^k`6w9yfNIwZ{?nx9;++Ot`wHG@T!
zJp~DNi{)oLVF@@Y{h<g`(0FaaNc*7QTUpi;u)g8s$lHi}&isS<+TuaEl)zl`Jsn8<
z`<@e4&;)96a>-7{B2ySK_N2ces05UHZ7B72y_MlP&4jNJS{u5HciY-s`13$qp{kf)
zj;z9AE1n!f$iAF~lDd>s^?iG0RyS1{LB2q1MqX7Bb;DqxDQ^BM)qc$6z}G5H2497c
zFBjMQ{dUqUdOGCsovSOyCI{8dPH-R+7Cl~lO9Sn9&|?m+#xR2b$X<Ao(`&ZZvd-l~
z9i91l$ww^7`Z~G+=;Y+MDJ6^ehY*!we#H#Oj|@j}sm!>yeg4J#gg9H|vvH@(73nKC
zx^Ojwd_NF-BwSr(t=$pWKT&Dcwda++tDSgT-`<+1`IcmLzq;JcO`m_jBP|Kkh^gvy
zL^xKX3QyliRFbKyQST=E9L^xnHn8!7(58jV;BX~Mb%t*w2&m^iH5n}TAvEiaIE6yI
zQJ(pVmr2>Za)_MemYf?IlfcLLj1x!@icf)m*eyi>dmMu}V{4?$8jfk{H=!67mSXIx
zoq(};jkLtAO>64uluK!ZI}JXNI$I;d^)_>t;5t_mL$SHt`lfe+U#P<230@hU2k(Jj
z2Z`5o4e{YzxSDz?2hMf56}gu2qW#;|7(7+>A!jx_R$+OjW7J@2_RbG`+<qf4St{zD
z0xTV$MBJaGpu@+xP7wGnFlcbIe78=hCL}YQ%+zZ;H=cvYAB@3sO={|(TDZ0ML42}F
zDwgQ1Q!B6EnN-IP65fAT{~5GQ_O%y<zpX8AgcDPFye;;-l%Kh(ssa5rVX^7>wbS8+
zTaXq3{snwd>g4Og-p!lo*Sf0*Uw1LoMKH`v*Jkhoi{091KKHRs)&)N=bXz<%li8T3
z7emj#FEfcBcu#lGbP)v~f&ysX_SOVjk-sBWsvx?Bc;~X%2+IN;G2BCapH5b*Fpp@H
zgNo{V0|+JbYA0z$)kK?EITwhM)y7fWJ@5NoX}D6%_+XXEj_;ob$JBYMpctaKvt^dC
zPdf0vqe*+c<M&0MaQg{5hdacl9)dt7{fuL<rQWEX$UP|LNI^421Tyt*ag|l@lW!pA
zFl6u;x$ti8`^qpeCy=jy;pWd-KM=#hGx2(cUoBEdF7Yk9mD<Df`>2O|X}`3~PXbDG
z4TLOG9)#3p71YTB1#zfohjr3n`+?51d;DSc@^rAM%INV@HH!(Tw3!=08KkL|*KRld
zGIAxJ72O|x#5ZK8=7Ib?vvZJ+>?U%?8m6XN6%8<Q75jC!CW9chW(A538K?BcX9;R*
z2N7H#|4`n=5KmsMRFR?;EeECoE{?ci?I>Hv>Cj~CEsRXxNXmgus;#O}9xhr^J)=o^
z(iiLNg!i08soC9Ad187AihS2}K>kX7Ryg$yW&|}l5e1wbLJ)RrM`K|Q53+(Y`w3$~
zPMsDi-vnxd5yh`C_b0g6#4Sd`p9uvmZdBGOqDs4J!^|9BkWpXW%9LPm9dn}VdHDVL
ztl#j8Jnb!udC(m~X;3L{VLDSpI&+HN#9RA-(h6Iw#!2-HcRD-p+tG;wyR2;JfsM?<
zI+C%h48ADk0O<Yvr!^QML*-1`#{)>)q}cG1Vv5CJ4X11LVF6UcZW^Yw`x}WDg<&wr
zmlum_;3pK4#oPbDbTk$>JFq(cs!<ebz~SeQmR)$kBcrGmo^V_+bQd4h%-jK9vOdfV
z_u7tS2D_5p_9fLKSm0L$>Da)c+e|SDhoJ2n38#rRfI?>_*-xewP0%Jjw*?CCleQbn
zi?yYV6^Piv*Ul6XB*{OR56>Q?gp_HN*f2)33Ccu6QD><bgX*n2sk%SqH#EVfuO4PX
z)q@&eMf4N?)P%loXdsay;H2y#TeGQ{f`bnrUk64dRJl||(ziN1mKGLSwTpV%E{n8u
z(RtPxfDQ{L0o;luy@Los<kOhwPWjvfg)ECoHWMDg_zvt6GYf8c@j!%y=-9F;=R2++
zTcg-XP^huLGxx)rL`9_jV^|h2B5+pfOYeiNp6`NoVvM298J+h~HmvZM8KIIKHR05L
zAS2`AF~Ml~^^$EkdDv;H!^wxS2uFM=>sM*MAl|NJz2Ll0nrW-@CCN*zqOL|xLmUR2
zi^nCG9|6N-j4LAV@?5{E4IdXNY8C>M79^Thi!7IVj6#^|JU_&sdnP5@Bx6kE>!tj#
z_O!m8+7uJ6vNm%1RxMdYSG`BAqUwfA&;UQ*MiBm$oYIXxs-&j3vAQ^|TZ7LSJ?4d>
z0pv%)cFz7l<4Yz|Gca~Gq1%98Pj*1m7Iq3ZMwxfk!_eG)<M9oqc@o`??3r-hJLYr~
z<8X(q&2Yhy!<vdgx@0eUT}gtg!mOV<(urx#H~LHb`A-3vpamhJ5VJu+8QL!wKY4W*
zMMkDgzYCz^cY*Ql6?v=#Q40Oc{aJD+=s^RQ1MxB-a;Slmw@M~%g|<=<nuT-`+qGtr
zPe}O+$I@0uqOsG!ejQcc@Z?9bp0};O{^f>Qe9sNXxg#F_V`e>+kFe#|O!i+!4@r~^
zbg~bIef$rzFl#q4dA<CT2XfsQQsZKxH0k&#jwyWRt(V|mv#zgG;MBrLFXxdLB7+!&
zR(N*phf~&r75u~_TSMfgOwv()0SJc*;m|51S<0kY>|}WCWLYk#(-2~%KF5kS(Zo5*
zlP<uXR?FkHQo#CPYYlSd&6|STNU9Racg<O54(@w-4N8d9-9KO89LxxJ6!r{_3>ShP
zLRqi^3UstP0tFf#;xsCsF@<E?FF~(t8}6C6X>Gk_jqPN#mrY4^b$nm(#u-k?v+gZg
zrN<$6kDnDJfBf3MyWqGNZff0jJf=G=GF!{)D&EM_W$$so)nktdnQgg_yyI;;lo2%e
z0Ke064ev%Y9J)04A$x`O>~=pH-Ypt)FbhI9rYkT?HH?{du|-K<qVM99B@8mT9U8#a
zAj=Fo?M?G=-%Z?p^CjwW$lDGM)e9hTbRtOBw}9n7o8)r~<8FVq8hR#1?~MxFD@zM)
zk^CWNK3fFr<ytD;kJQ=2RmO@nZ5fH`LOy@FnEaG|NgIp<kd6<;v|97&F7?kY!YfSr
z*nQyEa-D_(tqR5UgkJgYp@T|oObP{H;(x-%OJB2m-RH|ztGQD74A!5>XpdgqyxM<%
zn%8v+xW*D!IJ?lkh80)+rL_*hjq0_6e?dBkx267;fh7!;xU8E-syVtwdclH=mR{Hq
z+~qKIBqmx%j!-w?y6D>gf9Q&wN2PHI3Wa|{96M*|ur8VzdK>qdxgOMFMMYSsrzyWq
zNmcReZ1@=Qg~s%w2Bmv*^8AC{6m(B8Avi!<ZuHr(%{yKDCpN9fUheIa$aC-FS|Atg
z%;Fs^T2sCS`b^Y{q8xKON2K69?ak6IL<WE)nI@Q1_lcmIQdNzFBWGaZEoH^11x{U^
zb_s|^qf7eCAZ4`IP7l;0Dv^<sUuhA$Hi?I<5nbC&U+BtQn#`>9s;3GwZQHn_+83^X
zVv9xQuBtIkC0Z~ZD!+syNZ011FT`VbxO(Mn*MxTJj<+O#4Mh}SlCkvIpw-bd4F;I9
z$!d5eE-6uYF5tL&f?wEl$ZuK-C?)H~`d3vFN%~xKza|WBYlFHsMOoJGbq05MBZw!;
z+EdH#c*{4?48G}xKWl1Cn=@-?lewm%;Q%Ud0OBf2b{OX%Gt}ng@;0Ta@}kbsVeI&d
zOw*nM-gqjki4;D2W;wJrCMTnk%pGg1^H;oC4rP!dt<!sbI_pUQiEP+WmG_|%*2MS7
zz7MF{zG+D<$)MzS8=sI9EiYaloM^o>#J5(^>%=pBl{RQ{X4Yi|jnF#u62m9wpZw$$
zc$kjsuRqb+9^by4uahiIIt<@JN`8QY5tpv{Qbl(kLqD{1hr~8n6uZtNCt7==OL(+X
z`c}4_6%WBa60M<ldACk>G6FDOeUiUXL^C2q4AWXmFAN$Vtgk4npYSUBJYHW>S)bF%
z^3^|4tL%=rDKxTZS>9CH|I&yVvVe^&$v098^ukx&q5gm;#eh0xA=6;pp4R5Y8uW?m
z{oY9fcw8TCkTGKmWhWml5Gi^>rSH`X6(MC&=r4<xu2dSQMwK>ESzJ@~g3t@paD~Kn
z&-0|MK^+jAte7c68b`27ibOF*?19$cHK9Rwie&M~&<}kLc+;|N617(@LRhcqityK^
zA;Y0Cu3u<gGl_=}P2!>NtnZWqxD(~``*gb}1ej84#KI5d!w=0X1T(Sw@-}n*iXxqT
z#H^<cEA!gat1b;Tbt%yZn6Ez)qjp}4KFg(_)?tDsW~!=3BSok8uZ+{Y+5)x2jV-;<
zvT#-=)#v0o_SBev#kWbUBK}xYvb^I@?{A(8^FhuU^^|(_l)UQD8D9gluBgIp4_CEk
zaBO?q5wEFxdtn2*y_0l-8oRipxNn9Bcokb0N6;Mj0voZJ1&rxE5w2qFChBIt>lGU0
zUq66Um1}J1_Gbt+fhu2dvpW6A{blQhrExCILqEj=uL^8WC=1a1L@8fcRH`fN;FJYj
z$k$ugB_&N3%PAip74EL7uPNEi9EER*(&Zl^k`8cA68JH5`{gHvG343Br*HuYMY^)2
zsN>B|5k*avg&iYaC<F3Ed*%z7Eawb=3^IaTZYay!e#U(iQ=oB-!SzG^N=M{DnQ+eN
zCR1c5l0P|EgFlHvFCgLVa>nC!x3@m#I#H0Busld>+X_>x=!4?&LTeBhZ}y5RPwpkv
zz$;cbw*-ayP4onwt}#G7w12vKxKyF_MwExarEo(5PZ&P}7nw7nf#5n9Zqsv8@QxTX
z8T6cobRRO==bxo9k7;Mo-ER3E#%-&t8szUZibDmWfesMU0^|9E$rs;}7DN@;Eq+Qb
zQ_Tfd`5QDSx;62?a(^ONEL1I0Zm@H!;?HuL22Q{m;NCcVSIXMj@r+ANXkq^al<wdV
z9=54V<e^|z>~n2z%iWxsLqw(j79;cfk48~q{Gtj^!#iG+4Ar2;um+_JX@`b{$wYYN
z7(8k+xYSZyT8`Q=JhKZI^wMn}+49m11X7$^;Ed+?geaD>2CsD|u_W7)N%AUD)DR(V
z^6UsrKLj!j!6zqDax89YN@TOW!k5Ge5@jBNA#9nFvPP82VN9>q9mVU9Jjphon@N<L
z1voP=A`QEix_pUtA>7arYC$^(*uHw0zIwYR4~`#GqB?n11=a>+RWpmQGMqt;Hw~&s
zx#$gQZBimJ)lhzzSh52rc8SLZr^TB0T5^?i0Pc^BftM(RieUFthVCuwDK1fDb2mc7
zPc6bUB9e3zZmtvha%^Y)wh=O*nSzlJ<I?LG>*Xr0Q~u$ZChblSzjzl{%Ua>7VUH35
z`QDu>=mcqRBB5mx>PUV^8$#e+5Q~6q3KZicyf8wpkJR6Gk|omEZRvtT>4ylDwT*2v
z1Jt9Rmv<mP%k;RNf}l%J|FbBEr!@Od22D~ga*ne*9iv<D2)ts0`g%Laa<cPH9Dn?j
z@j%ft>%@yY-iZ%yS^5nK4|ma;d$EJ)#AV+jYwd{s>(#N_r~@kTQ-D(A9%1>&Hi)wS
zt?#dTmGqwDeaU4q!;#QR^X$F^R%2!tPlEuHfY&dXZl6@xwm55F5^O9~a=o>*{0!oq
zClOAn1c!{k1DApoiaE9#anljXdS|rJy)@cigs`FoOj_3v+H$r-kjN121Xe;^aQguY
z{e&bxhhs*3XxHM?Za{zPA=nl)HUT6sFzWpOyB?Cz4`4~?R;Q~sXElb!{ZknET{8La
zL7za)N>P8zc8Kt|K9aD=Ed%-qqSeRE0W3`pCcpPO8Tp<PDAhsxeMl3|2&J;9kv&!)
z=xIFwF`K>2u8Qao)?;<W$_vKR@}H0jfvln`GTBWNM6Y^3CW!}Pzj5}gYCgLhsqb7X
zb6y=)5WDI^riAskJkJsJ!Q0SA$&qV8-*AGAQ~MBYxT569-@)||<AORN=hl!KY9GQ4
z2NYBJJER@~+*8RrqMi=K)SyS4Q~5jo9#5Rkh;sl08HZBl6Uv4;L>{Lz<{Vz{>2*&G
zj$h<CK13du((=>=!ieJ+{sC#j21Q){4sohW=8o{!GhdH0j$g#N2xN`+33ej}1tfL%
zrpFZLCH!0f(nb3O2D$%A3jytHtdSD1M9lC_HIX$Tr5Aj&Ey8!B<qS>kILQ{5@I=Op
zO)AG6v8uG=>Y3+WQR+>%Jd}|7@v{upLzZC6x?q){7>ue|yjy42ij^R3hd0U<rwm7`
z>KWi-0?x1HN&Ybnu;*fHS!}nSPGh#^>L1PjVx?2jbbzwg3wj>4pEUxP#nGYmKc*4#
zrQ#?WZKdlqYSpv;NLK*rfa4YV-J^yBw-$@P3_hhI312B=4pgP9eXnM3#mu1J3bPvH
z-z7d!LNC_j3o1-BqD$fuh_hV+HUcvUo2ew{%#3tuS3iu30n+H`Y?+~Dg^|f$Y$rw3
zObo>jPCma`0-4kbZONF6%!{fe=MOqK?zRLk(a8deH(}5gYRgvjl%fZ=E6sKF?R7l^
z0{bGZtFM)7Ynt~*Yjl4s?1}<ZayH7(_P#-8J~$A*DX6!Y*XviE%%N3mxeM0ziD(pT
zZES-!u%H8z(my5VXyN_fcW~F&jLAuxaZk&BV}Dbx0Mgtq-{c+I_+ZqO=q}?@W_2B_
z&QaLuIGu9P7D8ZNuf?qz2i4Jw-z}W5)0=vio}Hi5oiKR2m6MR9tLo(JAy`K8oft4(
z8?;t`<XcUnm|wr2OQTeie|cbBOdu8pAjiI6lyWV@wkI<FKnJTj&`AT1zKL^KjId%b
z2+as12W{$Bop?+{SI?TQ4??Xmkyx`ZbA+o`v3x3;>rX?fn>$Zj8`L-*?_J*`g)FNn
zEODcWEG3PNMH4%^ac;dT@X(W21?LsoAbY*Hk5zA?_f1z9C%pBf^<6a$a~!4`OeChZ
z&Nu~Ne!R$Hs(DF{0Q6hx&ac@uZ1Ge?^2fA)1KBRuMMQ)icjmV+OV%BGY-TN*Dz#4+
z8tXu`&kZ<^cjQ}ZWj?Nk0XbHgNXb);&2?&K$r`9Ghmi8VGLl(xb!u>|V1X~xNOH@G
zHsrAUpNYto<j5Z_vy{Eri3Rj=oh%A0JftEP(%2NV1>@5S<3^9ogxO_VqB@9fy*p7n
zL0sHWjJA>|y+@g)HKs@NdDODtM(WGn?j^Ob10c>r)fjN1GoZoa$!TusdIY-4oP)oF
zPIKl~{@GlvaRybbLBKnYxKTv%{xe7&d}aTwx_L#<`s)*gT75RR=~{%(<W?{zKYR`G
zdv_@!+YjF|<)b<^fn(VD9;~;UvT<FmAeQ__+ec$=Z0ldw$#X|?j=Vtk;T02yisdM&
zwWT~}r7%4a$D2hfflMCE&+Q_u5-A9Nysk9Y&+N`~*uZ=>!KrXYhu!1XBcuA3&xLE@
z`;0woI{Suaf-2I4Di2XS16|T)+2?@}2Z$-dMhbql@~603`VFKFdepAKT6XggP%Y~Q
z!-h3#4Nj+APX)x3dBXv<OQ~lL*RK&Whteh2L%HFO+Kl3?Fwf{C)sq2frdww4(dwDQ
zUrj#8+K}j>=;7_U_9B%kiZ(8aj?)^*)*3J_a;nij^e`w}%GPQoOKj^fDO-wC%y#w{
z0ABheK!nBxlvA&KB7TErrBu+`V{zZv5?%J=;fYeFCzH!+SzqhBuqzJwF?PJ&hh-M?
z>hbrAl+CPO?S?~J042&Z-OCo*iz~73r_bRl$aJGOFS(FbPH{T()2|{yrUoJB=65L1
z&rAW2W*Sc;A6yUCdvmL>_K`DZBz?QzQA{Fd&18ygSMJ_q)`x#yea8;kaVvaNL%c8J
zn>rRKCbd^<Qs^o}Ra9RZ0~IQdnGz~a*(aZ4+-Exw&cc77%W4yo-7EBq9b<kb-!l=^
zVd=jZ-?^J2|HU;R9<!A*e!+=z!AWqDL$jG8`xGJbR1$utPOGjyFb{q6`&@w5&qHxN
z+!D9PIq1=d>wD-cKY+>#CE_^n<A5@SBSV|v?b{b5WaQ@X9=Dm3wrt)UBiRFWd-cak
z9=C8Fw^AF&vONnfaksiOC&UpAHAHq@GKnWe+v6?r?Gpq0q8LKLBfOY|g3=;~T@$lo
zA%GL5Lr+XG4wD=FU&w#*CbA~4%?c6>%o)~y^Ct4|c7(tE1KL6+|LGcN6v6xt>IZ24
zlPT-Tq>R!2wkss~s0d*G>09`3PeMYs3Ln)Ui5Eaeb|@?ij3zt`4A*~i?jO+eC-25R
z60vD0!@?23{L=*Shl1He$ku=W19N~31H<tzN-12zYgY1v7*%TOKZflq{GxVnFfeGp
zjXD2i*n<4qkRjm_89iPN<DaySqecqnhxYfemKw!hz5oMTgyQem9)1tjfAN>m|2nEr
zqxgqB`iG49_gOP09_#;(_<w$S@cv8aBtcSL`meL+59N>2za3%z4p{78HWQ4$g(d#K
zWuR`P%lQ6#W<w}2F!cW-fSCVA!lps|SNVT#AkV)HQ#gJbG9}>fVEljTo(P7Y?|+BG
z_}hcXzev-33Fbn8c+LO2ZknWU{DQxAxD$*u>Ha$W+>h*e@OwY6es9pfry?($kf*8g
d&zfEQCT5ELzNb%6lR`@n)xtq~RQTiR{{Upio@f97


From 84cdbb877d4514cdc69a575f212cc0ada7264326 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Fri, 29 Apr 2016 12:13:59 +0000
Subject: [PATCH 3/3] Use control port to create and set up the Tor hidden
 service

---
 .../briarproject/plugins/tor/TorPlugin.java   | 87 +++++++++----------
 1 file changed, 40 insertions(+), 47 deletions(-)

diff --git a/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java b/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java
index b0c651fb6..e7852bff6 100644
--- a/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java
+++ b/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java
@@ -47,6 +47,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Scanner;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
@@ -63,20 +64,21 @@ import static android.os.PowerManager.PARTIAL_WAKE_LOCK;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
+import static net.freehaven.tor.control.TorControlCommands.HS_ADDRESS;
+import static net.freehaven.tor.control.TorControlCommands.HS_PRIVKEY;
 
 class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
 	static final TransportId ID = new TransportId("tor");
 
+	private static final String PROP_ONION = "onion";
 	private static final String[] EVENTS = {
 			"CIRC", "ORCONN", "HS_DESC", "NOTICE", "WARN", "ERR"
 	};
 	private static final String OWNER = "__OwningControllerProcess";
 	private static final int SOCKS_PORT = 59050, CONTROL_PORT = 59051;
 	private static final int COOKIE_TIMEOUT = 3000; // Milliseconds
-	private static final int HOSTNAME_TIMEOUT = 30 * 1000; // Milliseconds
-	private static final Pattern ONION =
-			Pattern.compile("[a-z2-7]{16}\\.onion");
+	private static final Pattern ONION = Pattern.compile("[a-z2-7]{16}");
 	private static final int MIN_DESCRIPTORS_PUBLISHED = 3;
 	private static final Logger LOG =
 			Logger.getLogger(TorPlugin.class.getName());
@@ -90,8 +92,8 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private final String architecture;
 	private final int maxLatency, maxIdleTime, pollingInterval, socketTimeout;
 	private final ConnectionStatus connectionStatus;
-	private final File torDirectory, torFile, geoIpFile, configFile, doneFile;
-	private final File cookieFile, hostnameFile;
+	private final File torDirectory, torFile, geoIpFile, configFile;
+	private final File doneFile, cookieFile;
 	private final PowerManager.WakeLock wakeLock;
 
 	private volatile boolean running = false;
@@ -124,7 +126,6 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		configFile = new File(torDirectory, "torrc");
 		doneFile = new File(torDirectory, "done");
 		cookieFile = new File(torDirectory, ".tor/control_auth_cookie");
-		hostnameFile = new File(torDirectory, "hs/hostname");
 		Object o = appContext.getSystemService(POWER_SERVICE);
 		PowerManager pm = (PowerManager) o;
 		wakeLock = pm.newWakeLock(PARTIAL_WAKE_LOCK, "TorPlugin");
@@ -421,47 +422,39 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
 	private void publishHiddenService(String port) {
 		if (!running) return;
-		if (!hostnameFile.exists()) {
-			LOG.info("Creating hidden service");
-			try {
-				// Watch for the hostname file being created/updated
-				File serviceDirectory = hostnameFile.getParentFile();
-				serviceDirectory.mkdirs();
-				hostnameFile.createNewFile();
-				CountDownLatch latch = new CountDownLatch(1);
-				FileObserver obs = new WriteObserver(hostnameFile, latch);
-				obs.startWatching();
-				// Use the control connection to update the Tor config
-				List<String> config = Arrays.asList(
-						"HiddenServiceDir " +
-								serviceDirectory.getAbsolutePath(),
-						"HiddenServicePort 80 127.0.0.1:" + port);
-				controlConnection.setConf(config);
-				controlConnection.saveConf();
-				// Wait for the hostname file to be created/updated
-				if (!latch.await(HOSTNAME_TIMEOUT, MILLISECONDS)) {
-					LOG.warning("Hidden service not created");
-					if (LOG.isLoggable(INFO)) listFiles(torDirectory);
-					return;
-				}
-				if (!running) return;
-			} catch (IOException e) {
-				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-			} catch (InterruptedException e) {
-				LOG.warning("Interrupted while creating hidden service");
-				Thread.currentThread().interrupt();
-				return;
-			}
-		}
-		// Publish the hidden service's onion hostname in transport properties
+		LOG.info("Creating hidden service");
+		String privKey = callback.getSettings().get(HS_PRIVKEY);
+		Map<Integer, String> portLines =
+				Collections.singletonMap(80, "127.0.0.1:" + port);
+		Map<String, String> response;
 		try {
-			String hostname = new String(read(hostnameFile), "UTF-8").trim();
-			if (LOG.isLoggable(INFO)) LOG.info("Hidden service " + hostname);
-			TransportProperties p = new TransportProperties();
-			p.put("onion", hostname);
-			callback.mergeLocalProperties(p);
+			// Use the control connection to set up the hidden service
+			if (privKey == null)
+				response = controlConnection.addOnion(portLines);
+			else response = controlConnection.addOnion(privKey, portLines);
 		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+			return;
+		}
+		if (!response.containsKey(HS_ADDRESS)) {
+			LOG.warning("Tor did not return a hidden service address");
+			return;
+		}
+		if (privKey == null && !response.containsKey(HS_PRIVKEY)) {
+			LOG.warning("Tor did not return a private key");
+			return;
+		}
+		// Publish the hidden service's onion hostname in transport properties
+		String hostname = response.get(HS_ADDRESS);
+		if (LOG.isLoggable(INFO)) LOG.info("Hidden service " + hostname);
+		TransportProperties p = new TransportProperties();
+		p.put(PROP_ONION, hostname);
+		callback.mergeLocalProperties(p);
+		if (privKey == null) {
+			// Save the hidden service's private key for next time
+			Settings s = new Settings();
+			s.put(HS_PRIVKEY, response.get(HS_PRIVKEY));
+			callback.mergeSettings(s);
 		}
 	}
 
@@ -551,7 +544,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		if (!isRunning()) return null;
 		TransportProperties p = callback.getRemoteProperties().get(c);
 		if (p == null) return null;
-		String onion = p.get("onion");
+		String onion = p.get(PROP_ONION);
 		if (StringUtils.isNullOrEmpty(onion)) return null;
 		if (!ONION.matcher(onion).matches()) {
 			if (LOG.isLoggable(INFO)) LOG.info("Invalid hostname: " + onion);
@@ -559,10 +552,10 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		}
 		try {
 			if (LOG.isLoggable(INFO)) LOG.info("Connecting to " + onion);
-			controlConnection.forgetHiddenService(onion.substring(0, 16));
+			controlConnection.forgetHiddenService(onion);
 			Socks5Proxy proxy = new Socks5Proxy("127.0.0.1", SOCKS_PORT);
 			proxy.resolveAddrLocally(false);
-			Socket s = new SocksSocket(proxy, onion, 80);
+			Socket s = new SocksSocket(proxy, onion + ".onion", 80);
 			s.setSoTimeout(socketTimeout);
 			if (LOG.isLoggable(INFO)) LOG.info("Connected to " + onion);
 			return new TorTransportConnection(this, s);