- SECURITY update to cyrus-sasl-2.1.23

* lib/saslutil.c: Fixed CERT VU#238019 (make sure sasl_encode64() always NUL terminates output or returns SASL_BUFOVER).
2009-05-16 09:09:59 +00:00 · 2009-05-16 09:09:59 +00:00 · 0536001aad
commit 0536001aad
parent a2ad499c7d
6 changed files with 52 additions and 53 deletions
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.46 2009/03/16 22:44:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.47 2009/05/16 09:09:59 ajacoutot Exp $

 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer)

-DISTNAME=	cyrus-sasl-2.1.22
-PKGNAME=	${DISTNAME}p5
+DISTNAME=	cyrus-sasl-2.1.23
 SHARED_LIBS=	anonymous	2.22 \
 		crammd5		2.22 \
 		digestmd5	2.22 \
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@ -1,5 +1,5 @@
-MD5 (cyrus-sasl-2.1.22.tar.gz) = Rd3p0ZGTrp3TiOtosgJ7yQ==
-RMD160 (cyrus-sasl-2.1.22.tar.gz) = CG4g0BWIy4beytABJEtyo3IjNUw=
-SHA1 (cyrus-sasl-2.1.22.tar.gz) = 0jRUqxIFRxSrl9IpyGy5NM5j+7E=
-SHA256 (cyrus-sasl-2.1.22.tar.gz) = xp44U/NbFO4sP26HbkLYgJJyWP9GeKoFLl8IU9sgmWI=
-SIZE (cyrus-sasl-2.1.22.tar.gz) = 1609278
+MD5 (cyrus-sasl-2.1.23.tar.gz) = LrDkgQbw6c2AAeZU8mfsvA==
+RMD160 (cyrus-sasl-2.1.23.tar.gz) = ss2XNPqLS62CZjUX8Bn5uS2dNRk=
+SHA1 (cyrus-sasl-2.1.23.tar.gz) = XfM6Z4jWzYMpsQnv93fGz64aIb0=
+SHA256 (cyrus-sasl-2.1.23.tar.gz) = IO/MQEDLq26Jpjagfc9XIO4HtcYjWaTnvyUA72AgsTY=
+SIZE (cyrus-sasl-2.1.23.tar.gz) = 1613642
--- a/security/cyrus-sasl2/patches/patch-configure
+++ b/security/cyrus-sasl2/patches/patch-configure
@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.10 2007/06/18 12:31:20 ajacoutot Exp $
--- configure.orig	Thu May 18 21:30:13 2006
-+++ configure	Fri Jun  1 08:48:08 2007
-@@ -3945,7 +3945,7 @@ _ACEOF
+$OpenBSD: patch-configure,v 1.11 2009/05/16 09:09:59 ajacoutot Exp $
+--- configure.orig	Thu May  7 16:24:25 2009
+++ configure	Sat May 16 10:26:19 2009
+@@ -3967,7 +3967,7 @@ _ACEOF
 fi
 
 if test "$ac_cv_c_compiler_gnu" = yes; then
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.10 2007/06/18 12:31:20 ajacoutot Exp $
 fi
 
 
-@@ -4526,7 +4526,7 @@ echo "${ECHO_T}$ac_cv_func_res_search" >&6
+@@ -4548,7 +4548,7 @@ echo "${ECHO_T}$ac_cv_func_res_search" >&6
 if test $ac_cv_func_res_search = yes; then
   :
 else
@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.10 2007/06/18 12:31:20 ajacoutot Exp $
 		cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
-@@ -4567,7 +4567,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -4589,7 +4589,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.10 2007/06/18 12:31:20 ajacoutot Exp $
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
-@@ -9480,7 +9480,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
+@@ -9502,7 +9502,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@ -37,7 +37,7 @@ $OpenBSD: patch-configure,v 1.10 2007/06/18 12:31:20 ajacoutot Exp $
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
-@@ -9533,7 +9533,7 @@ if test $ac_cv_lib_resolv_res_search = yes; then
+@@ -9555,7 +9555,7 @@ if test $ac_cv_lib_resolv_res_search = yes; then
 #define HAVE_LIBRESOLV 1
 _ACEOF
 
@ -46,7 +46,7 @@ $OpenBSD: patch-configure,v 1.10 2007/06/18 12:31:20 ajacoutot Exp $
 
 fi
 
-@@ -10245,6 +10245,9 @@ if test "$gssapi" != no; then
+@@ -10267,6 +10267,9 @@ if test "$gssapi" != no; then
     *-*-aix*)
       platform=__aix
       ;;
@ -56,7 +56,7 @@ $OpenBSD: patch-configure,v 1.10 2007/06/18 12:31:20 ajacoutot Exp $
     *)
       { echo "$as_me:$LINENO: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&5
 echo "$as_me: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&2;}
-@@ -10259,7 +10262,7 @@ echo "$as_me: error: CyberSafe was forced, cannot cont
+@@ -10281,7 +10284,7 @@ echo "$as_me: error: CyberSafe was forced, cannot cont
   cmu_saved_CPPFLAGS=$CPPFLAGS
 
   if test -d ${gssapi}; then
@ -65,7 +65,7 @@ $OpenBSD: patch-configure,v 1.10 2007/06/18 12:31:20 ajacoutot Exp $
 # We want to keep -I in our CPPFLAGS, but only if we succeed
     cmu_saved_CPPFLAGS=$CPPFLAGS
     LDFLAGS="$LDFLAGS -L$gssapi/lib"
-@@ -10570,7 +10573,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
+@@ -10592,7 +10595,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@ -74,7 +74,7 @@ $OpenBSD: patch-configure,v 1.10 2007/06/18 12:31:20 ajacoutot Exp $
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
-@@ -10623,7 +10626,7 @@ if test $ac_cv_lib_resolv_res_search = yes; then
+@@ -10645,7 +10648,7 @@ if test $ac_cv_lib_resolv_res_search = yes; then
 #define HAVE_LIBRESOLV 1
 _ACEOF
 
@ -83,7 +83,7 @@ $OpenBSD: patch-configure,v 1.10 2007/06/18 12:31:20 ajacoutot Exp $
 
 fi
 
-@@ -10650,7 +10653,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; th
+@@ -10672,7 +10675,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; th
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@ -92,7 +92,7 @@ $OpenBSD: patch-configure,v 1.10 2007/06/18 12:31:20 ajacoutot Exp $
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
-@@ -11060,8 +11063,8 @@ fi
+@@ -11082,8 +11085,8 @@ fi
     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
   elif test "$gss_impl" = "heimdal"; then
     CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
@ -103,7 +103,7 @@ $OpenBSD: patch-configure,v 1.10 2007/06/18 12:31:20 ajacoutot Exp $
   elif test "$gss_impl" = "cybersafe03"; then
 # Version of CyberSafe with two libraries
     CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
-@@ -11251,7 +11254,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
+@@ -11273,7 +11276,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@ -112,7 +112,7 @@ $OpenBSD: patch-configure,v 1.10 2007/06/18 12:31:20 ajacoutot Exp $
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
-@@ -11300,7 +11303,7 @@ fi
+@@ -11322,7 +11325,7 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
 echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
 if test $ac_cv_lib_resolv_res_search = yes; then
@ -121,7 +121,7 @@ $OpenBSD: patch-configure,v 1.10 2007/06/18 12:31:20 ajacoutot Exp $
 fi
 
   SASL_MECHS="$SASL_MECHS libgssapiv2.la"
-@@ -12923,7 +12926,7 @@ if test "${ac_cv_lib_resolv_inet_aton+set}" = set; the
+@@ -12945,7 +12948,7 @@ if test "${ac_cv_lib_resolv_inet_aton+set}" = set; the
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@ -130,7 +130,7 @@ $OpenBSD: patch-configure,v 1.10 2007/06/18 12:31:20 ajacoutot Exp $
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
-@@ -12976,7 +12979,7 @@ if test $ac_cv_lib_resolv_inet_aton = yes; then
+@@ -12998,7 +13001,7 @@ if test $ac_cv_lib_resolv_inet_aton = yes; then
 #define HAVE_LIBRESOLV 1
 _ACEOF
 
--- a/security/cyrus-sasl2/patches/patch-saslauthd_Makefile_in
+++ b/security/cyrus-sasl2/patches/patch-saslauthd_Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-saslauthd_Makefile_in,v 1.8 2007/06/18 12:31:20 ajacoutot Exp $
--- saslauthd/Makefile.in.orig	Fri Jun  1 08:12:05 2007
-+++ saslauthd/Makefile.in	Fri Jun  1 08:13:41 2007
-@@ -621,7 +621,7 @@ saslauthd.8: saslauthd.mdoc
+$OpenBSD: patch-saslauthd_Makefile_in,v 1.9 2009/05/16 09:09:59 ajacoutot Exp $
+--- saslauthd/Makefile.in.orig	Thu May  7 16:25:39 2009
+++ saslauthd/Makefile.in	Sat May 16 10:26:19 2009
+@@ -622,7 +622,7 @@ saslauthd.8: saslauthd.mdoc
 
 install-data-local: saslauthd.8
 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man8
--- a/security/cyrus-sasl2/patches/patch-saslauthd_configure
+++ b/security/cyrus-sasl2/patches/patch-saslauthd_configure
@ -1,6 +1,6 @@
-$OpenBSD: patch-saslauthd_configure,v 1.13 2008/05/14 07:38:42 ajacoutot Exp $
--- saslauthd/configure.orig	Thu May 18 21:30:20 2006
-+++ saslauthd/configure	Wed May 14 09:18:39 2008
+$OpenBSD: patch-saslauthd_configure,v 1.14 2009/05/16 09:09:59 ajacoutot Exp $
+--- saslauthd/configure.orig	Thu May  7 16:25:24 2009
+++ saslauthd/configure	Sat May 16 10:26:19 2009
@@ -753,10 +753,10 @@ ac_env_CC_set=${CC+set}
 ac_env_CC_value=$CC
 ac_cv_env_CC_set=${CC+set}
@ -16,7 +16,7 @@ $OpenBSD: patch-saslauthd_configure,v 1.13 2008/05/14 07:38:42 ajacoutot Exp $
 ac_env_LDFLAGS_set=${LDFLAGS+set}
 ac_env_LDFLAGS_value=$LDFLAGS
 ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-@@ -3617,7 +3617,7 @@ echo "${ECHO_T}$ac_cv_func_res_search" >&6
+@@ -3639,7 +3639,7 @@ echo "${ECHO_T}$ac_cv_func_res_search" >&6
 if test $ac_cv_func_res_search = yes; then
   :
 else
@ -25,7 +25,7 @@ $OpenBSD: patch-saslauthd_configure,v 1.13 2008/05/14 07:38:42 ajacoutot Exp $
 		cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
-@@ -3658,7 +3658,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -3680,7 +3680,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@ -34,7 +34,7 @@ $OpenBSD: patch-saslauthd_configure,v 1.13 2008/05/14 07:38:42 ajacoutot Exp $
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
-@@ -5673,7 +5673,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
+@@ -5695,7 +5695,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@ -43,7 +43,7 @@ $OpenBSD: patch-saslauthd_configure,v 1.13 2008/05/14 07:38:42 ajacoutot Exp $
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
-@@ -5726,7 +5726,7 @@ if test $ac_cv_lib_resolv_res_search = yes; then
+@@ -5748,7 +5748,7 @@ if test $ac_cv_lib_resolv_res_search = yes; then
 #define HAVE_LIBRESOLV 1
 _ACEOF
 
@ -52,7 +52,7 @@ $OpenBSD: patch-saslauthd_configure,v 1.13 2008/05/14 07:38:42 ajacoutot Exp $
 
 fi
 
-@@ -6438,6 +6438,9 @@ if test "$gssapi" != no; then
+@@ -6460,6 +6460,9 @@ if test "$gssapi" != no; then
     *-*-aix*)
       platform=__aix
       ;;
@ -62,7 +62,7 @@ $OpenBSD: patch-saslauthd_configure,v 1.13 2008/05/14 07:38:42 ajacoutot Exp $
     *)
       { echo "$as_me:$LINENO: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&5
 echo "$as_me: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&2;}
-@@ -6452,7 +6455,7 @@ echo "$as_me: error: CyberSafe was forced, cannot cont
+@@ -6474,7 +6477,7 @@ echo "$as_me: error: CyberSafe was forced, cannot cont
   cmu_saved_CPPFLAGS=$CPPFLAGS
 
   if test -d ${gssapi}; then
@ -71,7 +71,7 @@ $OpenBSD: patch-saslauthd_configure,v 1.13 2008/05/14 07:38:42 ajacoutot Exp $
 # We want to keep -I in our CPPFLAGS, but only if we succeed
     cmu_saved_CPPFLAGS=$CPPFLAGS
     LDFLAGS="$LDFLAGS -L$gssapi/lib"
-@@ -6763,7 +6766,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
+@@ -6785,7 +6788,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@ -80,7 +80,7 @@ $OpenBSD: patch-saslauthd_configure,v 1.13 2008/05/14 07:38:42 ajacoutot Exp $
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
-@@ -6816,7 +6819,7 @@ if test $ac_cv_lib_resolv_res_search = yes; then
+@@ -6838,7 +6841,7 @@ if test $ac_cv_lib_resolv_res_search = yes; then
 #define HAVE_LIBRESOLV 1
 _ACEOF
 
@ -89,7 +89,7 @@ $OpenBSD: patch-saslauthd_configure,v 1.13 2008/05/14 07:38:42 ajacoutot Exp $
 
 fi
 
-@@ -7249,12 +7252,12 @@ fi
+@@ -7271,12 +7274,12 @@ fi
   fi
 
   if test "$gss_impl" = "mit"; then
@ -106,7 +106,7 @@ $OpenBSD: patch-saslauthd_configure,v 1.13 2008/05/14 07:38:42 ajacoutot Exp $
   elif test "$gss_impl" = "cybersafe03"; then
 # Version of CyberSafe with two libraries
     CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
-@@ -7444,7 +7447,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
+@@ -7466,7 +7469,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@ -115,7 +115,7 @@ $OpenBSD: patch-saslauthd_configure,v 1.13 2008/05/14 07:38:42 ajacoutot Exp $
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
-@@ -7493,7 +7496,7 @@ fi
+@@ -7515,7 +7518,7 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
 echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
 if test $ac_cv_lib_resolv_res_search = yes; then
@ -124,7 +124,7 @@ $OpenBSD: patch-saslauthd_configure,v 1.13 2008/05/14 07:38:42 ajacoutot Exp $
 fi
 
   SASL_MECHS="$SASL_MECHS libgssapiv2.la"
-@@ -9427,7 +9430,7 @@ fi
+@@ -9449,7 +9452,7 @@ fi
 
 
 
@ -133,7 +133,7 @@ $OpenBSD: patch-saslauthd_configure,v 1.13 2008/05/14 07:38:42 ajacoutot Exp $
 fi
 
 # Check whether --enable-httpform or --disable-httpform was given.
-@@ -9704,7 +9707,7 @@ if test "${ac_cv_lib_resolv_inet_aton+set}" = set; the
+@@ -9726,7 +9729,7 @@ if test "${ac_cv_lib_resolv_inet_aton+set}" = set; the
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@ -142,7 +142,7 @@ $OpenBSD: patch-saslauthd_configure,v 1.13 2008/05/14 07:38:42 ajacoutot Exp $
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
-@@ -9757,7 +9760,7 @@ if test $ac_cv_lib_resolv_inet_aton = yes; then
+@@ -9779,7 +9782,7 @@ if test $ac_cv_lib_resolv_inet_aton = yes; then
 #define HAVE_LIBRESOLV 1
 _ACEOF
 
--- a/security/cyrus-sasl2/pkg/PLIST
+++ b/security/cyrus-sasl2/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.17 2008/03/15 12:50:46 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.18 2009/05/16 09:09:59 ajacoutot Exp $
@conflict cyrus-sasl-*
 include/sasl/
 include/sasl/hmac-md5.h
@ -76,11 +76,11 @@ lib/sasl2/libsasldb.la
@man man/man8/pluginviewer.8
@man man/man8/sasldblistusers2.8
@man man/man8/saslpasswd2.8
-sbin/pluginviewer
-sbin/saslauthd
-sbin/sasldblistusers2
-sbin/saslpasswd2
-sbin/testsaslauthd
+@bin sbin/pluginviewer
+@bin sbin/saslauthd
+@bin sbin/sasldblistusers2
+@bin sbin/saslpasswd2
+@bin sbin/testsaslauthd
 share/doc/sasl2/
 share/doc/sasl2/advanced.html
 share/doc/sasl2/appconvert.html