|
From: | shishi-commit |
Subject: | Fix. |
Date: | Thu, 11 Dec 2003 04:54:35 +0100 |
Commit from jas | 2003-12-11 04:54 CET |
Fix.
Module | File name | Revision | |||
---|---|---|---|---|---|
shishi | src/shishid.c | 1.64 | >>> | 1.65 |
shishi/src/shishid.c 1.64 >>> 1.65 |
---|
Line 352 |
{ int rc; Shishi_tkt *tkt; |
- Shishi_key *newsessionkey, *oldsessionkey, *serverkey, *subkey, *keytouse, *tgkey; |
+ Shishi_key *newsessionkey, *oldsessionkey, *serverkey, *subkey, *tgkey; |
char *servername, *serverrealm, *tgname, *tgrealm, *client, *clientrealm; |
- int32_t keyusage; |
Shisa_principal krbtgt; Shishi_asn1 reqapticket; Shisa_key **tgkeys; |
Line 507 |
(handle, shishi_tkt_encticketpart (shishi_ap_tkt (shishi_tgs_ap (tgs))), &oldsessionkey); |
+ if (rc != SHISHI_OK) + return rc; |
rc = shishi_authenticator_get_subkey (handle, shishi_ap_authenticator (shishi_tgs_ap (tgs)), &subkey); if (rc != SHISHI_OK && rc != SHISHI_ASN1_NO_ELEMENT) return rc; |
- if (rc == SHISHI_OK) - { - keyusage = SHISHI_KEYUSAGE_ENCTGSREPPART_AUTHENTICATOR_KEY; - keytouse = subkey; - } - else - { - keyusage = SHISHI_KEYUSAGE_ENCTGSREPPART_SESSION_KEY; - keytouse = oldsessionkey; - } - |
/* Build TGS-REP. */ |
- rc = shishi_tgs_rep_build (tgs, keyusage, keytouse); |
+ if (rc == SHISHI_OK) + rc = shishi_tgs_rep_build + (tgs, SHISHI_KEYUSAGE_ENCTGSREPPART_AUTHENTICATOR_KEY, subkey); + else + rc = shishi_tgs_rep_build + (tgs, SHISHI_KEYUSAGE_ENCTGSREPPART_SESSION_KEY, oldsessionkey); |
if (rc) return rc; |
[Prev in Thread] | Current Thread | [Next in Thread] |