From 08038f4b7fe2bd58b5333c2de66e81bca869109c Mon Sep 17 00:00:00 2001
From: Jim Norman <jnorman@novell.com>
Date: Sat, 10 Dec 2005 04:47:37 +0000
Subject: [PATCH] Binary key support

---
 c_micasacache/sscs_unx_ipc_client.c |   1 +
 c_micasad/micasad.csproj            |  14 ++++++++++++--
 c_micasadk/sscs_ndk.c               |   8 ++++----
 include/micasa.h                    |  23 +++++++++++++++++++----
 vs_solutions/micasad/micasad.suo    | Bin 18944 -> 13312 bytes
 5 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/c_micasacache/sscs_unx_ipc_client.c b/c_micasacache/sscs_unx_ipc_client.c
index 66752dc2..69b29e68 100644
--- a/c_micasacache/sscs_unx_ipc_client.c
+++ b/c_micasacache/sscs_unx_ipc_client.c
@@ -2092,6 +2092,7 @@ int32_t ipc_ReadBinaryKey
                 retCode = NSSCS_E_SYSTEM_FAILURE;
                 break;
             }
+			*valLen = dataLen;
             
         }
         else
diff --git a/c_micasad/micasad.csproj b/c_micasad/micasad.csproj
index 9c3bd5fe..211e710a 100644
--- a/c_micasad/micasad.csproj
+++ b/c_micasad/micasad.csproj
@@ -305,7 +305,7 @@
                 />
                 <File
                     RelPath = "init\ProjectInstaller.cs"
-                    SubType = "Code"
+                    SubType = "Component"
                     BuildAction = "Compile"
                 />
                 <File
@@ -315,7 +315,7 @@
                 />
                 <File
                     RelPath = "init\WinSecretStoreClientService.cs"
-                    SubType = "Code"
+                    SubType = "Component"
                     BuildAction = "Compile"
                 />
                 <File
@@ -384,6 +384,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "verbs\ReadBinaryKey.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "verbs\ReadKey.cs"
                     SubType = "Code"
@@ -419,6 +424,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "verbs\WriteBinaryKey.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "verbs\WriteKey.cs"
                     SubType = "Code"
diff --git a/c_micasadk/sscs_ndk.c b/c_micasadk/sscs_ndk.c
index ecc143de..1177e2ba 100644
--- a/c_micasadk/sscs_ndk.c
+++ b/c_micasadk/sscs_ndk.c
@@ -1603,7 +1603,7 @@ miCASAWriteBinaryKey
     SS_UTF8_T           *	key,
     uint32_t                keyLen,
     uint8_t             *	val,
-    uint32_t                valLen,	
+    uint32_t            *   valLen,	
 	SSCS_PASSWORD_T		*	epPassword, 
 	SSCS_EXT_T			*	ext
 )
@@ -1673,7 +1673,7 @@ miCASAWriteBinaryKey
 							escapedSHSKey,
 							sscs_Utf8Strlen(escapedSHSKey), 
 							val,
-							valLen,
+							*valLen,
 							epPassword, 
 							ext);
 
@@ -2907,11 +2907,11 @@ miCASASetCredential
 									context,	
 									ssFlags, 
 									&kc, 	
-									sharedSecretID,
+									appSecretID,
 									binaryCred->id,
 									binaryCred->idLen,
 									binaryCred->data,
-					                *binaryCred->dataLen,	
+					                binaryCred->dataLen,
 									NULL, 
 									ext);
 	}
diff --git a/include/micasa.h b/include/micasa.h
index 757d2fed..1ac3c0bb 100644
--- a/include/micasa.h
+++ b/include/micasa.h
@@ -453,10 +453,25 @@ miCASAWriteKey
 	uint32_t				ssFlags, 
 	SSCS_KEYCHAIN_ID_T	*	keyChainID, 	
 	SSCS_SECRET_ID_T	*	sharedSecretID,
-    SS_UTF8_T               *key,
-    uint32_t                 keyLen,
-    uint8_t                 *val,
-    uint32_t                 valLen,	
+    SS_UTF8_T           *	key,
+    uint32_t                keyLen,
+    uint8_t             *	val,
+    uint32_t                valLen,	
+	SSCS_PASSWORD_T		*	epPassword, 
+	SSCS_EXT_T			*	ext
+);
+
+SSCS_EXTERN_LIBCALL(int32_t)
+miCASAWriteBinaryKey
+(
+	void				*	context,	
+	uint32_t				ssFlags, 
+	SSCS_KEYCHAIN_ID_T	*	keyChainID, 	
+	SSCS_SECRET_ID_T	*	sharedSecretID,
+    SS_UTF8_T           *	key,
+    uint32_t                keyLen,
+    uint8_t             *	val,
+    uint32_t            *   valLen,	
 	SSCS_PASSWORD_T		*	epPassword, 
 	SSCS_EXT_T			*	ext
 );
diff --git a/vs_solutions/micasad/micasad.suo b/vs_solutions/micasad/micasad.suo
index ea52cbb4641530c50f1e884a7ae68564eaca9cb6..455cfb30823402afb160d0ff6929f7430eed1bae 100644
GIT binary patch
delta 2082
zcmbuAOH5Ny5QfjWl+u!xwjf*)2raGn01*%g8Z`xpk5H9>Z^eR81q!0JfFO?=B`!@I
zLyT^8ZA>tC<wi-=#DylhaBEz-Giu_-7x>S$m6q6&=xM&5_spC*Gv`Kb$Vm5$Pq8i&
zLga!xpwga<vIp&B^17if>&{%>bmPxwG7S^Lsf`+TORKP=%{%5%=(WMKTtR0G;4+87
z7-TWNll$p|v1#%^+*AwNt#SQ>(e`1~N5D~V3>*h--~{l4cF+M%f=<u{0^k%l4Z1-O
z=mkO02l~MoA$EuXG|qx^;5-O{Fc<_wU>IBgBVZI<1Y=+vOn^x+M?W*JPV#A&gD?&e
zfFbAc9~M5S4(Sq2m>YtjtUkU3u})%OFK85-alB5f3W0j8?L$8dS%WY)i1rX>{9phx
zgP7?->kRLwsiIu6n=7?l=1Qs5nYGc(ZwBKb2(@L>sBI$mc~oh-$Pf}6eCW53)vlUr
z(eeTdIqW&)wLf*$!HMyfu+<5ckjqh^c^#J}ZO^WvFWJo&4h0*C-9CkLuE<{PYfh75
z;W2x{T;3~776u$~gIZYKn<l?&PgaaeH@jjf6RJFJnkY278kSt?a^$EXIIkb>iaECn
zeIZO#?<~{i3d0IDm)I#{GN4`-txe=~wo`Lq3C%i9wASU@$eViL?;d!bw{uzAP)Ctl
z3K}m|ZHxR!uZ!{*>GRRel1LI;c&?WG8!fcovn|;gH>b-IaYV4Ftp#z{0oOI59uXCA
z499*Qute)})GCM-j?&*b64F;!AQ}T0If<PWB0(PAE#61d?y>*0hMxnrhHFmwf48QL
zW>-ecQ;=~B*f`S757BxF6usAs7C#?Gy~mHpHK6B&c@tXv92w|RsY<U(D`gNFpdv1^
zR$w?<Uf!$8{`lzrTcl(^euMO)*dv|vxwzH4220X)IQ8IlE~;oX3@e$OGbM`P1mZH&
z^jJRkJ=WL#c+Zt08fdoswqsHBh#=o%!7y%s<1v7H;MnXye*|v@Zk1-%wXI`4Zw!$%
zU5`7J9wBOz>#;59`7Qg?>LZD=J*j1TlgrNMw~}M=Zzt$n^T+y?sWnt5(ZCPI`tq)-
zs_G3j3En78Ew3htJb2w2vpD7p|ALjPQcF$dW47|%&hA8?u1+oMXc7w%n_Cy&sbM`X
wLhy0ytHfWV0mKQ9^kFuDxCtYRIh%*j@1#hjKVARkaEzJ%oK}<7^HR?L0+;&GlmGw#

delta 3085
zcmeHJ-A|ik6hCkKwrimsg^m>_w1t*WDYSqLHl5&x*#PGl!;c6ev}`a6owR^Mr!a|E
z-oWw7B_{h1W_oMl5}caM#O=<+8%?~`XtK;W6YzJQwm`Q~)EiCod3)OPoacN$=bX1o
z6H6axH~I|P#%jOQwz0XrIBG64`G{!a<Nmm|rbqYRyzYB{`R7}j5kx9UF6yT=yJiQT
z5#qbLzr+B-RpG!AeFConXPfyuZIFL7_m*eK@_QCX1AucG_SJr$X+$=w{qL?>R`N~2
z&44(K@rd2$JP15WlQct9G)@|JJ^ZV?qI4b{BY+rA=O_V=7<l3|#NU?{v%}h&JZTMT
zh80V4G4FwHehh*x2QL=9UED58uuPOs8gL28&US~(Dvk{Sf?Viua;M`nV=G1YcXwzX
zDa)P7rwdm!Ue`l>ujq`;0oDS5<U?}73FnG7mi*1xYp_Yu_Gg_Pykk26Lg5Z#GT}OH
z)TWZ_hpuRvGQ?ju*{tBe>QtsXoYM#`Orr>Glp@MKGv6+MJZUIT7_>#!{H4V&(kz$~
z$j<;EjNLdTxW@lH->Y!&d;Tcj_Z%odZc>`@{iG=Obg;L^Z0u2nnmErpzgDRq{s_mX
zk<580iQ;Lb<J1MkUBI4$nd50+gdU@5Jd*fE?(&wO>V}u%>m|sZ1;hcfN>c>f6F8X#
ztrn0_F3->f@<LwRzW^IsRDRvR%=g`|@edW=J%YRqzBb7le_na4<wJNM#}fuLDqq5|
zI}UtDYLq3hs_1;H>S!qPh*uHi{}g<RA)YfT>NqXn4(edTzzhBX4(fTlWYGhE$tr(Z
zwQTK%j+X#+Qfk(9U|#^5)$S)?4*(Xm147pT^|CXG+zUKf?c%ShTiNT-tx{<=K#w{f
z26mC}Ry*6$moqn{+Gh-xA5N3xzP3vN0&+1kcyQtD4!j&dt5BWZWXO}+_83S_0Px-D
z9n`<<8`PzNKKVwq1fAnM_1D<q@jsPOKL<^zlFfAG5IR(7Z)~~n2oLPO@=lgrZ*IFs
zv^S}nTBsvJy>R?8?wbe>BibpLl3fX4n)<Ly4Ue6iINDwz3egD)8YsY?vI=JlU7@$o
zB2w*ANzc;cS}h~SV7`=$6g--PivrVi-x`NgS*pnGZDS@&s!*MQNOq1Zb4#C0O9!iB
zG)5QULl|Y5YOYD#oy^BY{HF7bTn;xq(I(m4^3RvsLVLynAFa=0XJDc(CBIb#{$1ty
zSi^O>e?(TaZ(eyb$CpAQjal}qc9mDtIHGa$p*~)1sN@E(#kbr1*)ehWW`l<<-XmHx
zsWoqErJFmhS>6<v)&4xiq_R}Dw{lUP+m}o(BqEzrvYei%$hZuHS&1(AP=0H2>-_ui
zxfU>|WTMJUjlg`m0JtnLoSov@TrL=>S>s=9GO}##CiUKfHd!tj*3TPNtGjb)z*`|x
z#E1V(t53q?FrI(OaLI1Cy@pGs9sX~4RLDbP{~vDn((QkP5%r(&ztHK~18lEO&-5t<
TSV9jqx3o&<uh~yzf1ddRg^0Q{