From b0716eac4e800a0ea53e1b949250f671702f28a0 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 30 Oct 2012 15:39:24 -0400 Subject: apply workaround to CVE-2012-4527 --- mcrypt-2.6.8.orig/src/mcrypt.c +++ mcrypt-2.6.8/src/mcrypt.c @@ -41,6 +41,8 @@ # include #endif +#define WIDTH 80 + static char rcsid[] = "$Id: mcrypt.c,v 1.2 2007/11/07 17:10:21 nmav Exp $"; @@ -482,7 +484,7 @@ #ifdef HAVE_STAT if (stream_flag == FALSE) { if (is_normal_file(file[i]) == FALSE) { - sprintf(tmperr, + snprintf(tmperr, WIDTH, _ ("%s: %s is not a regular file. Skipping...\n"), program_name, file[i]); @@ -501,7 +503,7 @@ dinfile = file[i]; if ((isatty(fileno((FILE *) (stdin))) == 1) && (stream_flag == TRUE) && (force == 0)) { /* not a tty */ - sprintf(tmperr, + snprintf(tmperr, WIDTH, _ ("%s: Encrypted data will not be read from a terminal.\n"), program_name); @@ -520,7 +522,7 @@ einfile = file[i]; if ((isatty(fileno((FILE *) (stdout))) == 1) && (stream_flag == TRUE) && (force == 0)) { /* not a tty */ - sprintf(tmperr, + snprintf(tmperr, WIDTH, _ ("%s: Encrypted data will not be written to a terminal.\n"), program_name); @@ -544,7 +546,7 @@ strcpy(outfile, einfile); /* if file has already the .nc ignore it */ if (strstr(outfile, ".nc") != NULL) { - sprintf(tmperr, + snprintf(tmperr, WIDTH, _ ("%s: file %s has the .nc suffix... skipping...\n"), program_name, outfile); @@ -590,10 +592,10 @@ if (x == 0) { if (stream_flag == FALSE) { - sprintf(tmperr, _("File %s was decrypted.\n"), dinfile); + snprintf(tmperr, WIDTH, _("File %s was decrypted.\n"), dinfile); err_warn(tmperr); } else { - sprintf(tmperr, _("Stdin was decrypted.\n")); + snprintf(tmperr, WIDTH, _("Stdin was decrypted.\n")); err_warn(tmperr); } #ifdef HAVE_STAT @@ -610,7 +612,7 @@ } else { if (stream_flag == FALSE) { - sprintf(tmperr, + snprintf(tmperr, WIDTH, _ ("File %s was NOT decrypted successfully.\n"), dinfile); @@ -636,10 +638,10 @@ if (x == 0) { if (stream_flag == FALSE) { - sprintf(tmperr, _("File %s was encrypted.\n"), einfile); + snprintf(tmperr, WIDTH, _("File %s was encrypted.\n"), einfile); err_warn(tmperr); } else { - sprintf(tmperr, _("Stdin was encrypted.\n")); + snprintf(tmperr, WIDTH, _("Stdin was encrypted.\n")); err_warn(tmperr); } #ifdef HAVE_STAT @@ -655,7 +657,7 @@ } else { if (stream_flag == FALSE) { - sprintf(tmperr, + snprintf(tmperr, WIDTH, _ ("File %s was NOT encrypted successfully.\n"), einfile); - git v0.12 gsubject'>gnu: Switch from recordproto to xorgproto.Marius Bakke * gnu/packages/xnee.scm (xnee)[inputs]: Remove RECORDPROTO. * gnu/packages/xorg.scm (recordproto)[properties]: Mark as superseded by XORGPROTO. (libxtst)[propagated-inputs]: Replace RECORDPROTO with XORGPROTO. [inputs]: Remove XORGPROTO. * gnu/packages/xorg.scm (xorg-server)[inputs]: Remove RECORDPROTO. 2018-03-18gnu: Switch from inputproto to xorgproto.Marius Bakke * gnu/packages/gl.scm (freeglut)[inputs]: Replace INPUTPROTO with XORGPROTO. * gnu/packages/ratpoison.scm (ratpoison)[inputs]: Remove INPUTPROTO. * gnu/packages/xdisorg.scm (xautomation)[native-inputs]: Likewise. * gnu/packages/xnee.scm (xnee)[inputs]: Likewise. * gnu/packages/xorg.scm (inputproto)[properties]: Mark as superseded by XORGPROTO. (xdpyinfo, xinput, libxtst)[inputs]: Replace INPUTPROTO with XORGPROTO. (libxi, xorg-server)[propagated-inputs]: Remove INPUTPROTO. (xkbutils, libx11)[inputs]: Likewise. 2018-03-18gnu: Switch from xextproto to xorgproto.Marius Bakke * gnu/packages/enlightenment.scm (efl)[inputs]: Remove XEXTPROTO. * gnu/packages/mate.scm (mate-control-center, mate-screensaver, mate-utils)[native-inputs]: Likewise. * gnu/packages/xdisorg.scm (xautomation)[inputs]: Likewise. * gnu/packages/gtk.scm (cairo)[inputs]: Replace XEXTPROTO with XORGPROTO. * gnu/packages/ratpoison.scm (ratpoison)[inputs]: Likewise. * gnu/packages/xnee.scm (xnee)[inputs]: Likewise. * gnu/packages/xorg.scm (libdmx, libwindowswm, fixesproto, libxext, libx11)[inputs]: Likewise. (xorg-server): [inputs]: Remove XEXTPROTO. (libxext)[properties]: Mark as superseded by XORGPROTO. 2018-03-18gnu: Switch from xproto to xorgproto.Marius Bakke * gnu/packages/compton.scm (compton)[inputs]: Replace XPROTO with XORGPROTO. * gnu/packages/enlightenment.scm (efl)[inputs]: Likewise. * gnu/packages/gnome.scm (totem)[inputs]: Likewise. * gnu/packages/haskell.scm (ghc-x11-xft)[inputs]: Likewise. * gnu/packages/image-processing.scm (vtk)[inputs]: Likewise. * gnu/packages/mate.scm (mate-control-center, mate-netbook, mate-screensaver, mate-utils)[native-inputs]: Likewise. * gnu/packages/xdisorg.scm (xautomation)[native-inputs]: Likewise. * gnu/packages/xnee.scm (xnee)[inputs]: Likewise. * gnu/packages/xorg.scm (imake, lndir, libxshmfence, libfontenc, libfs, libxcomposite, libxdmcp, libxft, libxmu, libxpm, libxres, makedepend, mkfontscale, sessreg, xev, xf86-video-qxl, xkbcomp-intermediate, xkbutils, xlsfonts, xmodmap, xpr, xprop, xrandr, xset, xwd, xwininfo, xwud, xorg-rgb, libxdamage, libxrender, libxv, libice, libxau, libxfixes, libxfont, libxi, libxrandr, libxvmc, xorg-server, libxcursor, libxaw, twm, xinit, xterm)[inputs]: Likewise. (xorgproto): Move expression before all other -proto packages. (xproto)[properties]: Mark as superseded by XORGPROTO. 2017-03-30gnu: Use HTTPS for almost all gnu.org HOME-PAGEs.Tobias Geerinckx-Rice All HTTP gnu.org (and supported subdomain) HOME-PAGEs changed to HTTPS.