Update for krb5-1.18.5

diff --git a/README b/README
index 61386f943d1b2df882ef2464c7fce4f2f24f7b9f..2a47d4f1918d57a68dfd8f812b1a3ff72fa885b5 100644 (file)
--- a/README
+++ b/README
@@ -70,6 +70,18 @@ DES no longer supported
 Beginning with the krb5-1.18 release, single-DES encryption types are
 no longer supported.
 
+Major changes in 1.18.5 (2022-03-11)
+------------------------------------
+
+This is a bug fix release.
+
+* Fix a denial of service attack against the KDC [CVE-2021-37750].
+
+krb5-1.18.5 changes by ticket ID
+--------------------------------
+
+9008    Fix KDC null deref on TGS inner body null server
+
 Major changes in 1.18.4 (2021-07-22)
 ------------------------------------
 

diff --git a/src/man/k5identity.man b/src/man/k5identity.man
index e4b875efca5a58217eb664931ad20ed565af9336..aa5aead42b9419b9c345c0566713edebc9b30fd2 100644 (file)
--- a/src/man/k5identity.man
+++ b/src/man/k5identity.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "K5IDENTITY" "5" " " "1.18.4" "MIT Kerberos"
+.TH "K5IDENTITY" "5" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 k5identity \- Kerberos V5 client principal selection rules
 .

diff --git a/src/man/k5login.man b/src/man/k5login.man
index 24bb259b52d9a9bcb85507e5bbf4f77a0a676128..a72a35d69f8d1b40943adbd0e2171b23aa57bf16 100644 (file)
--- a/src/man/k5login.man
+++ b/src/man/k5login.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "K5LOGIN" "5" " " "1.18.4" "MIT Kerberos"
+.TH "K5LOGIN" "5" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 k5login \- Kerberos V5 acl file for host access
 .

diff --git a/src/man/k5srvutil.man b/src/man/k5srvutil.man
index 8809dd0ca57a1728ad787f82f5ecfae5d95e73f7..13ed8899f3b12c9007e6d8049e3a0089e74af38e 100644 (file)
--- a/src/man/k5srvutil.man
+++ b/src/man/k5srvutil.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "K5SRVUTIL" "1" " " "1.18.4" "MIT Kerberos"
+.TH "K5SRVUTIL" "1" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 k5srvutil \- host key table (keytab) manipulation utility
 .

diff --git a/src/man/kadm5.acl.man b/src/man/kadm5.acl.man
index 399ee7b287fe730d48fd5dc1eac919a5c842c056..8f2e9b96b66c873f493141255d03c39ee1d33fdb 100644 (file)
--- a/src/man/kadm5.acl.man
+++ b/src/man/kadm5.acl.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KADM5.ACL" "5" " " "1.18.4" "MIT Kerberos"
+.TH "KADM5.ACL" "5" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 kadm5.acl \- Kerberos ACL file
 .

diff --git a/src/man/kadmin.man b/src/man/kadmin.man
index 66739bf721bc1c2d6ea83c1a9512f33196730e54..21cb3d3be94574245acf636dc3dbbd7f465b75a6 100644 (file)
--- a/src/man/kadmin.man
+++ b/src/man/kadmin.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KADMIN" "1" " " "1.18.4" "MIT Kerberos"
+.TH "KADMIN" "1" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 kadmin \- Kerberos V5 database administration program
 .

diff --git a/src/man/kadmind.man b/src/man/kadmind.man
index 2de7af68c5fddd3425cde19cb97b537ff6d5fe42..bd8a3b62e6ef373fc44ab2f09530b0e0d190501b 100644 (file)
--- a/src/man/kadmind.man
+++ b/src/man/kadmind.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KADMIND" "8" " " "1.18.4" "MIT Kerberos"
+.TH "KADMIND" "8" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 kadmind \- KADM5 administration server
 .

diff --git a/src/man/kdb5_ldap_util.man b/src/man/kdb5_ldap_util.man
index 50219401d00429820a580cdfe40a956fe120a2e9..cd86ffbf879051cf7791e6422c4e7791a93506e7 100644 (file)
--- a/src/man/kdb5_ldap_util.man
+++ b/src/man/kdb5_ldap_util.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KDB5_LDAP_UTIL" "8" " " "1.18.4" "MIT Kerberos"
+.TH "KDB5_LDAP_UTIL" "8" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 kdb5_ldap_util \- Kerberos configuration utility
 .

diff --git a/src/man/kdb5_util.man b/src/man/kdb5_util.man
index 6a585cdc383828e5abcf0a67836112cd781cf264..e06144f101138a776192f40d154e8d18765182f3 100644 (file)
--- a/src/man/kdb5_util.man
+++ b/src/man/kdb5_util.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KDB5_UTIL" "8" " " "1.18.4" "MIT Kerberos"
+.TH "KDB5_UTIL" "8" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 kdb5_util \- Kerberos database maintenance utility
 .

diff --git a/src/man/kdc.conf.man b/src/man/kdc.conf.man
index 653f800e9c9177ebcd6020de0872e13941a11b51..9205dbe9b46e94bd72e3375251d374b2e83914db 100644 (file)
--- a/src/man/kdc.conf.man
+++ b/src/man/kdc.conf.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KDC.CONF" "5" " " "1.18.4" "MIT Kerberos"
+.TH "KDC.CONF" "5" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 kdc.conf \- Kerberos V5 KDC configuration file
 .

diff --git a/src/man/kdestroy.man b/src/man/kdestroy.man
index 9bcc2257c767961051007695281d3357c6a0a7de..72db702709ecf9c72c256961b4293736da6fd97e 100644 (file)
--- a/src/man/kdestroy.man
+++ b/src/man/kdestroy.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KDESTROY" "1" " " "1.18.4" "MIT Kerberos"
+.TH "KDESTROY" "1" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 kdestroy \- destroy Kerberos tickets
 .

diff --git a/src/man/kerberos.man b/src/man/kerberos.man
index 8eed25b0f7bc7aa1f24809a9189dda3959ba9d84..5a33fb8b78383d4c781a95cb493635f20c1fb27a 100644 (file)
--- a/src/man/kerberos.man
+++ b/src/man/kerberos.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KERBEROS" "7" " " "1.18.4" "MIT Kerberos"
+.TH "KERBEROS" "7" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 kerberos \- Overview of using Kerberos
 .

diff --git a/src/man/kinit.man b/src/man/kinit.man
index ea164f20af8fb3be5dc282b31976bf684b13abfd..415a070e45d2fde53c8e56bf147f782fd268d44c 100644 (file)
--- a/src/man/kinit.man
+++ b/src/man/kinit.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KINIT" "1" " " "1.18.4" "MIT Kerberos"
+.TH "KINIT" "1" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 kinit \- obtain and cache Kerberos ticket-granting ticket
 .

diff --git a/src/man/klist.man b/src/man/klist.man
index b31d5e3dc717ed0c359d06e5f0e6393cdb6d43f4..9492f5d17c00f215c4cb8b051d142e2f166ed845 100644 (file)
--- a/src/man/klist.man
+++ b/src/man/klist.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KLIST" "1" " " "1.18.4" "MIT Kerberos"
+.TH "KLIST" "1" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 klist \- list cached Kerberos tickets
 .

diff --git a/src/man/kpasswd.man b/src/man/kpasswd.man
index 0a08a6d8de177265e2a28add34a6d0693977ed2a..81b7bf17ee12ec824b2c097516679531e578a7ba 100644 (file)
--- a/src/man/kpasswd.man
+++ b/src/man/kpasswd.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KPASSWD" "1" " " "1.18.4" "MIT Kerberos"
+.TH "KPASSWD" "1" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 kpasswd \- change a user's Kerberos password
 .

diff --git a/src/man/kprop.man b/src/man/kprop.man
index 66cf2b6948b3a270f71b77eaa1a3a04de514cd1f..1214d41c13e0384fc6c32c94958a546abea24c3b 100644 (file)
--- a/src/man/kprop.man
+++ b/src/man/kprop.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KPROP" "8" " " "1.18.4" "MIT Kerberos"
+.TH "KPROP" "8" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 kprop \- propagate a Kerberos V5 principal database to a replica server
 .

diff --git a/src/man/kpropd.man b/src/man/kpropd.man
index 66dffda7ec51e04b58cf2341131885df384aed99..28a8fab41c9d13e87edf91e1fe263da434a73dc1 100644 (file)
--- a/src/man/kpropd.man
+++ b/src/man/kpropd.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KPROPD" "8" " " "1.18.4" "MIT Kerberos"
+.TH "KPROPD" "8" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 kpropd \- Kerberos V5 replica KDC update server
 .

diff --git a/src/man/kproplog.man b/src/man/kproplog.man
index d5b865a115bb6e51190b49e7261183999a1918a6..189f5e368640ac8ccc41a208163d92612c1199a1 100644 (file)
--- a/src/man/kproplog.man
+++ b/src/man/kproplog.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KPROPLOG" "8" " " "1.18.4" "MIT Kerberos"
+.TH "KPROPLOG" "8" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 kproplog \- display the contents of the Kerberos principal update log
 .

diff --git a/src/man/krb5-config.man b/src/man/krb5-config.man
index c788d17c23ee67261afe47765c2175b5f2f03851..34cbf478b0c4b5046ca6aa4879c384b2650b01ec 100644 (file)
--- a/src/man/krb5-config.man
+++ b/src/man/krb5-config.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KRB5-CONFIG" "1" " " "1.18.4" "MIT Kerberos"
+.TH "KRB5-CONFIG" "1" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 krb5-config \- tool for linking against MIT Kerberos libraries
 .

diff --git a/src/man/krb5.conf.man b/src/man/krb5.conf.man
index bc9d28109ae6e286877d66e8404c6200904c9c2e..c22d2027ec4546285ccecb5b034d225c3be85ab9 100644 (file)
--- a/src/man/krb5.conf.man
+++ b/src/man/krb5.conf.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KRB5.CONF" "5" " " "1.18.4" "MIT Kerberos"
+.TH "KRB5.CONF" "5" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 krb5.conf \- Kerberos configuration file
 .

diff --git a/src/man/krb5kdc.man b/src/man/krb5kdc.man
index f36000fff1621ea23596378ae0e188750da70a4e..cbab8771147c2225d39264d1329eeffba0e81d9a 100644 (file)
--- a/src/man/krb5kdc.man
+++ b/src/man/krb5kdc.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KRB5KDC" "8" " " "1.18.4" "MIT Kerberos"
+.TH "KRB5KDC" "8" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 krb5kdc \- Kerberos V5 KDC
 .

diff --git a/src/man/ksu.man b/src/man/ksu.man
index e18bc7af44c5c20b56ab41598a11ce7aa5c6afcf..9c07d67ad23704a6b10fb040cb37229d19813d1b 100644 (file)
--- a/src/man/ksu.man
+++ b/src/man/ksu.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KSU" "1" " " "1.18.4" "MIT Kerberos"
+.TH "KSU" "1" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 ksu \- Kerberized super-user
 .

diff --git a/src/man/kswitch.man b/src/man/kswitch.man
index e02d46752722cf6c8dba1dbafe5719d82d47dfce..8a75e6b0da95bebd3d7a4fc87c41aaa4df8b78e4 100644 (file)
--- a/src/man/kswitch.man
+++ b/src/man/kswitch.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KSWITCH" "1" " " "1.18.4" "MIT Kerberos"
+.TH "KSWITCH" "1" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 kswitch \- switch primary ticket cache
 .

diff --git a/src/man/ktutil.man b/src/man/ktutil.man
index d1fa25a4201a6c4eaad1f08747798373f4bf8828..925a97b7bf3460230d55839a4261ec83b0ebad33 100644 (file)
--- a/src/man/ktutil.man
+++ b/src/man/ktutil.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KTUTIL" "1" " " "1.18.4" "MIT Kerberos"
+.TH "KTUTIL" "1" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 ktutil \- Kerberos keytab file maintenance utility
 .

diff --git a/src/man/kvno.man b/src/man/kvno.man
index e5b245bbb32b8790ab45ff09990b96f187740bc6..187cce45975f45d0a91a6299b28ec67d5e349a0b 100644 (file)
--- a/src/man/kvno.man
+++ b/src/man/kvno.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KVNO" "1" " " "1.18.4" "MIT Kerberos"
+.TH "KVNO" "1" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 kvno \- print key version numbers of Kerberos principals
 .

diff --git a/src/man/sclient.man b/src/man/sclient.man
index f9589ef04fce17c160acbb665b834dba24750669..4be84fbcacb75578f6f11d371eddfd91a6012233 100644 (file)
--- a/src/man/sclient.man
+++ b/src/man/sclient.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SCLIENT" "1" " " "1.18.4" "MIT Kerberos"
+.TH "SCLIENT" "1" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 sclient \- sample Kerberos version 5 client
 .

diff --git a/src/man/sserver.man b/src/man/sserver.man
index f23b52f45a5bbc12f5b661e103b1de1443c63471..d19c7809a79f0ad42e8ef368d4625593a4dfc1e5 100644 (file)
--- a/src/man/sserver.man
+++ b/src/man/sserver.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SSERVER" "8" " " "1.18.4" "MIT Kerberos"
+.TH "SSERVER" "8" " " "1.18.5" "MIT Kerberos"
 .SH NAME
 sserver \- sample Kerberos version 5 server
 .

diff --git a/src/patchlevel.h b/src/patchlevel.h
index 48f8bd35dd8d86e2aa721f13a96b735d4a0c9119..33810333963a5b1c51843dcf33f2f965760126af 100644 (file)
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -51,7 +51,7 @@
  */
 #define KRB5_MAJOR_RELEASE 1
 #define KRB5_MINOR_RELEASE 18
-#define KRB5_PATCHLEVEL 4
+#define KRB5_PATCHLEVEL 5
 /* #undef KRB5_RELTAIL */
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "krb5-1.18.4-final"
+#define KRB5_RELTAG "krb5-1.18.5-final"

diff --git a/src/po/mit-krb5.pot b/src/po/mit-krb5.pot
index 08c45de8eaba73c52efba28d2e82b4fdadc143d8..8b98a785310a546ba1b17e01f128d070708a4275 100644 (file)
--- a/src/po/mit-krb5.pot
+++ b/src/po/mit-krb5.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: mit-krb5 1.18.4\n"
+"Project-Id-Version: mit-krb5 1.18.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-10 00:46-0500\n"
+"POT-Creation-Date: 2022-03-10 01:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"