Attachment 1579 Details for Bug 1538 – Fixed patch

[patch] Fixed patch

ssh-stack-protect.diff (text/plain), 1.95 KB, created by Damien Miller on 2008-11-19 15:29:50 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2008-11-19 15:29:50 AEDT

Size: 1.95 KB

patch

obsolete

>? somebug
>? ssh-jpake-wip-06.diff
>? ssh-jpake-wip-07.diff
>? tun-req-delay.diff
>? x
>Index: Makefile.in
>===================================================================
>RCS file: /var/cvs/openssh/Makefile.in,v
>retrieving revision 1.298
>diff -u -p -r1.298 Makefile.in
>--- Makefile.in	5 Nov 2008 05:20:46 -0000	1.298
>+++ Makefile.in	19 Nov 2008 04:27:57 -0000
>@@ -41,7 +41,7 @@ PATHS= -DSSHDIR=\"$(sysconfdir)\" \
> 
> CC=@CC@
> LD=@LD@
>-CFLAGS=@CFLAGS@
>+CFLAGS=@CFLAGS@ -DJPAKE
> CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
> LIBS=@LIBS@
> SSHDLIBS=@SSHDLIBS@
>Index: configure.ac
>===================================================================
>RCS file: /var/cvs/openssh/configure.ac,v
>retrieving revision 1.409
>diff -u -p -r1.409 configure.ac
>--- configure.ac	9 Jul 2008 11:07:19 -0000	1.409
>+++ configure.ac	19 Nov 2008 04:27:58 -0000
>@@ -126,7 +126,7 @@ int main(void){char b[10]; memset(b, 0, 
> 
> 	# -fstack-protector-all doesn't always work for some GCC versions
> 	# and/or platforms, so we test if we can.  If it's not supported
>-	# on a give platform gcc will emit a warning so we use -Werror.
>+	# on a given platform gcc will emit a warning so we use -Werror.
> 	if test "x$use_stack_protector" = "x1"; then
> 	    for t in -fstack-protector-all -fstack-protector; do
> 		AC_MSG_CHECKING(if $CC supports $t)
>@@ -136,8 +136,8 @@ int main(void){char b[10]; memset(b, 0, 
> 		LDFLAGS="$LDFLAGS $t -Werror"
> 		AC_LINK_IFELSE(
> 			[AC_LANG_SOURCE([
>-#include <stdlib.h>
>-int main(void){return 0;}
>+#include <stdio.h>
>+int main(void){char x@<:@256@:>@; snprintf(x, sizeof(x), "XXX"); return 0;}
> 			 ])],
> 		    [ AC_MSG_RESULT(yes)
> 		      CFLAGS="$saved_CFLAGS $t"
>@@ -145,8 +145,8 @@ int main(void){return 0;}
> 		      AC_MSG_CHECKING(if $t works)
> 		      AC_RUN_IFELSE(
> 			[AC_LANG_SOURCE([
>-#include <stdlib.h>
>-int main(void){exit(0);}
>+#include <stdio.h>
>+int main(void){char x@<:@256@:>@; snprintf(x, sizeof(x), "XXX"); return 0;}
> 			])],
> 			[ AC_MSG_RESULT(yes)
> 			  break ],

Actions: View | Diff

Attachments on bug 1538: 1579 | 1580