Update for krb5-1.20.1

diff --git a/README b/README
index 8bfb774b452fb2aa14a036ce185a88074fbd2915..73c476dc504220241beaaae9071244686353a2ca 100644 (file)
--- a/README
+++ b/README
@@ -85,6 +85,31 @@ default and eventually removed.
 Beginning with the krb5-1.18 release, single-DES encryption types have
 been removed.
 
+Major changes in 1.20.1 (2022-11-15)
+------------------------------------
+
+This is a bug fix release.
+
+* Fix integer overflows in PAC parsing [CVE-2022-42898].
+
+* Fix null deref in KDC when decoding invalid NDR.
+
+* Fix memory leak in OTP kdcpreauth module.
+
+* Fix PKCS11 module path search.
+
+krb5-1.20.1 changes by ticket ID
+--------------------------------
+
+9061    Fix memory leak in SPAKE kdcpreauth module
+9062    Fix net-server.c when AI_NUMERICSERV is undefined
+9063    Fix memory leak in OTP kdcpreauth module
+9064    Free verto context later in KDC cleanup
+9065    Fix uncommon PKINIT memory leak
+9067    Fix PKCS11 module path search
+9073    Fix null deref in KDC when decoding invalid NDR
+9074    Fix integer overflows in PAC parsing
+
 Major changes in 1.20 (2022-05-26)
 ----------------------------------
 

diff --git a/src/man/k5identity.man b/src/man/k5identity.man
index 7f99d91c96fcaa1ebab68f82a547359140b98f5f..ff26f08bfc9d53229e30fa6edf446abe758e4fdf 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" "MIT Kerberos"
+.TH "K5IDENTITY" "5" " " "1.20.1" "MIT Kerberos"
 .SH NAME
 k5identity \- Kerberos V5 client principal selection rules
 .

diff --git a/src/man/k5login.man b/src/man/k5login.man
index 38072a6ac90ec826414163f441ed3cf6f8bd1eb7..b6e4894b93a66f2651865b4583eb3eb3a21c5452 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" "MIT Kerberos"
+.TH "K5LOGIN" "5" " " "1.20.1" "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 338bfa620a877d3c3f0de78a2728c13624159b1e..c530235df74d39c61e29ed770f6ac7766a24b8d7 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" "MIT Kerberos"
+.TH "K5SRVUTIL" "1" " " "1.20.1" "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 ea17a819151b21e3bd2f15942dc2931e58af1642..c65977ac1e44a79a87a53d0b67f10adbfe1c97b0 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" "MIT Kerberos"
+.TH "KADM5.ACL" "5" " " "1.20.1" "MIT Kerberos"
 .SH NAME
 kadm5.acl \- Kerberos ACL file
 .

diff --git a/src/man/kadmin.man b/src/man/kadmin.man
index 99a28324fbb1bad279323b2b573584962605f9ce..73e1b03cdbd02d36b6cda9ba81d465b3141b1248 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" "MIT Kerberos"
+.TH "KADMIN" "1" " " "1.20.1" "MIT Kerberos"
 .SH NAME
 kadmin \- Kerberos V5 database administration program
 .

diff --git a/src/man/kadmind.man b/src/man/kadmind.man
index 497e61bbbd44257509e07faf3120b8c32b108830..d6ca08689c7d91ed03c4ed3541d90d9134291bc0 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" "MIT Kerberos"
+.TH "KADMIND" "8" " " "1.20.1" "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 df7b901d5d28e08f117046a9f67d20f91faadee4..e540568d4925403b3f96efb77c312fd321a7d74a 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" "MIT Kerberos"
+.TH "KDB5_LDAP_UTIL" "8" " " "1.20.1" "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 c93423cb869dc03390514f96f629291c5e9facb2..a5be9e1d12d8c9b7e60900fa60765b24652ef207 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" "MIT Kerberos"
+.TH "KDB5_UTIL" "8" " " "1.20.1" "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 b01742261466a1d5634ada44e12b57f0ce26b969..1da80ac13df7e4409a3e704866ab60d0cd67be14 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" "MIT Kerberos"
+.TH "KDC.CONF" "5" " " "1.20.1" "MIT Kerberos"
 .SH NAME
 kdc.conf \- Kerberos V5 KDC configuration file
 .

diff --git a/src/man/kdestroy.man b/src/man/kdestroy.man
index 972e22561aeede0ae924f299802c4cbc94ebce23..86e2964a942d71c6c04eb2b8853e8f70e736e32b 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" "MIT Kerberos"
+.TH "KDESTROY" "1" " " "1.20.1" "MIT Kerberos"
 .SH NAME
 kdestroy \- destroy Kerberos tickets
 .

diff --git a/src/man/kerberos.man b/src/man/kerberos.man
index 46783d5515d3544b553af89c4a41c929024cabcf..e1f2fe960503cedba2021988e20de9b1b7ab58e3 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" "MIT Kerberos"
+.TH "KERBEROS" "7" " " "1.20.1" "MIT Kerberos"
 .SH NAME
 kerberos \- Overview of using Kerberos
 .

diff --git a/src/man/kinit.man b/src/man/kinit.man
index 86b17d756bb22f3e805d989d9e33c02849cb8da7..3539f25eafde29076a170cc4398c3930228916ae 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" "MIT Kerberos"
+.TH "KINIT" "1" " " "1.20.1" "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 fcd2cfb9afc8a46eaa1f1dbf3950a53bd85bb77c..a9839a1dd4f323371144497c4bd5a041d31da5a5 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" "MIT Kerberos"
+.TH "KLIST" "1" " " "1.20.1" "MIT Kerberos"
 .SH NAME
 klist \- list cached Kerberos tickets
 .

diff --git a/src/man/kpasswd.man b/src/man/kpasswd.man
index 732385ddb1767e1e79f01fdff77347dcd932ef56..401841a82873a843901246247a527e913e5a2c4e 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" "MIT Kerberos"
+.TH "KPASSWD" "1" " " "1.20.1" "MIT Kerberos"
 .SH NAME
 kpasswd \- change a user's Kerberos password
 .

diff --git a/src/man/kprop.man b/src/man/kprop.man
index a0e071a39f8077cacd9a6967fbdaadf3100c2ff0..45f9b3904166222513a01b228c5534acd3b9be52 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" "MIT Kerberos"
+.TH "KPROP" "8" " " "1.20.1" "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 2d7858120b84dc16f5c7116f8a4697ac58d3e096..5528a57545d7fd18d044688f83016f85df81c510 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" "MIT Kerberos"
+.TH "KPROPD" "8" " " "1.20.1" "MIT Kerberos"
 .SH NAME
 kpropd \- Kerberos V5 replica KDC update server
 .

diff --git a/src/man/kproplog.man b/src/man/kproplog.man
index c3869f02f4f876775f3dcd21a4a4fd03c12ccbef..524b8cf5993928a85f1dd414c1bcb9ec5a09aead 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" "MIT Kerberos"
+.TH "KPROPLOG" "8" " " "1.20.1" "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 35da3cb74062b31c12707e9e26f456c05dec1b75..97840f3a1caf7370ae8161fc94bb670357f17458 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" "MIT Kerberos"
+.TH "KRB5-CONFIG" "1" " " "1.20.1" "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 6f9a6e450b3f32d14567a8a8cc12f4842949a6d4..51acb38815eca45edeecb4ce1eec7de95b140eff 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" "MIT Kerberos"
+.TH "KRB5.CONF" "5" " " "1.20.1" "MIT Kerberos"
 .SH NAME
 krb5.conf \- Kerberos configuration file
 .

diff --git a/src/man/krb5kdc.man b/src/man/krb5kdc.man
index 8cfde9a589fc0d3e9e8b38bd1ee2819b96369d0c..78efeffb6f9a3651ae7646a689358ac1cea94bb3 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" "MIT Kerberos"
+.TH "KRB5KDC" "8" " " "1.20.1" "MIT Kerberos"
 .SH NAME
 krb5kdc \- Kerberos V5 KDC
 .

diff --git a/src/man/ksu.man b/src/man/ksu.man
index e1a701009bc00f876e8247ff92d98de81af45df3..7c3d341f8db2c0079f81805e7dbf459c33fc770f 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" "MIT Kerberos"
+.TH "KSU" "1" " " "1.20.1" "MIT Kerberos"
 .SH NAME
 ksu \- Kerberized super-user
 .

diff --git a/src/man/kswitch.man b/src/man/kswitch.man
index 583c098fd9354df31b106fd9f2b53fd38e38e8a7..4e22b4a5eb075829f18ba8f9a37f8e2256db93ea 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" "MIT Kerberos"
+.TH "KSWITCH" "1" " " "1.20.1" "MIT Kerberos"
 .SH NAME
 kswitch \- switch primary ticket cache
 .

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

diff --git a/src/man/kvno.man b/src/man/kvno.man
index abfe873541e161be3a6406f1a27d69afe770b31a..8e48931beb8036ad0a4d9b863bd1829dc6b4c32e 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" "MIT Kerberos"
+.TH "KVNO" "1" " " "1.20.1" "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 840baa7d5c674e0dafc7de2bbae88c0b0a46d5ae..0e6f8e2e42ffddc9b008975fb5b75557b06bd3e3 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" "MIT Kerberos"
+.TH "SCLIENT" "1" " " "1.20.1" "MIT Kerberos"
 .SH NAME
 sclient \- sample Kerberos version 5 client
 .

diff --git a/src/man/sserver.man b/src/man/sserver.man
index eff05ff20b37d688f583cb60f95446368d2b13f0..576bf83d80041b5adcff8f419c30b7164979e0c4 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" "MIT Kerberos"
+.TH "SSERVER" "8" " " "1.20.1" "MIT Kerberos"
 .SH NAME
 sserver \- sample Kerberos version 5 server
 .

diff --git a/src/patchlevel.h b/src/patchlevel.h
index 5a55913f60ffe197b4cdd22237a4325f83de53d2..00eac5040de2d88261c006c59a42f6102b2837fa 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 0
-#define KRB5_RELTAIL "postrelease"
+#define KRB5_PATCHLEVEL 1
+/* #undef KRB5_RELTAIL */
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "krb5-1.20"
+#define KRB5_RELTAG "krb5-1.20.1-final"

diff --git a/src/po/mit-krb5.pot b/src/po/mit-krb5.pot
index bf19014ec06baf9cc70e9f7ef4b08effc2c3a3f1..bde8f70b5f2bb3d0ae4c68e6ad29078a067998f7 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-postrelease\n"
+"Project-Id-Version: mit-krb5 1.20.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-11 17:05-0500\n"
+"POT-Creation-Date: 2022-11-11 18:04-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"