summaryrefslogtreecommitdiff
path: root/security/mit-krb5
diff options
context:
space:
mode:
authortez <tez@pkgsrc.org>2013-04-23 22:09:44 +0000
committertez <tez@pkgsrc.org>2013-04-23 22:09:44 +0000
commit8d5d864e20de5c474a252ca980299bee1890e0a4 (patch)
treeb69eccaea056737cb12e183735594b3d5a14d0d8 /security/mit-krb5
parent7046b0b9f96a13440245f53f6fad1dfaf0078537 (diff)
downloadpkgsrc-8d5d864e20de5c474a252ca980299bee1890e0a4.tar.gz
Fix for CVE-2013-1416 from:
http://krbdev.mit.edu/rt/Ticket/Display.html?user=guest&pass=guest&id=7600
Diffstat (limited to 'security/mit-krb5')
-rw-r--r--security/mit-krb5/Makefile3
-rw-r--r--security/mit-krb5/distinfo3
-rw-r--r--security/mit-krb5/patches/patch-kdc_do_tgs_req.c27
3 files changed, 31 insertions, 2 deletions
diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile
index 319b5e8aba6..c3e372c0010 100644
--- a/security/mit-krb5/Makefile
+++ b/security/mit-krb5/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2013/03/14 13:53:18 tez Exp $
+# $NetBSD: Makefile,v 1.68 2013/04/23 22:09:44 tez Exp $
DISTNAME= krb5-1.10.4
+PKGREVISION= 1
PKGNAME= mit-${DISTNAME}
CATEGORIES= security
MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PKGVERSION_NOREV:R}/
diff --git a/security/mit-krb5/distinfo b/security/mit-krb5/distinfo
index 8e1781d8d99..686404755f6 100644
--- a/security/mit-krb5/distinfo
+++ b/security/mit-krb5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2013/03/13 12:35:40 adam Exp $
+$NetBSD: distinfo,v 1.41 2013/04/23 22:09:44 tez Exp $
SHA1 (krb5-1.10.4-signed.tar) = 2b4a0743b95b09cb433d25909e599de27c352f10
RMD160 (krb5-1.10.4-signed.tar) = 1dbf18f1a02744941ebde3b1db93b2e63e59afcd
@@ -19,5 +19,6 @@ SHA1 (patch-ci) = 4e310f0a4dfe27cf94d0e63d623590691b6c5970
SHA1 (patch-cj) = 78342f649f8e9d3a3b5a4f83e65b6c46f589586b
SHA1 (patch-ck) = 37bfef80329f8ae0fb35c35e70032a0040ba5591
SHA1 (patch-kadmin_dbutil_dump.c) = 4b49c116dbed9e6be4a0bf0a731c3ae82808d82e
+SHA1 (patch-kdc_do_tgs_req.c) = a7c89338eab17f98c5e2b5d426b3696cc9b4b081
SHA1 (patch-lib_krb5_asn.1_asn1buf.h) = a1e46ca9256aea4facc1d41841b1707b044a69e7
SHA1 (patch-util_k5ev_verto-k5ev.c) = 79a2be64fa4f9b0dc3a333271e8a3ff7944e5c18
diff --git a/security/mit-krb5/patches/patch-kdc_do_tgs_req.c b/security/mit-krb5/patches/patch-kdc_do_tgs_req.c
new file mode 100644
index 00000000000..a3fa5abff2f
--- /dev/null
+++ b/security/mit-krb5/patches/patch-kdc_do_tgs_req.c
@@ -0,0 +1,27 @@
+$NetBSD: patch-kdc_do_tgs_req.c,v 1.1 2013/04/23 22:09:44 tez Exp $
+
+Fix for CVE-2013-1416 from:
+ http://krbdev.mit.edu/rt/Ticket/Display.html?user=guest&pass=guest&id=7600
+
+--- kdc/do_tgs_req.c.orig 2013-04-17 20:50:13.528009200 +0000
++++ kdc/do_tgs_req.c
+@@ -1141,7 +1141,8 @@ prep_reprocess_req(krb5_kdc_req *request
+ retval = ENOMEM;
+ goto cleanup;
+ }
+- strlcpy(comp1_str,comp1->data,comp1->length+1);
++ if (comp1->data != NULL)
++ memcpy(comp1_str, comp1->data, comp1->length);
+
+ if ((krb5_princ_type(kdc_context, request->server) == KRB5_NT_SRV_HST ||
+ krb5_princ_type(kdc_context, request->server) == KRB5_NT_SRV_INST ||
+@@ -1164,7 +1165,8 @@ prep_reprocess_req(krb5_kdc_req *request
+ retval = ENOMEM;
+ goto cleanup;
+ }
+- strlcpy(temp_buf, comp2->data,comp2->length+1);
++ if (comp2->data != NULL)
++ memcpy(temp_buf, comp2->data, comp2->length);
+ retval = krb5int_get_domain_realm_mapping(kdc_context, temp_buf, &realms);
+ free(temp_buf);
+ if (retval) {