From c4a5813c6847201ae55ab8d3d49b6b4bb9691561 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 26 Oct 2008 02:24:01 -0400
Subject: [PATCH] testing: added a passphrase (abc123) for the testuser private
 key; supplied a phony SSH_ASKPASS to provide the password when needed.

---
 tests/basic                            |  16 ++++++++--------
 tests/home/testuser/.gnupg/random_seed | Bin 600 -> 600 bytes
 tests/home/testuser/.gnupg/secring.gpg | Bin 737 -> 775 bytes
 tests/home/testuser/.ssh/askpass       |   6 ++++++
 4 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100755 tests/home/testuser/.ssh/askpass

diff --git a/tests/basic b/tests/basic
index 751dec4..10b3c31 100755
--- a/tests/basic
+++ b/tests/basic
@@ -135,21 +135,21 @@ export SSHD_PID=$!
 
 # generate an auth subkey for the test user
 echo "### generating key for testuser..."
-MONKEYSPHERE_GNUPGHOME="$TEMPDIR"/testuser/.gnupg \
-SSH_ASKPASS=echo \
-    monkeysphere gen-subkey --expire 0
+export GNUPGHOME="$TEMPDIR"/testuser/.gnupg
+export SSH_ASKPASS="$TEMPDIR"/testuser/.ssh/askpass
+export MONKEYSPHERE_HOME="$TEMPDIR"/testuser/.monkeysphere
+
+monkeysphere gen-subkey --expire 0
 
 # add server key to testuser keychain
 echo "### export server key to testuser..."
-gpgadmin --armor --export "$HOSTKEYID" | \
-    GNUPGHOME="$TEMPDIR"/testuser/.gnupg gpg --import
+gpgadmin --armor --export "$HOSTKEYID" | gpg --import
 
 # connect to test sshd, using monkeysphere-ssh-proxycommand to verify
 # the identity before connection.  This should work in both directions!
 echo "### testuser connecting to sshd socket..."
-GNUPGHOME="$TEMPDIR"/testuser/.gnupg \
-MONKEYSPHERE_HOME="$TEMPDIR"/testuser/.monkeysphere \
- ssh-agent bash -c \
+
+ssh-agent bash -c \
    'monkeysphere subkey-to-ssh-agent && ssh -F "$TEMPDIR"/testuser/.ssh/config testhost'
 
 trap - EXIT
diff --git a/tests/home/testuser/.gnupg/random_seed b/tests/home/testuser/.gnupg/random_seed
index 40ab6a6ca0470c7abbf1ec3412cbd4ff71b5ee2d..230b3152998f8198b59c81fb2a1a01b8edba7adf 100644
GIT binary patch
literal 600
zcmV-e0;m1Uc~VJ&RaQkjs}ADC%u!lZL8*zzV&!nUuyobnI352LGcy4o7y+V+Mi9k4
z{g{;e&~JhVxlj(O^j+{gQyDy_^tCLtfZ5H)ms2MG-)+H*qc8o+=WPb4A^SU$+MjCn
z;QeQ$aZ<LY@(S*(U&hb_8rXZ)L};oB8`oc2>K5hF$US5VYT3ex!jNgGl`{z3Mv2Yf
z<(0rosPM|)IFL(mt>ey!bcXsnTJj}D08oYa?kJTC%p`hwu!!2grwdj%?OP@eLCycN
zCJ(KxL7@~e=uSrBPes9|Iw+ToNVDerJW*CjQ8YpPNJ=VlznX7T9J`Hc3FsQ;=9`Zd
zh=pvvguuke6_7`32dpd$WPrikg|LE?jQ<p>?xDn~_*2SYw?{p>3(0x2NUaOC{W2I=
zQESt^hYL;Ut3i|u$KVo$sIGg^E-ITV!#IK7Psn&oU|Zmte$xb$Sl4YEBcLxPp+!j9
z($>nX>Opv5v7?>i=z@jox#Yo`b>^*18crT?py5yZenB=W<DB$Dupu`0vvuVPL>yKA
zD^9M1UIrl=2Ypjxn2zI}idC(<x4NuSy(5A|QT0A6YKEOMaH>uITMCz<xP*lJCOn;4
zpgodTJ~nA)!8c}BxSwar!iq?m%PsFT|Dk5asn(+HQM+vv)O!edBh=wsV!X8v1OI=*
zDYy~%{03izd@ZH_7aKmYOx0Z;!@z427ck&w6Bmd5l=DG@N|z)U8O3;!Rqjppf-oJU
m-hO=t*g<qV?MK(K#7rci_*74OKpT;FWU5VuwKro${BdNX{Voy!

literal 600
zcmV-e0;l~FHtk7{-Sr2SmXts;^0=#v-x5qJ?OH=t4y%Ig1<XGc+wgjD6zgS-zUA>)
z!Bbcenk47}z;=AX5&Wu&&uc8>YXx{i;M$$=TGQl7sf0y!aN(<h3n-9LJPC!clwn`@
zyM;vnR_64pfV8(ir~j~{=RMLXC7oTs?8xVCvik3!HJcGa^*o4lYL!L*A5Z959$}49
z0R!9w7hchjZ@!R&h46fKD$ovbhwK_H|0bkzZ7DxbpmZq}!BtVHN>=poRfiK@K0@;$
zg={4Tt_(U^U527Vj8~LjOel(^cOt}WUeBPP6<;xqg<|4FzLWNaPV)8Xf77@IZ%fxD
z=fybc4U9pNs^P-kOjf2hwfBiQ-ZU@_585;gmU^XZnF%G74BFf?y+Fk3y=g+46-I5u
z0m@t+;HDV?K#}m3uK{%K@b0{ysxxJoOuyX%p46nUI$V>v`7TCY&w!k}PL0@o<(05H
z1f9;lPfB&D&2<aqgQ}BB>q(cSUH#0M6?FQyjq|X%bj>|Zz>1hW_pCO&M>;8fC4r#h
zL;!SH`-){N3$7C)5-rYo`qUGhMSUTC=Z|Cn$54{=cE$gaFOCIe>J?Q`O2AA&5_9Y{
zJ$+UMnvaR)c0p@pKw@w^te2-V4g%h)Oz`9*8dGjEadGZh)sR7h=At=Ha{Dg%MI<f?
zO!fqY0z!0KdJ%M?BL;k}wPCAC4ulZpn~d&8?U*?>H-pSw+~6Debit`ytfX6R{a9yH
m6AI#FGC|6!sw_ZtpO69`1Ov_fpPS1Y{}S~^QP^i3ufhT-yd?<$

diff --git a/tests/home/testuser/.gnupg/secring.gpg b/tests/home/testuser/.gnupg/secring.gpg
index a5519a6c68e0310fe7f5979c26c50b0641b2d705..26cf230a4a309407a6e70ac7f615a9f8a98f917f 100644
GIT binary patch
delta 399
zcmV;A0dW4|1&0O$l>z>d1C4+F0|NrVEYr+%iuOccRJ$j*sGGm@X*FH`v&jIy%i)b-
zfpypqe-7!K<HBt?QqnK7Fvg&k%;F>}^8|}S(dCgnmi*;y0M7m(5(jT(`{ZA<--4ZB
zV1y=qItp}JK+mO2K;-egEwXdkxdv(;5PwiHx=c9f_Q*#-%+J?C4u^mHpw#_~B%m>I
zF5m28W1K9rk54Crg1X;;<sFTfZN#;Whw0mUD3xxV3w{^SnF>e8@MWqVBCsL$u4%-*
z!5Lv>XY+gIJ_C)HHxLScnqdjR8;b`P?d_!L{m?{1bxq~b!kg<xl-9A4#O8=iGP%|l
zecn=)V=@C7j~uf?ObUM&nwLxs#xHYc(jEGtm#62651@W%GdXbKCE4s+Xrd*6#*FWh
zuOMKVj^zwOB8;hQsusBh%caI`S<_3*7<dqItvOOX@Dsw~3Hl_tXua-lp-R!(s>cd&
t$6K+OntHKgtu^=TnKo6*6_l(&SjKP*u}ri`O>b^%WqEUOXl0Y<0s49m$jkr$

delta 350
zcmV-k0iphf2H^z*l>yk11C4(G1O7iLwNpIhw!Q7IPFV)oDb+@cecBB09FgE61;ZUn
z<^~v0PO-j_wiG?sZPEBeCH|yMi8V%p*$Z-YN-jpEi_yuaQ|ITbH&HW$VZzgFNeUiz
zK<cO`;a4uxPhAKM@IQnsA#*rZ``i}~a(hEJ_;H%5?D}}T*|(!ffJJ}W&{(Mg0K@S|
zu$t}%#pUl*rB3+ix?vu!U9|oq_vu4Y#$3hHqssFms(;g*8UJ%#-$UMUxNG4epKTe9
z_wGO@-4K*&ivj@hZ7Yh%<x3c(tuDF$V9|`HM%=RH)pH8A77SDwonG^=^I~uwYYw;C
z=}(v!cTzbgPUEG@U{FnF_e(=N5HAz;0sxYm;0Uo#lyWkciV^T~7>Iz%xC-DZ2~ZHS
w2rcw#Q0y~o)@N*Ww+k5CqzWVj(0&vkQDfpJZ{5{+PKAJ&ING3ZvjGAI0i748i~s-t

diff --git a/tests/home/testuser/.ssh/askpass b/tests/home/testuser/.ssh/askpass
new file mode 100755
index 0000000..5b7b059
--- /dev/null
+++ b/tests/home/testuser/.ssh/askpass
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# phony/automatic askpass, to provide the passphrase for the
+# testuser's GPG key.
+
+echo abc123
-- 
2.25.1