summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.cvsignore1
-rw-r--r--kdc.conf3
-rw-r--r--krb5-1.2.7-reject-bad-transited.patch18
-rw-r--r--krb5.spec86
-rw-r--r--sources1
5 files changed, 105 insertions, 4 deletions
diff --git a/.cvsignore b/.cvsignore
index 7f4b8a4..20aca10 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
+2003-004-krb4_patchkit.tar.gz
krb5-1.2.2.tar.gz
diff --git a/kdc.conf b/kdc.conf
index 40e204f..e55ee00 100644
--- a/kdc.conf
+++ b/kdc.conf
@@ -2,9 +2,10 @@
acl_file = /var/kerberos/krb5kdc/kadm5.acl
dict_file = /usr/share/dict/words
admin_keytab = /var/kerberos/krb5kdc/kadm5.keytab
+ v4_mode = nopreauth
[realms]
EXAMPLE.COM = {
master_key_type = des-cbc-crc
- supported_enctypes = des-cbc-crc:normal des3-cbc-sha1:normal des-cbc-crc:v4 des-cbc-crc:afs3
+ supported_enctypes = des3-cbc-sha1:normal des3-cbc-sha1:norealm des3-cbc-sha1:onlyrealm des-cbc-crc:v4 des-cbc-crc:afs3 des-cbc-crc:normal des-cbc-crc:norealm des-cbc-crc:onlyrealm des-cbc-md4:v4 des-cbc-md4:afs3 des-cbc-md4:normal des-cbc-md4:norealm des-cbc-md4:onlyrealm des-cbc-md5:v4 des-cbc-md5:afs3 des-cbc-md5:normal des-cbc-md5:norealm des-cbc-md5:onlyrealm des-cbc-sha1:v4 des-cbc-sha1:afs3 des-cbc-sha1:normal des-cbc-sha1:norealm des-cbc-sha1:onlyrealm
}
diff --git a/krb5-1.2.7-reject-bad-transited.patch b/krb5-1.2.7-reject-bad-transited.patch
new file mode 100644
index 0000000..b4c26b0
--- /dev/null
+++ b/krb5-1.2.7-reject-bad-transited.patch
@@ -0,0 +1,18 @@
+--- krb5-1.2.7/src/config-files/kdc.conf.M 2003-02-04 13:04:21.000000000 -0500
++++ krb5-1.2.7/src/config-files/kdc.conf.M 2003-02-04 13:04:11.000000000 -0500
+@@ -138,6 +138,15 @@
+ strings specifies the default key/salt combinations of principals for this
+ realm.
+
++.IP reject_bad_transit
++This
++.B boolean string
++specifies whether or not the KDC should reject cross-realm TGS requests if the
++request's list of transited realms names realms which would not be included
++in the transit path if the path were to be computed using the KDC's krb5.conf
++file, or if the client requests that the KDC not perform such a check. The
++default is for this option to be enabled.
++
+ .SH FILES
+ /usr/local/lib/krb5kdc/kdc.conf
+
diff --git a/krb5.spec b/krb5.spec
index 280bb5c..da5bb8e 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -3,7 +3,7 @@
Summary: The Kerberos network authentication system.
Name: krb5
Version: 1.2.2
-Release: 15
+Release: 24
Source0: krb5-%{version}.tar.gz
Source1: kpropd.init
Source2: krb524d.init
@@ -23,6 +23,8 @@ Source15: kshell.xinetd
Source16: krb5-telnet.xinetd
Source17: gssftp.xinetd
Source19: statglue.c
+Source20: http://web.mit.edu/kerberos/www/advisories/2003-004-krb4_patchkit.tar.gz
+Source21: http://web.mit.edu/kerberos/www/advisories/2003-004-krb4_patchkit.sig
Patch0: krb5-1.1-db.patch
Patch1: krb5-1.1.1-tiocgltc.patch
Patch2: krb5-1.1.1-libpty.patch
@@ -50,6 +52,20 @@ Patch23: krb5-1.2.2-size.patch
Patch24: http://web.mit.edu/kerberos/www/advisories/telnetd_122_patch.txt
Patch25: http://web.mit.edu/kerberos/www/advisories/2002-001-xdr_array_patch.txt
Patch26: http://web.mit.edu/kerberos/www/advisories/MITKRB5-SA-2002-002-kadm4.txt
+Patch27: gssftp-patch
+Patch28: krb5-1.2.6-dnsparse.patch
+Patch29: krb5-1.2.7-errno.patch
+Patch30: krb5-SA-2003-001-1.patch
+Patch31: krb5-SA-2003-001-2-1.2.2.patch
+Patch32: krb5-SA-2003-001-4.patch
+Patch34: krb5-1.2.2-gssapi-glib.patch
+Patch35: krb5-1.2.2-kadmin-at.patch
+Patch36: krb5-1.2.7-reject-bad-transited.patch
+Patch37: krb5-crawford.patch
+Patch38: krb5-1.2.4-princ_size.patch
+Patch39: krb5-1.2.7-underrun.patch
+Patch40: http://web.mit.edu/kerberos/www/advisories/MITKRB5-SA-2003-003-xdr.txt
+Patch41: krb5-1.2.2-krb524-double-free.patch
License: MIT, freely distributable.
URL: http://web.mit.edu/kerberos/www/
Group: System Environment/Libraries
@@ -111,6 +127,48 @@ network uses Kerberos, this package should be installed on every
workstation.
%changelog
+* Fri Mar 21 2003 Nalin Dahyabhai <nalin@redhat.com> 1.2.2-24
+- fix double-free of enc_part2 in krb524d
+- update to latest patch kit for MITKRB5-SA-2003-004
+
+* Thu Mar 20 2003 Nalin Dahyabhai <nalin@redhat.com> 1.2.2-23
+- make the default kdc.conf list the same enctypes we use for 1.2.7
+
+* Wed Mar 19 2003 Nalin Dahyabhai <nalin@redhat.com> 1.2.2-22
+- add patch included in MITKRB5-SA-2003-003 (CAN-2003-0028)
+
+* Mon Mar 17 2003 Nalin Dahyabhai <nalin@redhat.com> 1.2.2-21
+- add patches from patchkit from MITKRB5-SA-2003-004 (CAN-2003-0138 and
+ CAN-2003-0139)
+
+* Thu Mar 6 2003 Nalin Dahyabhai <nalin@redhat.com> 1.2.2-20
+- fix buffer underrun in unparsing certain principals (CAN-2003-0082)
+
+* Wed Feb 26 2003 Nalin Dahyabhai <nalin@redhat.com> 1.2.2-19
+- add patch to fix server-side crashes when principals have no
+ components (CAN-2003-0072)
+
+* Mon Feb 24 2003 Nalin Dahyabhai <nalin@redhat.com> 1.2.2-18
+- add patch from Matt Crawford for encoding transited realms properly
+
+* Wed Feb 5 2003 Nalin Dahyabhai <nalin@redhat.com> 1.2.2-17
+- sync compiler flags for configure and make with other versions
+
+* Tue Feb 4 2003 Nalin Dahyabhai <nalin@redhat.com>
+- add patch to document the reject-bad-transited option in kdc.conf
+- add backported symbol namespacing fix from 1.2.3 to clear up clashes with glib
+- add backported fix for hangs in kadmin client when principal contains an
+ escaped @ symbol
+
+* Thu Jan 30 2003 Nalin Dahyabhai <nalin@redhat.com>
+- add candidate backports for CAN-2002-0036, CAN-2002-058, CAN-2002-059
+ (CAN-2002-060 was fixed in 1.1.1-7 or so)
+
+* Thu Jan 23 2003 Nalin Dahyabhai <nalin@redhat.com> 1.2.2-16
+- add patch from Mark Cox for exploitable bugs in ftp client
+- add patch to avoid buffer read overruns when configuring via DNS
+- add patch to properly include <errno.h>
+
* Wed Oct 23 2002 Nalin Dahyabhai <nalin@redhat.com> 1.2.2-15
- add patch from Tom Yu for exploitable bugs in kadmind4
- remove raw keys from the default kdc.conf
@@ -426,7 +484,7 @@ workstation.
- added --force to makeinfo commands to skip errors during build
%prep
-%setup -q
+%setup -q -a 20
%patch0 -p0 -b .db
%patch1 -p0 -b .tciogltc
%patch2 -p0 -b .libpty
@@ -462,6 +520,24 @@ popd
pushd src/kadmin/v4server
%patch26 -p0 -b .kadmind
popd
+%patch27 -p1 -b .gssftp-patch
+%patch28 -p1 -b .dnsparse
+%patch29 -p1 -b .errno
+%patch30 -p1 -b .krb5-SA-2003-001-1
+%patch31 -p1 -b .krb5-SA-2003-001-2
+%patch32 -p1 -b .krb5-SA-2003-001-4
+%patch34 -p1 -b .gssapi-glib
+%patch35 -p1 -b .kadmin-at
+%patch36 -p1 -b .reject-bad-transited
+%patch37 -p1 -b .crawford
+%patch38 -p1 -b .princ_size
+%patch39 -p1 -b .underrun
+patch -sp0 -b -z .2003-004-krb4 < 2003-004-krb4_patchkit/patch.1.2.0
+pushd src/lib/rpc
+%patch40 -p0 -b .2003-003
+popd
+%patch41 -p1 -b .double-free
+
cp $RPM_SOURCE_DIR/statglue.c src/util/profile/statglue.c
find . -type f -name "*.fixinfo" -exec rm -fv "{}" ";"
gzip doc/*.ps
@@ -489,7 +565,11 @@ DEFINES="-D_FILE_OFFSET_BITS=64" ; export DEFINES
--with-netlib=-lresolv \
--with-tcl=%{_prefix} \
%{_target_platform}
-make LDCOMBINE='%{__cc} -shared -Wl,-soname=lib$(LIB)$(SHLIBSEXT) $(CFLAGS)'
+# Now build it. Override the CC_LINK variable to exclude the rpath, and
+# override LDCOMBINE to use gcc instead of ld to build shared libraries.
+make \
+ CC_LINK='$(CC) $(PROG_LIBPATH)' \
+ LDCOMBINE='%{__cc} -shared -Wl,-soname=lib$(LIB)$(SHLIBSEXT) $(CFLAGS)'
# Run the test suite. Won't run in the build system because /dev/pts is
# not available for telnet tests and so on.
diff --git a/sources b/sources
index ca58b4a..3014d95 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+88d770f2de2c1bd842b511f47002a807 2003-004-krb4_patchkit.tar.gz
57d1bf3a3c68ee8af64e31a46799551c krb5-1.2.2.tar.gz