diff options
| author |  Karl Ramm <kcr@mit.edu> | 2009-03-22 16:31:10 +0000 |
|---|---|---|
| committer | Karl Ramm <kcr@mit.edu> | 2009-03-22 16:31:10 +0000 |
| commit | a7e56c437de28dd55f926335003b41df0f7f4e33 (patch) | |
| tree | 2817123cb1243e8642ada6e94b9d30ab2f22e8f3 /server/kstuff.c | |
| parent | d59f5ece62871d2a73e2e45004aae74f083415fe (diff) | |
there's no particular reason that the interrealm code on a krb5-only server
shouldn't be able to deal with incoming old-style packets
Diffstat (limited to 'server/kstuff.c')
| -rw-r--r-- | server/kstuff.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/server/kstuff.c b/server/kstuff.c index 0a9f6f7..ba50fdc 100644 --- a/server/kstuff.c +++ b/server/kstuff.c @@ -22,9 +22,11 @@ static const char rcsid_kstuff_c[] = "$Id$"; #if defined(HAVE_KRB4) && defined(HAVE_KRB5) static ZChecksum_t compute_checksum(ZNotice_t *, C_Block); -static ZChecksum_t compute_rlm_checksum(ZNotice_t *, C_Block); static Code_t ZCheckAuthentication4(ZNotice_t *notice, struct sockaddr_in *from); #endif +#ifdef HAVE_KRB5 +static ZChecksum_t compute_rlm_checksum(ZNotice_t *, unsigned char *); +#endif #ifdef HAVE_KRB4 /* @@ -443,7 +445,6 @@ ZCheckRealmAuthentication(ZNotice_t *notice, cksum2_base = notice->z_message; cksum2_len = notice->z_message_len; -#ifdef HAVE_KRB4 /*XXX*/ if ((!notice->z_ascii_checksum || *notice->z_ascii_checksum != 'Z') && key_len == 8 && (enctype == ENCTYPE_DES_CBC_CRC || @@ -464,7 +465,6 @@ ZCheckRealmAuthentication(ZNotice_t *notice, } else return ZAUTH_FAILED; } -#endif /* HOLDING: authctx, authenticator */ @@ -882,16 +882,19 @@ compute_checksum(ZNotice_t *notice, 0, (C_Block *)session_key); return checksum; } +#endif +#ifdef HAVE_KRB5 static ZChecksum_t compute_rlm_checksum(ZNotice_t *notice, - C_Block session_key) + unsigned char *session_key) { ZChecksum_t checksum; char *cstart, *cend, *hstart = notice->z_packet; cstart = notice->z_default_format + strlen(notice->z_default_format) + 1; cend = cstart + strlen(cstart) + 1; - checksum = des_quad_cksum((unsigned char *)hstart, NULL, cstart - hstart, 0, (C_Block *)session_key); + checksum = z_quad_cksum((unsigned char *)hstart, NULL, + cstart - hstart, 0, session_key); return checksum; } |