From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 6 Jul 2023 22:56:05 +0000 (-0400)
Subject: Update for krb5-1.20.2
X-Git-Tag: krb5-1.20.2-final
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47646c2b98fb17f06e5c46ec1348dd54ad65ef83;p=thirdparty%2Fkrb5.git

Update for krb5-1.20.2
---

diff --git a/README b/README
index a1805975f7..fd0a0b14fd 100644
--- 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 4d9d76d9fc..3058a095f4 100644
--- 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 aca1d04598..f5877ad458 100644
--- 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 61581746a0..4b4e86f002 100644
--- 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 4b5246c6a9..e41081c476 100644
--- 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 64b9cea39b..6a38024e90 100644
--- 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 65a8f80deb..c73cbf066f 100644
--- 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 f1f35b8689..1312383b47 100644
--- 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 6f8fa23ad6..c1cb7d1e1e 100644
--- 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 76884afb8f..b045671583 100644
--- 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 473e579b74..0415d9abab 100644
--- 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 f13fa902ba..db84512de6 100644
--- 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 7fc43f9f57..c6a3c3ce62 100644
--- 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 744738d74c..b6f04263d9 100644
--- 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 7238d0560f..ba7b1a8816 100644
--- 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 0ee1f83115..2e0efe869b 100644
--- 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 9dd6d6ba59..ef05c15676 100644
--- 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 8aa85715a2..159405706c 100644
--- 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 7c4380a369..5ef960c3c9 100644
--- 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 a86c68b62c..88362fbf87 100644
--- 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 24d90fea2c..aa1c6705d0 100644
--- 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 6adaa469fb..dc78eebc4a 100644
--- 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 fdeafb4adb..756e97dcd3 100644
--- 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 2fac944640..1ee5a1f6ab 100644
--- 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 f08a4fe36c..a665c1c6ed 100644
--- 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 effa652823..3838a43c16 100644
--- 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 204ee0bb76..21b002285b 100644
--- 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 709e312b55..d41f8a014b 100644
--- 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 428913bd81..2e58840908 100644
--- 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"