pass extra parameter to get_des_key
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8472 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
		@@ -151,7 +151,7 @@ do_524(Ticket *t, krb5_data *reply, const char *from, struct sockaddr *addr)
 | 
			
		||||
	kdc_log(0, "Failed to encode v4 ticket (%s)", spn);
 | 
			
		||||
	goto out;
 | 
			
		||||
    }
 | 
			
		||||
    ret = get_des_key(server, &skey);
 | 
			
		||||
    ret = get_des_key(server, FALSE, &skey);
 | 
			
		||||
    if(ret){
 | 
			
		||||
	kdc_log(0, "No DES key for server (%s)", spn);
 | 
			
		||||
	goto out;
 | 
			
		||||
 
 | 
			
		||||
@@ -277,9 +277,6 @@ create_reply_ticket (struct rx_header *hdr,
 | 
			
		||||
    krb5_generate_random_block(&fyrtiosjuelva, sizeof(fyrtiosjuelva));
 | 
			
		||||
    fyrtiosjuelva &= 0xffffffff;
 | 
			
		||||
    krb5_store_int32 (sp, fyrtiosjuelva);
 | 
			
		||||
#if 0
 | 
			
		||||
    krb5_store_int32 (sp, 4711); /* XXX */
 | 
			
		||||
#endif
 | 
			
		||||
    krb5_store_int32 (sp, challenge);
 | 
			
		||||
    sp->store  (sp, session, 8);
 | 
			
		||||
    memset (&session, 0, sizeof(session));
 | 
			
		||||
@@ -436,7 +433,7 @@ do_authenticate (struct rx_header *hdr,
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* find a DES key */
 | 
			
		||||
    ret = get_des_key(client_entry, &ckey);
 | 
			
		||||
    ret = get_des_key(client_entry, TRUE, &ckey);
 | 
			
		||||
    if(ret){
 | 
			
		||||
	kdc_log(0, "%s", krb5_get_err_text(context, ret));
 | 
			
		||||
	make_error_reply (hdr, KANOKEYS, reply);
 | 
			
		||||
@@ -444,7 +441,7 @@ do_authenticate (struct rx_header *hdr,
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* find a DES key */
 | 
			
		||||
    ret = get_des_key(server_entry, &skey);
 | 
			
		||||
    ret = get_des_key(server_entry, TRUE, &skey);
 | 
			
		||||
    if(ret){
 | 
			
		||||
	kdc_log(0, "%s", krb5_get_err_text(context, ret));
 | 
			
		||||
	make_error_reply (hdr, KANOKEYS, reply);
 | 
			
		||||
@@ -625,7 +622,7 @@ do_getticket (struct rx_header *hdr,
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* find a DES key */
 | 
			
		||||
    ret = get_des_key(krbtgt_entry, &kkey);
 | 
			
		||||
    ret = get_des_key(krbtgt_entry, TRUE, &kkey);
 | 
			
		||||
    if(ret){
 | 
			
		||||
	kdc_log(0, "%s", krb5_get_err_text(context, ret));
 | 
			
		||||
	make_error_reply (hdr, KANOKEYS, reply);
 | 
			
		||||
@@ -633,7 +630,7 @@ do_getticket (struct rx_header *hdr,
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* find a DES key */
 | 
			
		||||
    ret = get_des_key(server_entry, &skey);
 | 
			
		||||
    ret = get_des_key(server_entry, TRUE, &skey);
 | 
			
		||||
    if(ret){
 | 
			
		||||
	kdc_log(0, "%s", krb5_get_err_text(context, ret));
 | 
			
		||||
	make_error_reply (hdr, KANOKEYS, reply);
 | 
			
		||||
 
 | 
			
		||||
@@ -258,7 +258,7 @@ do_version4(unsigned char *buf,
 | 
			
		||||
	    goto out1;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	ret = get_des_key(client, &ckey);
 | 
			
		||||
	ret = get_des_key(client, FALSE, &ckey);
 | 
			
		||||
	if(ret){
 | 
			
		||||
	    kdc_log(0, "%s", krb5_get_err_text(context, ret));
 | 
			
		||||
	    /* XXX */
 | 
			
		||||
@@ -281,7 +281,7 @@ do_version4(unsigned char *buf,
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
	
 | 
			
		||||
	ret = get_des_key(server, &skey);
 | 
			
		||||
	ret = get_des_key(server, FALSE, &skey);
 | 
			
		||||
	if(ret){
 | 
			
		||||
	    kdc_log(0, "%s", krb5_get_err_text(context, ret));
 | 
			
		||||
	    /* XXX */
 | 
			
		||||
@@ -365,7 +365,7 @@ do_version4(unsigned char *buf,
 | 
			
		||||
	    goto out2;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	ret = get_des_key(tgt, &tkey);
 | 
			
		||||
	ret = get_des_key(tgt, FALSE, &tkey);
 | 
			
		||||
	if(ret){
 | 
			
		||||
	    kdc_log(0, "%s", krb5_get_err_text(context, ret));
 | 
			
		||||
	    /* XXX */
 | 
			
		||||
@@ -452,7 +452,7 @@ do_version4(unsigned char *buf,
 | 
			
		||||
	    goto out2;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	ret = get_des_key(server, &skey);
 | 
			
		||||
	ret = get_des_key(server, FALSE, &skey);
 | 
			
		||||
	if(ret){
 | 
			
		||||
	    kdc_log(0, "%s", krb5_get_err_text(context, ret));
 | 
			
		||||
	    /* XXX */
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user