Update for krb5-1.20.2

diff --git a/README b/README
index a1805975f70966e7fdd0f0f96f110d271e7a3d1d..fd0a0b14fdcd8af1d32d2220a32b53f580207d39 100644 (file)
--- a/README
+++ b/README
@@ -85,6 +85,29 @@ default and eventually removed.
 Beginning with the krb5-1.18 release, single-DES encryption types have
 been removed.
 
+Major changes in 1.20.2 (2023-07-06)
+------------------------------------
+
+This is a bug fix release.
+
+* Fix potential uninitialized pointer free in kadm5 XDR parsing
+  [CVE-2023-36054].
+
+* Fix read overruns in SPNEGO parsing.
+
+* Compatibility fix for autoconf 2.72.
+
+krb5-1.20.2 changes by ticket ID
+--------------------------------
+
+9069    Update error checking for OpenSSL CMS_verify
+9077    Fix aclocal.m4 syntax error for autoconf 2.72
+9083    Fix kpropd crash with unrecognized option
+9085    Fix read overruns in SPNEGO parsing
+9086    Fix possible double-free during KDB creation
+9087    Fix meridian type in getdate.y
+9099    Ensure array count consistency in kadm5 RPC
+
 Major changes in 1.20.1 (2022-11-15)
 ------------------------------------
 
@@ -470,6 +493,7 @@ reports, suggestions, and valuable resources:
     Paul Moore
     Keiichi Mori
     Michael Morony
+    Robert Morris
     Sam Morris
     Zbysek Mraz
     Edward Murrell

diff --git a/src/man/k5identity.man b/src/man/k5identity.man
index 4d9d76d9fce692a940f4c0b0d98ad51501ed92c5..3058a095f4bd7db7307f75b86ee148ed02027ffa 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.20.1" "MIT Kerberos"
+.TH "K5IDENTITY" "5" " " "1.20.2" "MIT Kerberos"
 .SH NAME
 k5identity \- Kerberos V5 client principal selection rules
 .

diff --git a/src/man/k5login.man b/src/man/k5login.man
index aca1d0459814d81c3e4b9f5466a426d083264874..f5877ad4588f601e18dedabb800b3cee40025978 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.20.1" "MIT Kerberos"
+.TH "K5LOGIN" "5" " " "1.20.2" "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 61581746a002ca5ce132fa42c011a19a1a4839fc..4b4e86f0021cc132ef595739da36fcaafb9327ee 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.20.1" "MIT Kerberos"
+.TH "K5SRVUTIL" "1" " " "1.20.2" "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 4b5246c6a9c2ee35c95605d1d95123f86c48b97f..e41081c476a0e7ee9ddbc8a12597edc0e8e9d05d 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.20.1" "MIT Kerberos"
+.TH "KADM5.ACL" "5" " " "1.20.2" "MIT Kerberos"
 .SH NAME
 kadm5.acl \- Kerberos ACL file
 .

diff --git a/src/man/kadmin.man b/src/man/kadmin.man
index 64b9cea39b0d35625c78f69e7b0915007ccfbdf4..6a38024e9008d2bed741303cd97afa2b3043f018 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.20.1" "MIT Kerberos"
+.TH "KADMIN" "1" " " "1.20.2" "MIT Kerberos"
 .SH NAME
 kadmin \- Kerberos V5 database administration program
 .

diff --git a/src/man/kadmind.man b/src/man/kadmind.man
index 65a8f80deba5a20aafc8dc0440b92387466f67f9..c73cbf066f59abbf17ef5f34c20c5181a087e2d1 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.20.1" "MIT Kerberos"
+.TH "KADMIND" "8" " " "1.20.2" "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 f1f35b8689efb8cf49b1f598031aa16bb7e0f09f..1312383b47e04d4e020819a035e4fb189c314dae 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.20.1" "MIT Kerberos"
+.TH "KDB5_LDAP_UTIL" "8" " " "1.20.2" "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 6f8fa23ad65fc1a5fd4af66f02928f7355c96889..c1cb7d1e1ea23ecb1398be3ec5eacb484aa68c7a 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.20.1" "MIT Kerberos"
+.TH "KDB5_UTIL" "8" " " "1.20.2" "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 76884afb8f76f57eae122c63c9ed02aa8c182529..b0456715834971aabd0854961405f258780fbfb0 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.20.1" "MIT Kerberos"
+.TH "KDC.CONF" "5" " " "1.20.2" "MIT Kerberos"
 .SH NAME
 kdc.conf \- Kerberos V5 KDC configuration file
 .

diff --git a/src/man/kdestroy.man b/src/man/kdestroy.man
index 473e579b74fba0d2840363e1a44f2471bc750256..0415d9abab83808752786fc8a15b189b35a29a00 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.20.1" "MIT Kerberos"
+.TH "KDESTROY" "1" " " "1.20.2" "MIT Kerberos"
 .SH NAME
 kdestroy \- destroy Kerberos tickets
 .

diff --git a/src/man/kerberos.man b/src/man/kerberos.man
index f13fa902ba0641e50e80b6aa2d962fff696f8f45..db84512de6b047e00c7c4f78e31ffd702892a870 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.20.1" "MIT Kerberos"
+.TH "KERBEROS" "7" " " "1.20.2" "MIT Kerberos"
 .SH NAME
 kerberos \- Overview of using Kerberos
 .

diff --git a/src/man/kinit.man b/src/man/kinit.man
index 7fc43f9f575d62b9100f56d92ee2709e1122fd59..c6a3c3ce62636bc00c35025567d71241e56724c5 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.20.1" "MIT Kerberos"
+.TH "KINIT" "1" " " "1.20.2" "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 744738d74cb9e42f03a9e5ef48850148e1884414..b6f04263d928c5b023ab44032b86b3b7fa23598e 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.20.1" "MIT Kerberos"
+.TH "KLIST" "1" " " "1.20.2" "MIT Kerberos"
 .SH NAME
 klist \- list cached Kerberos tickets
 .

diff --git a/src/man/kpasswd.man b/src/man/kpasswd.man
index 7238d0560f8aa6e85782c1e863f493b642810f17..ba7b1a88163caaba698a4582b02b42379c06eb2d 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.20.1" "MIT Kerberos"
+.TH "KPASSWD" "1" " " "1.20.2" "MIT Kerberos"
 .SH NAME
 kpasswd \- change a user's Kerberos password
 .

diff --git a/src/man/kprop.man b/src/man/kprop.man
index 0ee1f831158600e7dd958cdceac143f8cb52b7cc..2e0efe869baf8c267e358b2815e15ac848e1b1e8 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.20.1" "MIT Kerberos"
+.TH "KPROP" "8" " " "1.20.2" "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 9dd6d6ba592b31ac54f31fcc3d79eaed63484050..ef05c156767bbcc0ce3dce7701fed155239f26c9 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.20.1" "MIT Kerberos"
+.TH "KPROPD" "8" " " "1.20.2" "MIT Kerberos"
 .SH NAME
 kpropd \- Kerberos V5 replica KDC update server
 .

diff --git a/src/man/kproplog.man b/src/man/kproplog.man
index 8aa85715a27c9a91d1fbd789ebf21349e8d429ac..159405706cd633f25236d698b51c1f68fd627dd4 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.20.1" "MIT Kerberos"
+.TH "KPROPLOG" "8" " " "1.20.2" "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 7c4380a36996266b5a14034be9d89bd642fa67a5..5ef960c3c9934fb5bf9f0ef7f10105f853164b33 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.20.1" "MIT Kerberos"
+.TH "KRB5-CONFIG" "1" " " "1.20.2" "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 a86c68b62c093dec9552a204106ae77ae41791f9..88362fbf87bea93827a1a8d1a10f6eb56a63ef0d 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.20.1" "MIT Kerberos"
+.TH "KRB5.CONF" "5" " " "1.20.2" "MIT Kerberos"
 .SH NAME
 krb5.conf \- Kerberos configuration file
 .

diff --git a/src/man/krb5kdc.man b/src/man/krb5kdc.man
index 24d90fea2c1feef9fdf1fd6ec1ecf420696e6822..aa1c6705d058a0cfd1f8206d33240ea286ed397f 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.20.1" "MIT Kerberos"
+.TH "KRB5KDC" "8" " " "1.20.2" "MIT Kerberos"
 .SH NAME
 krb5kdc \- Kerberos V5 KDC
 .

diff --git a/src/man/ksu.man b/src/man/ksu.man
index 6adaa469fbec9a9af17a3b7e3e18f2eb63ad6c60..dc78eebc4a5dee32f6702aa76cabdf2357a6db99 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.20.1" "MIT Kerberos"
+.TH "KSU" "1" " " "1.20.2" "MIT Kerberos"
 .SH NAME
 ksu \- Kerberized super-user
 .

diff --git a/src/man/kswitch.man b/src/man/kswitch.man
index fdeafb4adbb83605b334f074be0208707a809ff5..756e97dcd35b9c534c4cf288efd0ec73b926b4b2 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.20.1" "MIT Kerberos"
+.TH "KSWITCH" "1" " " "1.20.2" "MIT Kerberos"
 .SH NAME
 kswitch \- switch primary ticket cache
 .

diff --git a/src/man/ktutil.man b/src/man/ktutil.man
index 2fac94464065d8664b4e357972c01d497882d342..1ee5a1f6ab19ba5fa7497d992eb9983b657af20f 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.20.1" "MIT Kerberos"
+.TH "KTUTIL" "1" " " "1.20.2" "MIT Kerberos"
 .SH NAME
 ktutil \- Kerberos keytab file maintenance utility
 .

diff --git a/src/man/kvno.man b/src/man/kvno.man
index f08a4fe36c5242c1bae51b707f6346f2da90b0f3..a665c1c6eda4b3d039fe73b524c365ed542c9306 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.20.1" "MIT Kerberos"
+.TH "KVNO" "1" " " "1.20.2" "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 effa6528231539167c9bca51da41ce3c97f70828..3838a43c161c84a3d3a872bb15de8f41cfc30ba7 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.20.1" "MIT Kerberos"
+.TH "SCLIENT" "1" " " "1.20.2" "MIT Kerberos"
 .SH NAME
 sclient \- sample Kerberos version 5 client
 .

diff --git a/src/man/sserver.man b/src/man/sserver.man
index 204ee0bb76dc0ba7657e75292701c5a97bca7fce..21b002285b9ca89eaf7631ef8c02e9fad918bd92 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.20.1" "MIT Kerberos"
+.TH "SSERVER" "8" " " "1.20.2" "MIT Kerberos"
 .SH NAME
 sserver \- sample Kerberos version 5 server
 .

diff --git a/src/patchlevel.h b/src/patchlevel.h
index 709e312b55bfc7140f576f54a15b424ccd30db2a..d41f8a014bf8c2dded014254d3caf55a6342afa0 100644 (file)
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -51,7 +51,7 @@
  */
 #define KRB5_MAJOR_RELEASE 1
 #define KRB5_MINOR_RELEASE 20
-#define KRB5_PATCHLEVEL 1
-#define KRB5_RELTAIL "postrelease"
+#define KRB5_PATCHLEVEL 2
+/* #undef KRB5_RELTAIL */
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "krb5-1.20"
+#define KRB5_RELTAG "krb5-1.20.2-final"

diff --git a/src/po/mit-krb5.pot b/src/po/mit-krb5.pot
index 428913bd815cba067887fe1859b6db4e4d1554ed..2e5884090897567ff64fbe55b0e204ec98c3b8a2 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.20.1-postrelease\n"
+"Project-Id-Version: mit-krb5 1.20.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-06 17:30-0400\n"
+"POT-Creation-Date: 2023-07-06 18:47-0400\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"