From eec66395c1f26b9f1d40cb1db553acef63b7a1b2 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Fri, 9 Jul 2010 20:22:01 -0400
Subject: [PATCH] Removed key password

---
 app/models/user.rb            |   3 +--
 gpg/diaspora-test/pubring.gpg | Bin 37206 -> 37204 bytes
 gpg/diaspora-test/random_seed | Bin 600 -> 600 bytes
 gpg/diaspora-test/secring.gpg | Bin 738 -> 659 bytes
 gpg/diaspora-test/trustdb.gpg | Bin 1360 -> 1440 bytes
 spec/user_encryption_spec.rb  |   6 +++++-
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index a7bdcd294..aa1cbb296 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -77,7 +77,7 @@ class User < Person
   def assign_key
     keys = GPGME.list_keys(nil, true)
     if keys.empty?
-      #generate_key
+      generate_key
     end
     self.key_fingerprint = GPGME.list_keys(nil, true).first.subkeys.first.fingerprint
   end
@@ -94,7 +94,6 @@ Name-Real: #{self.real_name}
 Name-Comment: #{self.url}
 Name-Email: #{self.email}
 Expire-Date: 0
-Passphrase: #{self.password}
 </GnupgKeyParms>"
     ctx.genkey(paramstring, nil, nil)
     
diff --git a/gpg/diaspora-test/pubring.gpg b/gpg/diaspora-test/pubring.gpg
index da64a4ec3f9cf91f82d9b3fcf051ac2b773926ca..721861b75a5e99eca960124fa3cff36f86ab78d0 100644
GIT binary patch
delta 570
zcmV-A0>%B-q5{;S0<&NO_Kts;;si`LyN(e80E+z3d9c57btH-}5qxMbfWv&wHOehm
zHuLRWst~<H-zmUqO2`770V&HgmSpC20Reh-P|1AG%t%TMm`I>1mjIxgs&9_ZzLSpS
zv5a4CW>1s>A0Q<G|3KIRo%BK8gaIU#325iB4CThQtdK;3KtW9eZZv;IFs}04`hfpk
zrvuIrky2`fTHg%GGzB3%d!KfE%P0)HX_^823fuAyz%~Ay_ULMH-p@uTj{VSh$rIV(
z!L2;$L!Vx5QzF8eR2O3-OeqUjueMW*g;ueq)8I^6!btK52Qj4gv@$|(Vjxp(X>@2H
zC}?zaa5^t9cXxL#Wq6VP4FqCuVlk5u0Tcr_yN;6}3?P5L@8;gVGzY3}s{o*ktf3QO
zO0KRSXBI4+Y=#i2z}&e2pH(DfBKUep;KV}EuHGTuU&l5Bbg%*d1GtR@OgFoZ5CQ;|
zpeHaU_Be?<i)`2B>@9>?;345Mq0hwhx82fEh~6vRLw`+b3{1CuNE{ID(jMpV4=g%w
z;C$E_W?O#*jIRN|00RX9|3<jFt}-S=<<atbwd}M=vYy|0hJCZ3c=w7oO?Xf*7#CEz
z+F(=fcX5aIo7~P)<6iz<WSHB)M`BJYg*`S`$%sh=7!d*h2?YX7H@l7k8w>yn2@t;T
z=H9+E2dYrj0G$$_lC;aUI$M-o6(1rR)ImYW6ge6Io;<x~(cv$(bCA_ltj8VCslO=U
Isjvb71AL<cP5=M^

delta 562
zcmV-20?qx@q5{^U0)Lp|1WYz~Oc4SAum#d^M(>d8`T{)(z;-@RZBWuV3HuVpZ2DQ{
zk-FO0)O3(}O%DDO#A(=6)1HC(u0+QOHgf#ufEgfCu}k0s0HCH8L~J-I(QiBGj&Tww
zk1R*<^y2~mop!S!cY5dYCIu;Yv0N@tqcA0@1EJ7*`!sbU{bv9RdP^GZNVQw~X_YSb
z6SQUGUYfpaGH(uNW70&%*^Nw~SONSCTRYhH(7ZXjimf?`Lw}X}=I41DP~rEYU+!B`
zNU42)#KzrYK$`8^ix@G$gNR@+IqN3YZ6<<DeU9Be_=nlFG?UzqB^_sFZ*pg4Kw)oe
zE@N+PK8Ruj6A=OcA_W3WHh4^vzzHCKtUfuUARE9_x03*%lr|%}qnLDEL$w>(J7(}b
zcMQ!;0H1EIWK1`=DOQ8PQ{=tXgYL5rz%8%>00X#<1WYz~Ob`M9`|buSP}nWFf=;Lm
z#|U?JZ8G*!02>HOWXVZG%{zfwK)x9#j^GSwJ+JC-d~)`6RhE;!6rB2+xldPrn*<EZ
z(*Oen0sbO^Z8^m1%stwr*`>%SnsO<S+Dd>r!_0^xk{G-sOhw3sqa=93Tqd;NbLDZ9
zAc9v(aU}xj`ZVaG{`x!Tb?b;p1Q-zl00{*GOg4B-0vikf3JDObJ~^Zy8^BXUK>(nb
zgYUyC5{!oG6w40k$cA2=Nl%9w0H10-Q!#3p-5z+}lYEn>gokdNck8eM00Xf0j`(f-
AXaE2J

diff --git a/gpg/diaspora-test/random_seed b/gpg/diaspora-test/random_seed
index 6239b704b74d098aa5ee333cbec250c905e1d2ac..43eed01099182d4478a216fa9e71643377647dd7 100644
GIT binary patch
literal 600
zcmV-e0;l~-hoy&JA7X33*D36Glz+V3xbXO4N%oXIbo9>5k{*2;*uG9X08_+qofZG=
zycWIfP_vcdMW!X_09k<!2#>>a@pIH`UgB5bcmtTOwpuuF<9Ayt#+cdU;I-1q8|x_K
zr|B6VWdyxVGnj@n)>r$2U~J6s*>%PO>?KqYo`!U$#OU@rrI}N?M^4~NQA9lNj{%ZX
zv@V?&(dCZTQ&Z{?Z9--vgSm6EM}ffDty#g*iKX^!A5<{B!M5qPT!v{n38v2>hCdCx
zfU|`H=?x#(6R(Y+k{Z}x++ul8ZM(bIF5DA0V6y54X?nb|XkSjRiXMOAPv8N*t46s{
zG}H&4hodnF1b1d7pztn54ugcTC%LKde+!bUS31z>&+p+VZJiAS6lxD{RN)y#{D3l@
zE)TnCte<1qz3~!x`5J%o(eHoAtJdc_e6o|9|5Sh%R2h!TFL_b049dn8|M=m}E-tO9
z>uYHCRZpX}96AUhg;%Os*ssUoNeH!rkWy#14vZ45?r4dkx4b^Q1a0EO9k8dO@4M2F
zXa=mhe$H^n>nwX`N_tprPY>0M;4^2~4KvCC-?Y%qw--2Z{otW8aXrM1|F=vkL7!)%
zw9@;k>e2g!1BE$()I8?2jni72!}als<k8e^Ss!gzCWn>|b>oUeGckiS*Qs-j>&4A>
z1f&#==qwBkCJehSDU+P3PfQ2Dtx*BxB0|QqyN*1QPjiG0j+sU_od(Co44X=LO;r0C
m0{fRQ?&6twInoX$edqg^80K_#9~BTs<#It7IsoB_8RBTBQZPCI

literal 600
zcmV-e0;l~=O)A8ID6ATxtA<q&#H&c#l8Q2fUYEn0&`<Kdweu7$^7l2I!*`Vuj~(|y
z`bPLYBj}Cc7_;zb1b_VcQ!4ZmzLx}`MiOZ?kL^IBaB+M{jVf=CtM4#xN&Xq_Ww4@f
zj@DuupJbDSXw```^IoJhGq}8i>mSS(_%KU(o)!VP11!2RE;^lAS*yT8Uq!##KPK2+
zs)203)C1-3NXjv<d(VQb&%|Iy$4vgHC0zF|<Yvx|Ueu!7ppbFV9MjF{jUfz|j;_zn
zswAY+6J&OicF3L0uivd+g2<Xn+AROuh?t*typF%Mq3N!;^hH7)x)E<UVV+#px)E5Q
z)FD9yN+__&i|a_@Y1E5-{K}Rq;Zmm`z^V~yd8{@41#e+M7WLD&0mpp+t-EI+)c2<6
zE?E@adNohR;69ay1eg5kXMLlxjkE3p$r67HYf{a5&(7?Xzb+MvdW!_U>0chJmOZwT
zwNgi~xziUD#{nl%Ag#HSiGo-y`(klt%W1YVHnuBGe?x7-pcMF;vzYZENw|a}PDTt7
z!C)@UWbEX9<(_$_@+88<mG6IG`Nt$cln2^J)ck}ye$PA^EBscCfF;KJm<wXX*d7X1
z!u>IYBs`M5(Ufa6+_ZTQN-_-cDkymuB{29^m0Wv7rFKIHByXJ$)`(CVccChJYQC-g
zZWkPAyr5$)MT`0!MlV2us-y+QETe<?a-5($UbzraJ#<Z)ql6z2G~^)9`g5i|r-b%l
mUUh=m*!v|xjGfSBn;L`4lhw8~s2TR6)BQEREdf8HnSYCJhA$le

diff --git a/gpg/diaspora-test/secring.gpg b/gpg/diaspora-test/secring.gpg
index 53286a621e30900909228cc38b0dd12468887a4c..eccac99054ce371cce695651ca7c87822f54f8e0 100644
GIT binary patch
delta 594
zcmV-Y0<Hbx1(OATl=}osH@l7z0sxBq(0Q=Ga&;t%FA;obFMz{*&Na#{ST^(RU8)eh
zL*FUDYD&lgoB=7zG?rxMbpZi-bx_HC&df+k446ouDwhDDoT_h*&%Tq6<*|%kZe~xE
z0UsbG0slbQ0-f|h-h=@pl?iC)u?*$Lwycmufj~h`1a35cMKG@N-1>n3U8e)i5s^}A
zg<9VX$utEaJbRyZe9I^dyJ?yM{0iIh4!|}3oc8Eyao*2HD31Nmc*zsl;lZsu=|i7h
zZc`${np78KBTOj^SFg5Hi-lIPrqkd|TEa;32L~~v_W%H&K~{6Qpg2E32i%RuOMgTG
zFKr$-2k*22GLt3&B?Mw`Vlk6Z0Tcr_yN;7+0U&?A@8;gVGzY3}s{o*ktf3QOO0KRS
zXBI4+Y=#i2z}&e2pH(DfBKUep;KV}EuHGTuU&l5Bbg%*d0Gz1=OgFoZ5CQ;|peHaU
z_Be?<i)`2B>@9>?;345Mq0hwhx82fEh~6vRLw`+b3{1CuNE{ID(jMpV4=g%w;C$E_
zW?O#*jIRN|00RX9|3<jFt}-S=<<atbwd}M=vYy|0hJCZ3c=w7oO?Xf*7#CEz+F(=f
zcX5aIo7~P)<6iz<WSHB)M`BJYg*`S`$p8Sg9uPb-5R418l3zrh_rVcWkE!7qK+fd~
z#E3}*7!d*h2?YX7H@l7k8w>yn2@t;T=H52GGzY3s)c~Jlw|JLOuUPA=c+nS(B&{$i
gc>>k|pJu36;aj9pMZQaCx5CEVeVEcP1h4`C0CDjP?f?J)

delta 687
zcmV;g0#N;v1>yyNl>s3HOg4B-5dr|P1=4Uv?~v>I0zC=9c0N#TP|`UG`x3@%`dQ_X
zy4u*(bdY&X4*nCwY1mZLo`LzUM8^m=a{T9j86Z-zOW*?lpr#f?Y&a>=Z#(FYaS|wx
zEJyJ4;{pJkcC#UOdgt;c1u1y3TrN<fFeRx2q0oB!G<73?{QwJkOB(G+wOjgWl`i)a
zv}NL6n!ao@Zw_Z;(nQADjZC0e0sISFJJ|Nnyg9pytvQK9f0g>?=Xn}X;rF6n?pskv
zseOOM#@%B;n(f+)7%{+uh+r={>n7H1CW1_Tj@>@^huQuE0|LJ^5fO{a&GTSLU1?+8
zHZpay=*?;<HN-?#P-q)LqF-3MpeTIPL}|7W5&IL}=JCZ`8epqY^zx+2gL<?yk^dzf
zXJv14XJtTPZ)`4OZ*4w^VgwTr0stZf0!%h|Op`wWAb+erIiw&Pz*D!A0HBmMBf6uQ
zbX`NW8`(Q%@I7}7%}fBFZmwiZH@7KPgTPbdz14&6vk$;6umS)8oX-SIHh4@B0s#B&
z1}jk5Ex3YCs0_ylcXn+u_EG>F2ufthNkh#$fm%Sm87Ge53~4>D>Ti5<_H|X3lfD$3
z`kJ{<SAUxX49wF20|f#8B7to=#OlmF+NIg0$SIm~DUjMqfI7p>h$500yd+FT$cCdN
zc*0yJwBK{(ag!i|S4nXt0_plR=%W7mJLh%l{sRL7zcdjMi_6XPU@GvX1o?4PQEAJS
zGRzJLXvBCB8WvAFbwU-y9=|0aTzu?GEY<<Esa$ACVp_!g$Y-AbRqc+5Ndy=X0ssjG
z0!%h|OadDW0162ZtUfuUARE9_L_q+Y3#F(LFQ)#%+S)HTeAs<@>%xJm0G~>T!O!a=
VxQlA*pxJXuTk0<(DT}ZI004c}G#vl{

diff --git a/gpg/diaspora-test/trustdb.gpg b/gpg/diaspora-test/trustdb.gpg
index f52c08a1d1246168f675f3b46571116dc1be3da8..400230545039aa9ec79a0aec691c329305ff42f7 100644
GIT binary patch
delta 141
zcmcb>wSZfIF})z2nVFH5k%581$9#{~L__h3>U@k!6Ah&{1{`ByWSA_@s-6UtL<2kw
zOercV)2?i7)vW$xw(tG3d;3h-SFu4<DI*l~GW>Y|U&x6o`i&>+#bp~`sLa>eW^)Xx
I4xx+z0Gq%c1poj5

delta 59
zcmZ3$eSu4WF})z2nVFH5k%581$9(y<iGku1)%hl__1IWDlZBCOvN)@{5F1bq6#xLF
C?F#1r

diff --git a/spec/user_encryption_spec.rb b/spec/user_encryption_spec.rb
index ad841d22b..b07fb39d1 100644
--- a/spec/user_encryption_spec.rb
+++ b/spec/user_encryption_spec.rb
@@ -26,6 +26,11 @@ describe 'user encryption' do
   it 'should retrieve a user key' do
     @u.key.subkeys[0].fpr.should  == @u.key_fingerprint
   end
+
+  describe 'key exchange on friending' do
+    
+  end
+
   describe 'signing and verifying' do
     
     it 'should sign a message on create' do
@@ -41,7 +46,6 @@ describe 'user encryption' do
     
     it 'should know if the signature is from the wrong person' do
       pending
-      my_message = Factory.create(
     end
     
   end