diff options
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 3 | ||||
| -rw-r--r-- | src/lib/gssapi/generic/ChangeLog | 9 | ||||
| -rw-r--r-- | src/lib/gssapi/generic/gssapi_generic.h | 6 | ||||
| -rw-r--r-- | src/lib/krb5/krb/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/krb5/krb/gc_via_tkt.c | 56 | ||||
| -rw-r--r-- | src/mac/libraries/libraries.sit.hqx | 1655 |
7 files changed, 861 insertions, 878 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 92e4e822c..581863268 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +Thu Sep 28 16:00:00 1995 John Rivlin <jrivlin@fusion.com> + + * Makefile.in: Added mac/gss-sample to tar file. + Wed Sep 27 16:00:00 1995 John Rivlin <jrivlin@fusion.com> * Makefile.in: Temporarily move autoconf.h file to include diff --git a/src/Makefile.in b/src/Makefile.in index 7839388dd..6e529d874 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -199,7 +199,8 @@ FILES= ./* \ WINFILES= windows/* windows/cns/* windows/wintel/* windows/gss/* -MACFILES= mac/* mac/kconfig/* mac/libraries/* mac/telnet-k5-auth/* +MACFILES= mac/* mac/kconfig/* mac/libraries/* mac/telnet-k5-auth/* \ + mac/gss-sample/* WINBINARYFILES=windows/cns/*.ico windows/wintel/*.ico windows/gss/*.ico diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog index d123ad025..2bf0aad4a 100644 --- a/src/lib/gssapi/generic/ChangeLog +++ b/src/lib/gssapi/generic/ChangeLog @@ -1,3 +1,12 @@ +Mon Sep 28 12:00:00 1995 John Rivlin <jrivlin@fusion.com> + + * gssapi_generic.h: Modified to use build in compiler symbols rather + than relying on _MACINTOSH so the projects can include the file + without using our headers. + + * Makefile.in: Removed "foo:: foo-$(WHAT)" lines from the + Makefile. + Mon Sep 25 16:53:00 1995 Theodore Y. Ts'o <tytso@dcl> * Makefile.in: Removed "foo:: foo-$(WHAT)" lines from the diff --git a/src/lib/gssapi/generic/gssapi_generic.h b/src/lib/gssapi/generic/gssapi_generic.h index 462414de6..fe2282796 100644 --- a/src/lib/gssapi/generic/gssapi_generic.h +++ b/src/lib/gssapi/generic/gssapi_generic.h @@ -23,10 +23,10 @@ #ifndef _GSSAPI_GENERIC_H_ #define _GSSAPI_GENERIC_H_ -#ifndef _MACINTOSH -#include <gssapi/gssapi.h> -#else +#if defined(__MWERKS__) || defined(applec) || defined(THINK_C) #include <gssapi.h> +#else +#include <gssapi/gssapi.h> #endif extern const gss_OID_desc FAR * const gss_nt_user_name; diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index abd822e5c..b1a51a6e4 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,9 @@ +Thu Sep 28 12:00:00 1995 John Rivlin <jrivlin@fusion.com) + + * gc_via_tkt.c: Cleaned up corrupt ticket error testing to + make it more debugable and I think work around a compiler + bug. + Mon Sep 25 16:57:59 1995 Theodore Y. Ts'o <tytso@dcl> * Makefile.in: Removed "foo:: foo-$(WHAT)" lines from the diff --git a/src/lib/krb5/krb/gc_via_tkt.c b/src/lib/krb5/krb/gc_via_tkt.c index b310a10f9..b2ca37fc5 100644 --- a/src/lib/krb5/krb/gc_via_tkt.c +++ b/src/lib/krb5/krb/gc_via_tkt.c @@ -179,29 +179,43 @@ krb5_get_cred_via_tkt (context, tkt, kdcoptions, address, in_cred, out_cred) retval = KRB5KRB_AP_ERR_MSG_TYPE; goto error_3; } - + /* make sure the response hasn't been tampered with..... */ - if (!krb5_principal_compare(context, dec_rep->client, tkt->client) || - !krb5_principal_compare(context, dec_rep->enc_part2->server, - in_cred->server) || - !krb5_principal_compare(context, dec_rep->ticket->server, - in_cred->server) || - (dec_rep->enc_part2->nonce != tgsrep.expected_nonce) || - ((in_cred->times.starttime != 0) && - (in_cred->times.starttime != dec_rep->enc_part2->times.starttime)) || - ((in_cred->times.endtime != 0) && - (dec_rep->enc_part2->times.endtime > in_cred->times.endtime)) || - ((kdcoptions & KDC_OPT_RENEWABLE) && - (in_cred->times.renew_till != 0) && - (dec_rep->enc_part2->times.renew_till > in_cred->times.renew_till)) || - ((kdcoptions & KDC_OPT_RENEWABLE_OK) && - (dec_rep->enc_part2->flags & KDC_OPT_RENEWABLE) && - (in_cred->times.endtime != 0) && - (dec_rep->enc_part2->times.renew_till > in_cred->times.endtime)) - ) { + retval = 0; + + if (!krb5_principal_compare(context, dec_rep->client, tkt->client)) retval = KRB5_KDCREP_MODIFIED; - goto error_3; - } + + if (!krb5_principal_compare(context, dec_rep->enc_part2->server, in_cred->server)) + retval = KRB5_KDCREP_MODIFIED; + + if (!krb5_principal_compare(context, dec_rep->ticket->server, in_cred->server)) + retval = KRB5_KDCREP_MODIFIED; + + if (dec_rep->enc_part2->nonce != tgsrep.expected_nonce) + retval = KRB5_KDCREP_MODIFIED; + + if ((in_cred->times.starttime != 0) && + (in_cred->times.starttime != dec_rep->enc_part2->times.starttime)) + retval = KRB5_KDCREP_MODIFIED; + + if ((in_cred->times.endtime != 0) && + (dec_rep->enc_part2->times.endtime > in_cred->times.endtime)) + retval = KRB5_KDCREP_MODIFIED; + + if ((kdcoptions & KDC_OPT_RENEWABLE) && + (in_cred->times.renew_till != 0) && + (dec_rep->enc_part2->times.renew_till > in_cred->times.renew_till)) + retval = KRB5_KDCREP_MODIFIED; + + if ((kdcoptions & KDC_OPT_RENEWABLE_OK) && + (dec_rep->enc_part2->flags & KDC_OPT_RENEWABLE) && + (in_cred->times.endtime != 0) && + (dec_rep->enc_part2->times.renew_till > in_cred->times.endtime)) + retval = KRB5_KDCREP_MODIFIED; + + if (retval != 0) + goto error_3; if (!in_cred->times.starttime && !in_clock_skew(dec_rep->enc_part2->times.starttime, diff --git a/src/mac/libraries/libraries.sit.hqx b/src/mac/libraries/libraries.sit.hqx index e9f535b87..83b8dec77 100644 --- a/src/mac/libraries/libraries.sit.hqx +++ b/src/mac/libraries/libraries.sit.hqx @@ -1,854 +1,803 @@ (This file must be converted with BinHex 4.0) -:$@aTBR*KFQPPFbjcDA3!8dP84&0*9#%!!!!!RJ)!!!&'+[96593K!!3!!*i#FNa -KG3)"!!!!&J!!$3d04e06)%a*BR*KFRNZY@*bBA*j,V9bBf9c!!!!!!!!!14k!!! -!!!!!!!!!!!!!!!!!!!!!!!!dp!!!!!$rrrrr68e38Ne03d-"!+`mF81XMk3!!!! -,#J!"EkS!!!+p!!!aX@bqbid!!!!!!!!B9L0%$L*brj5S$*@CdS'QE[d`1"mqlj@ -4#1YSlp8PIFMhTdjb8QGRZ,Zc-a"`N!$M$9Vr$YlYi*&PQ`,Nd1iKmT4E"!a!ZCf -S'*8C6rHpqU'*9i0LFX"GPFi60)j1c+cP1MJ[4D,Gdp%I+CUHba8-F6-X6'eK!ba -X[i80&"KcKDe#-6#0KLR@9Y$Rb@PT2dG&"fM$"PQ969P5j-hmh`r"lpq0'`a6dXh -rKl5NAm2eY+a+jRqeMfmR%[h65mC,$BHYF4FVD5*D[rrr&G`r2dBiPl#*MYd1Tr2 -FShaI+[Sl9GCLC@*AD%Sk09@+DAmF-CjUUGca4HI`51m13I5%,ea-Lf1Cf()12!S -&jAYipppSY6&8E-XcNeCc[CIVQY('T6MAM8"Vjk,&IEpc51@eHCrLmbGA(TCF5KC -ej-+qa#+b$S$SdX9e"TZA@KlfEb$-U-HLaeb2QBEj0LjGZP4@BdSfcTIfkEd,PhV -'#$l!bZAHT6&p+'0U5c9MkIKMM$RaKHp4iYqK&(0MkF4MP"PkE2kmTH11N@4CQN1 -KSISDPdii3TN4Nf)T[[5%)j`5AGId$DE8Um#NR"GPPZUF(p1rL3p"+&&%lZ"8pbk -Y2%*`KNca+Xf3!!H2qDLfFd!IFdeC@CV4YB5XF'Yd++(%A&T4%#b-TjFHP`GR'SD -8NCFQZFTe16CL5U*4EcLEUT&ebq)H**k)R-iSR2NjcraE,F[+%m`%D)rHdEY`qbN -meYq2-Z[[Kp6qKk8CLA655#QprhC!4-jEQY"$cUR1VaGP"I3LrUcN64V9N3rCMRm -pc-IQP8dq!a56Becq9iYKj&I,NIb[PT2rKX#[&PCJl'`,8eRBG0X8aFSYM,H`CIE -m8H`q#e-+M0pSB@U"+He,A'0K4J[E)c$eC!Y6@&MBf!3d@&DEV$bD"@B)kpT'(M- -CmVE+Q[Sq!!!1Uh6V1q*qAMEVf$iEH,fAjfCAa[BEZa`dmD0E[rcX9VlQS&DqAMl -$IefAAGVRjEY2Dq#Sppc[GDEZdl+hpp22EHECZpr1@aaiIEkjD'C[jcA`"!)BG!& -8q1+qQPh1kKGqd2E"*r#8`&eN(`#"H(B!DeM!0M&r2"leH$`+rYr6Sm32`ImRi,G -fr,m$r[ZLCcI2!IKYRpDMjikI&Hj3I@SiU1%2mKrPlG5Z"[haVN3i'Jb-2ccS#`6 -9HcEHdr#9(r