more updates to ssp.c

3 files changed, 18 insertions, 25 deletions

diff --git a/dev-libs/uclibc/ChangeLog b/dev-libs/uclibc/ChangeLog
index 795ee86f2bc5..9b77e09c9ccf 100644
--- a/dev-libs/uclibc/ChangeLog
+++ b/dev-libs/uclibc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/uclibc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/ChangeLog,v 1.38 2004/10/12 18:48:24 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/ChangeLog,v 1.39 2004/10/13 14:40:10 solar Exp $
+
+  13 Oct 2004; <solar@gentoo.org> files/0.9.26/ssp.c:
+  more updates to ssp.c
 
   12 Oct 2004; <solar@gentoo.org> files/0.9.26/ssp.c:
   reverting to old ssp behavior
diff --git a/dev-libs/uclibc/Manifest b/dev-libs/uclibc/Manifest
index e13d744906f5..2375e47c8b00 100644
--- a/dev-libs/uclibc/Manifest
+++ b/dev-libs/uclibc/Manifest
@@ -13,8 +13,8 @@ MD5 b6e51a393cae9daddfda7e1eabadb679 uclibc-0.9.26-r3.ebuild 6348
 SHA1 e0dea22da01c6ae3ce3714914d495985dcf3763b uclibc-0.9.26-r3.ebuild 6348
 MD5 ed4d6b2b5413c7372255c768f51e7446 uclibc-0.9.26-r5.ebuild 7659
 SHA1 7c186d52132277548362e9f83a46416b157d4050 uclibc-0.9.26-r5.ebuild 7659
-MD5 b1baab1a99312968755f445488d43463 ChangeLog 7379
-SHA1 cf52d3bb07cc0f3c884f948fd1aed893ee095e4a ChangeLog 7379
+MD5 798951407cdc11c262d9b2a5020927da ChangeLog 7458
+SHA1 d2d873994063f0d7afc6e173abdee1c46184167d ChangeLog 7458
 MD5 7fde305dfd21aeac12e0eb721e0f6a17 uclibc-0.9.21.ebuild 1096
 SHA1 79e8364b3121e5330db6ef8a7f56a4e836765ad5 uclibc-0.9.21.ebuild 1096
 MD5 e96b4dfc373a1cdf7735aeae52c4cf7e metadata.xml 999
@@ -57,8 +57,8 @@ MD5 f7c264d37687f1a32f1c6e31239f2276 files/0.9.26/uclibc-0.9.26-noexecstack.patc
 SHA1 312eafbf80f65b48d6b0b2c91e87525b2b2942e8 files/0.9.26/uclibc-0.9.26-noexecstack.patch 15273
 MD5 6835449424e7a8a38e9c85ecf1b73577 files/0.9.26/arm-ucontext.patch 303
 SHA1 d55b17abe035d41536e188d694a84ebd1f974460 files/0.9.26/arm-ucontext.patch 303
-MD5 69311d6a5b7e294a3b77b74eb824c2e3 files/0.9.26/ssp.c 4150
-SHA1 34af2b4cff979164ab503fa2482484af25800cca files/0.9.26/ssp.c 4150
+MD5 46d965d8bdfe981f75fb8696799d9d2a files/0.9.26/ssp.c 3937
+SHA1 baa3cfb22659ee357c5a9dff68b8bea4f0a22d6b files/0.9.26/ssp.c 3937
 MD5 7ff9f1e05cdfbbe0e156ea81bf8b55ee files/0.9.26/uClibc-20040921-ldso-unsecvars.patch 1024
 SHA1 e979dcc6d00a0a1bdfbd86a55ada46b7b09ccd80 files/0.9.26/uClibc-20040921-ldso-unsecvars.patch 1024
 MD5 a503ef49001f5f67d61cd40b0809fb76 files/0.9.26/unsecvars.h 682
@@ -82,7 +82,7 @@ SHA1 7f1280a65ad54932ab4bf0857158e0aec488530f files/0.9.26/uclibc-0.9.26-arm-dl-
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD4DBQFBbCax94CCfB4KcwwRAi/TAKCzfuSxtGXcKv3T04EnRG2Gobh/9QCVF7gc
-i5SGv+KYo4vQhMFScB5jpg==
-=oz1N
+iD8DBQFBbT4B94CCfB4KcwwRAtasAJwI3vcOy0wZzOCezu3fEjdKp0SHtQCeNoNH
+7OF7RescCG+OpHHMczcikFE=
+=t4hl
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/uclibc/files/0.9.26/ssp.c b/dev-libs/uclibc/files/0.9.26/ssp.c
index 9a62751d48bc..753eaaea4c8c 100644
--- a/dev-libs/uclibc/files/0.9.26/ssp.c
+++ b/dev-libs/uclibc/files/0.9.26/ssp.c
@@ -1,6 +1,6 @@
 /*
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/files/0.9.26/ssp.c,v 1.3 2004/10/12 18:48:24 solar Exp $
+ * $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/files/0.9.26/ssp.c,v 1.4 2004/10/13 14:40:10 solar Exp $
  *
  * This is a modified version of Hiroaki Etoh's stack smashing routines
  * implemented for glibc.
@@ -46,16 +46,6 @@
 
 unsigned long __guard = 0UL;
 
-#if 1
- #define SSP_open  open
- #define SSP_close close
- #define SSP_write write
-#else
- #define SSP_open  __libc_open
- #define SSP_close __libc_close
- #define SSP_write __libc_write
-#endif
-
 void
 __guard_setup (void)
 {
@@ -86,13 +76,13 @@ __guard_setup (void)
   {
     int fd;
 #ifdef HAVE_DEV_ERANDOM
-    if ((fd = SSP_open ("/dev/erandom", O_RDONLY)) == (-1))
+    if ((fd = open ("/dev/erandom", O_RDONLY)) == (-1))
 #endif
-      fd = SSP_open ("/dev/urandom", O_RDONLY);
+      fd = open ("/dev/urandom", O_RDONLY);
     if (fd != (-1))
       {
-	size = SSP_read (fd, (char *) &__guard, sizeof (__guard));
-	SSP_close (fd);
+	size = read (fd, (char *) &__guard, sizeof (__guard));
+	close (fd);
 	if (size == sizeof (__guard))
 	  return;
       }
@@ -147,8 +137,8 @@ __stack_smash_handler (char func[], int damaged)
     }
 
   /* print error message */
-  SSP_write (STDERR_FILENO, buf + 3, len - 3);
-  SSP_write (STDERR_FILENO, "()\n", 3);
+  write (STDERR_FILENO, buf + 3, len - 3);
+  write (STDERR_FILENO, "()\n", 3);
   if ((log = socket (AF_UNIX, SOCK_DGRAM, 0)) != -1)
     {
       /* Send "found" message to the "/dev/log" path */