oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

clean up error handling, make enc-type work again

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13157 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-11-25 23:26:58 +00:00
parent d0ac6c4084
commit b3b050fa31
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/krb5/pkinit.c
View File

@@ -373,7 +373,7 @@ build_auth_pack(krb5_context context,
krb5_timestamp sec; krb5_timestamp sec;
int32_t usec; int32_t usec;
if ((context->pkinit_flags & KRB5_PKINIT_PACKET_CABLE) || 1) if (context->pkinit_flags & KRB5_PKINIT_PACKET_CABLE)
cksum = CKSUMTYPE_RSA_MD5; cksum = CKSUMTYPE_RSA_MD5;
else else
cksum = CKSUMTYPE_SHA1; cksum = CKSUMTYPE_SHA1;
@@ -1051,7 +1051,7 @@ _krb5_pk_verify_sign(krb5_context context,
free_oid(eContentType); free_oid(eContentType);
krb5_data_free(eContent); krb5_data_free(eContent);
} }
return 0; return ret;
} }
static krb5_error_code static krb5_error_code
@@ -1225,7 +1225,10 @@ pk_rd_pa_reply_enckey(krb5_context context,
} }
tmp_key.keytype = ETYPE_DES3_CBC_NONE; tmp_key.keytype = ETYPE_DES3_CBC_NONE;
ret = krb5_crypto_init(context, &tmp_key,ETYPE_DES3_CBC_NONE, &crypto); ret = krb5_crypto_init(context,
&tmp_key,
0,
&crypto);
if (ret) { if (ret) {
free_octet_string(&encryptedContent); free_octet_string(&encryptedContent);
goto out; goto out;
@@ -1278,11 +1281,8 @@ pk_rd_pa_reply_enckey(krb5_context context,
&eContentType, &eContentType,
&eContent, &eContent,
&host); &host);
if (ret) { if (ret)
krb5_set_error_string(context, "failed verify signature of reply: %d",
ret);
goto out; goto out;
}
/* make sure that it is the kdc's certificate */ /* make sure that it is the kdc's certificate */
ret = pk_verify_host(context, host); ret = pk_verify_host(context, host);