From 0978af0fc44d1339304afcdf1ec8c7d737dc0736 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 16 Nov 2002 00:02:13 +0000 Subject: Update 1.2.6 --> 1.2.7 Note: Since crypto-publish.org does not yet have krb5-1.2.7 up on their website, fetch from their site has been temporarily disabled. --- security/krb5-16/Makefile | 12 ++++++---- security/krb5-16/distinfo | 3 +-- .../files/patch-kadmin::v4server::kadm_ser_wrap.c | 26 ---------------------- security/krb5-17/Makefile | 12 ++++++---- security/krb5-17/distinfo | 3 +-- .../files/patch-kadmin::v4server::kadm_ser_wrap.c | 26 ---------------------- security/krb5-appl/Makefile | 12 ++++++---- security/krb5-appl/distinfo | 3 +-- .../files/patch-kadmin::v4server::kadm_ser_wrap.c | 26 ---------------------- security/krb5/Makefile | 12 ++++++---- security/krb5/distinfo | 3 +-- .../files/patch-kadmin::v4server::kadm_ser_wrap.c | 26 ---------------------- 12 files changed, 36 insertions(+), 128 deletions(-) delete mode 100644 security/krb5-16/files/patch-kadmin::v4server::kadm_ser_wrap.c delete mode 100644 security/krb5-17/files/patch-kadmin::v4server::kadm_ser_wrap.c delete mode 100644 security/krb5-appl/files/patch-kadmin::v4server::kadm_ser_wrap.c delete mode 100644 security/krb5/files/patch-kadmin::v4server::kadm_ser_wrap.c diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile index dbef65d1d20f..da604fe2954f 100644 --- a/security/krb5-16/Makefile +++ b/security/krb5-16/Makefile @@ -6,12 +6,16 @@ # PORTNAME= krb5 -PORTVERSION= 1.2.6 -PORTREVISION= 1 +PORTVERSION= 1.2.7 CATEGORIES= security .if defined(USA_RESIDENT) && ${USA_RESIDENT} == "NO" -MASTER_SITES= http://www.crypto-publish.org/dist/mit-kerberos5/ -EXTRACT_SUFX= .tar.gz +# XXX crypto-publish.org does not at this time have the krb5-1.2.7 tarball. +# Use manual download until crypto-publish.org posts a copy of krb5-1.2.7 +# on their website. +# MASTER_SITES= http://www.crypto-publish.org/dist/mit-kerberos5/ +# EXTRACT_SUFX= .tar.gz +MASTER_SITES= # manual download +EXTRACT_SUFX= .tar .else MASTER_SITES= # manual download EXTRACT_SUFX= .tar diff --git a/security/krb5-16/distinfo b/security/krb5-16/distinfo index 4ad9c42a42da..ebef31db7744 100644 --- a/security/krb5-16/distinfo +++ b/security/krb5-16/distinfo @@ -1,2 +1 @@ -MD5 (krb5-1.2.6.tar) = 88a94d357c63e0c6b902f3e7cffe397c -MD5 (krb5-1.2.6.tar.gz) = 9723ca51368f8fbfcc52927d50dda7ac +MD5 (krb5-1.2.7.tar) = c09755f5fb9bc30d93050bd89ef0562b diff --git a/security/krb5-16/files/patch-kadmin::v4server::kadm_ser_wrap.c b/security/krb5-16/files/patch-kadmin::v4server::kadm_ser_wrap.c deleted file mode 100644 index 2fa89e96690b..000000000000 --- a/security/krb5-16/files/patch-kadmin::v4server::kadm_ser_wrap.c +++ /dev/null @@ -1,26 +0,0 @@ ---- kadmin/v4server/kadm_ser_wrap.c.orig Tue May 23 14:44:50 2000 -+++ kadmin/v4server/kadm_ser_wrap.c Wed Oct 23 15:15:24 2002 -@@ -170,14 +170,21 @@ - u_char *retdat, *tmpdat; - int retval, retlen; - -- if (strncmp(KADM_VERSTR, (char *)*dat, KADM_VERSIZE)) { -+ if ((*dat_len < KADM_VERSIZE + sizeof(krb5_ui_4)) -+ || strncmp(KADM_VERSTR, (char *)*dat, KADM_VERSIZE)) { - errpkt(dat, dat_len, KADM_BAD_VER); - return KADM_BAD_VER; - } - in_len = KADM_VERSIZE; - /* get the length */ -- if ((retc = stv_long(*dat, &r_len, in_len, *dat_len)) < 0) -+ if ((retc = stv_long(*dat, &r_len, in_len, *dat_len)) < 0 -+ || (r_len > *dat_len - KADM_VERSIZE - sizeof(krb5_ui_4)) -+ || (*dat_len - r_len - KADM_VERSIZE - -+ sizeof(krb5_ui_4) > sizeof(authent.dat))) { -+ errpkt(dat, dat_len, KADM_LENGTH_ERROR); - return KADM_LENGTH_ERROR; -+ } -+ - in_len += retc; - authent.length = *dat_len - r_len - KADM_VERSIZE - sizeof(krb5_ui_4); - memcpy((char *)authent.dat, (char *)(*dat) + in_len, authent.length); diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile index dbef65d1d20f..da604fe2954f 100644 --- a/security/krb5-17/Makefile +++ b/security/krb5-17/Makefile @@ -6,12 +6,16 @@ # PORTNAME= krb5 -PORTVERSION= 1.2.6 -PORTREVISION= 1 +PORTVERSION= 1.2.7 CATEGORIES= security .if defined(USA_RESIDENT) && ${USA_RESIDENT} == "NO" -MASTER_SITES= http://www.crypto-publish.org/dist/mit-kerberos5/ -EXTRACT_SUFX= .tar.gz +# XXX crypto-publish.org does not at this time have the krb5-1.2.7 tarball. +# Use manual download until crypto-publish.org posts a copy of krb5-1.2.7 +# on their website. +# MASTER_SITES= http://www.crypto-publish.org/dist/mit-kerberos5/ +# EXTRACT_SUFX= .tar.gz +MASTER_SITES= # manual download +EXTRACT_SUFX= .tar .else MASTER_SITES= # manual download EXTRACT_SUFX= .tar diff --git a/security/krb5-17/distinfo b/security/krb5-17/distinfo index 4ad9c42a42da..ebef31db7744 100644 --- a/security/krb5-17/distinfo +++ b/security/krb5-17/distinfo @@ -1,2 +1 @@ -MD5 (krb5-1.2.6.tar) = 88a94d357c63e0c6b902f3e7cffe397c -MD5 (krb5-1.2.6.tar.gz) = 9723ca51368f8fbfcc52927d50dda7ac +MD5 (krb5-1.2.7.tar) = c09755f5fb9bc30d93050bd89ef0562b diff --git a/security/krb5-17/files/patch-kadmin::v4server::kadm_ser_wrap.c b/security/krb5-17/files/patch-kadmin::v4server::kadm_ser_wrap.c deleted file mode 100644 index 2fa89e96690b..000000000000 --- a/security/krb5-17/files/patch-kadmin::v4server::kadm_ser_wrap.c +++ /dev/null @@ -1,26 +0,0 @@ ---- kadmin/v4server/kadm_ser_wrap.c.orig Tue May 23 14:44:50 2000 -+++ kadmin/v4server/kadm_ser_wrap.c Wed Oct 23 15:15:24 2002 -@@ -170,14 +170,21 @@ - u_char *retdat, *tmpdat; - int retval, retlen; - -- if (strncmp(KADM_VERSTR, (char *)*dat, KADM_VERSIZE)) { -+ if ((*dat_len < KADM_VERSIZE + sizeof(krb5_ui_4)) -+ || strncmp(KADM_VERSTR, (char *)*dat, KADM_VERSIZE)) { - errpkt(dat, dat_len, KADM_BAD_VER); - return KADM_BAD_VER; - } - in_len = KADM_VERSIZE; - /* get the length */ -- if ((retc = stv_long(*dat, &r_len, in_len, *dat_len)) < 0) -+ if ((retc = stv_long(*dat, &r_len, in_len, *dat_len)) < 0 -+ || (r_len > *dat_len - KADM_VERSIZE - sizeof(krb5_ui_4)) -+ || (*dat_len - r_len - KADM_VERSIZE - -+ sizeof(krb5_ui_4) > sizeof(authent.dat))) { -+ errpkt(dat, dat_len, KADM_LENGTH_ERROR); - return KADM_LENGTH_ERROR; -+ } -+ - in_len += retc; - authent.length = *dat_len - r_len - KADM_VERSIZE - sizeof(krb5_ui_4); - memcpy((char *)authent.dat, (char *)(*dat) + in_len, authent.length); diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile index dbef65d1d20f..da604fe2954f 100644 --- a/security/krb5-appl/Makefile +++ b/security/krb5-appl/Makefile @@ -6,12 +6,16 @@ # PORTNAME= krb5 -PORTVERSION= 1.2.6 -PORTREVISION= 1 +PORTVERSION= 1.2.7 CATEGORIES= security .if defined(USA_RESIDENT) && ${USA_RESIDENT} == "NO" -MASTER_SITES= http://www.crypto-publish.org/dist/mit-kerberos5/ -EXTRACT_SUFX= .tar.gz +# XXX crypto-publish.org does not at this time have the krb5-1.2.7 tarball. +# Use manual download until crypto-publish.org posts a copy of krb5-1.2.7 +# on their website. +# MASTER_SITES= http://www.crypto-publish.org/dist/mit-kerberos5/ +# EXTRACT_SUFX= .tar.gz +MASTER_SITES= # manual download +EXTRACT_SUFX= .tar .else MASTER_SITES= # manual download EXTRACT_SUFX= .tar diff --git a/security/krb5-appl/distinfo b/security/krb5-appl/distinfo index 4ad9c42a42da..ebef31db7744 100644 --- a/security/krb5-appl/distinfo +++ b/security/krb5-appl/distinfo @@ -1,2 +1 @@ -MD5 (krb5-1.2.6.tar) = 88a94d357c63e0c6b902f3e7cffe397c -MD5 (krb5-1.2.6.tar.gz) = 9723ca51368f8fbfcc52927d50dda7ac +MD5 (krb5-1.2.7.tar) = c09755f5fb9bc30d93050bd89ef0562b diff --git a/security/krb5-appl/files/patch-kadmin::v4server::kadm_ser_wrap.c b/security/krb5-appl/files/patch-kadmin::v4server::kadm_ser_wrap.c deleted file mode 100644 index 2fa89e96690b..000000000000 --- a/security/krb5-appl/files/patch-kadmin::v4server::kadm_ser_wrap.c +++ /dev/null @@ -1,26 +0,0 @@ ---- kadmin/v4server/kadm_ser_wrap.c.orig Tue May 23 14:44:50 2000 -+++ kadmin/v4server/kadm_ser_wrap.c Wed Oct 23 15:15:24 2002 -@@ -170,14 +170,21 @@ - u_char *retdat, *tmpdat; - int retval, retlen; - -- if (strncmp(KADM_VERSTR, (char *)*dat, KADM_VERSIZE)) { -+ if ((*dat_len < KADM_VERSIZE + sizeof(krb5_ui_4)) -+ || strncmp(KADM_VERSTR, (char *)*dat, KADM_VERSIZE)) { - errpkt(dat, dat_len, KADM_BAD_VER); - return KADM_BAD_VER; - } - in_len = KADM_VERSIZE; - /* get the length */ -- if ((retc = stv_long(*dat, &r_len, in_len, *dat_len)) < 0) -+ if ((retc = stv_long(*dat, &r_len, in_len, *dat_len)) < 0 -+ || (r_len > *dat_len - KADM_VERSIZE - sizeof(krb5_ui_4)) -+ || (*dat_len - r_len - KADM_VERSIZE - -+ sizeof(krb5_ui_4) > sizeof(authent.dat))) { -+ errpkt(dat, dat_len, KADM_LENGTH_ERROR); - return KADM_LENGTH_ERROR; -+ } -+ - in_len += retc; - authent.length = *dat_len - r_len - KADM_VERSIZE - sizeof(krb5_ui_4); - memcpy((char *)authent.dat, (char *)(*dat) + in_len, authent.length); diff --git a/security/krb5/Makefile b/security/krb5/Makefile index dbef65d1d20f..da604fe2954f 100644 --- a/security/krb5/Makefile +++ b/security/krb5/Makefile @@ -6,12 +6,16 @@ # PORTNAME= krb5 -PORTVERSION= 1.2.6 -PORTREVISION= 1 +PORTVERSION= 1.2.7 CATEGORIES= security .if defined(USA_RESIDENT) && ${USA_RESIDENT} == "NO" -MASTER_SITES= http://www.crypto-publish.org/dist/mit-kerberos5/ -EXTRACT_SUFX= .tar.gz +# XXX crypto-publish.org does not at this time have the krb5-1.2.7 tarball. +# Use manual download until crypto-publish.org posts a copy of krb5-1.2.7 +# on their website. +# MASTER_SITES= http://www.crypto-publish.org/dist/mit-kerberos5/ +# EXTRACT_SUFX= .tar.gz +MASTER_SITES= # manual download +EXTRACT_SUFX= .tar .else MASTER_SITES= # manual download EXTRACT_SUFX= .tar diff --git a/security/krb5/distinfo b/security/krb5/distinfo index 4ad9c42a42da..ebef31db7744 100644 --- a/security/krb5/distinfo +++ b/security/krb5/distinfo @@ -1,2 +1 @@ -MD5 (krb5-1.2.6.tar) = 88a94d357c63e0c6b902f3e7cffe397c -MD5 (krb5-1.2.6.tar.gz) = 9723ca51368f8fbfcc52927d50dda7ac +MD5 (krb5-1.2.7.tar) = c09755f5fb9bc30d93050bd89ef0562b diff --git a/security/krb5/files/patch-kadmin::v4server::kadm_ser_wrap.c b/security/krb5/files/patch-kadmin::v4server::kadm_ser_wrap.c deleted file mode 100644 index 2fa89e96690b..000000000000 --- a/security/krb5/files/patch-kadmin::v4server::kadm_ser_wrap.c +++ /dev/null @@ -1,26 +0,0 @@ ---- kadmin/v4server/kadm_ser_wrap.c.orig Tue May 23 14:44:50 2000 -+++ kadmin/v4server/kadm_ser_wrap.c Wed Oct 23 15:15:24 2002 -@@ -170,14 +170,21 @@ - u_char *retdat, *tmpdat; - int retval, retlen; - -- if (strncmp(KADM_VERSTR, (char *)*dat, KADM_VERSIZE)) { -+ if ((*dat_len < KADM_VERSIZE + sizeof(krb5_ui_4)) -+ || strncmp(KADM_VERSTR, (char *)*dat, KADM_VERSIZE)) { - errpkt(dat, dat_len, KADM_BAD_VER); - return KADM_BAD_VER; - } - in_len = KADM_VERSIZE; - /* get the length */ -- if ((retc = stv_long(*dat, &r_len, in_len, *dat_len)) < 0) -+ if ((retc = stv_long(*dat, &r_len, in_len, *dat_len)) < 0 -+ || (r_len > *dat_len - KADM_VERSIZE - sizeof(krb5_ui_4)) -+ || (*dat_len - r_len - KADM_VERSIZE - -+ sizeof(krb5_ui_4) > sizeof(authent.dat))) { -+ errpkt(dat, dat_len, KADM_LENGTH_ERROR); - return KADM_LENGTH_ERROR; -+ } -+ - in_len += retc; - authent.length = *dat_len - r_len - KADM_VERSIZE - sizeof(krb5_ui_4); - memcpy((char *)authent.dat, (char *)(*dat) + in_len, authent.length); -- cgit