[PHP-CVS] com php-src: fix broken sha2 configure tests: ext/standard/config.m4

[Michael Wallner]

Commit:2e692b22e92e26f6224e313864105ad1d9c4585d
Author:Michael Wallner m...@php.net Fri, 13 Sep 2013 12:54:42 
+0200
Parents:   ef9e003b0c30e704073f125632e916e927363426
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=2e692b22e92e26f6224e313864105ad1d9c4585d

Log:
fix broken sha2 configure tests

see 
http://patch-tracker.debian.org/patch/series/view/php5/5.5.3+dfsg-1/fix_broken_sha2_test.patch

Changed paths:
  M  ext/standard/config.m4


Diff:
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index 2af2209..3d00d88 100644
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -182,12 +182,12 @@ AC_TRY_RUN([
 
 main() {
 #if HAVE_CRYPT
-char salt[30], answer[80];
-
-salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]='$'; salt[4]='b'; 
salt[5]='a'; salt[6]='r'; salt[7]='\0';
+char salt[21], answer[21+86];
+
+strcpy(salt,\$6\$rasmuslerdorf\$);
 strcpy(answer, salt);
-
strcpy(answer[29],$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu.);
-exit (strcmp((char *)crypt(foo,salt),answer));
+strcat(answer, 
EeHCRjm0bljalWuALHSTs1NB9ipEiLEXLhYeXdOpx22gmlmVejnVXFhd84cEKbYxCo.XuUTrW.RLraeEnsvWs/);
+exit (strcmp((char *)crypt(rasmuslerdorf,salt),answer));
 #else
exit(0);
 #endif
@@ -211,12 +211,13 @@ AC_TRY_RUN([
 
 main() {
 #if HAVE_CRYPT
-char salt[30], answer[80];
-salt[0]='$'; salt[1]='5'; salt[2]='$'; salt[3]='$'; salt[4]='s'; 
salt[5]='a'; salt[6]='l'; salt[7]='t';  salt[8]='s'; salt[9]='t'; salt[10]='r'; 
salt[11]='i'; salt[12]='n'; salt[13]='g'; salt[14]='\0';
-strcat(salt,);
+char salt[21], answer[21+43];
+
+strcpy(salt,\$5\$rasmuslerdorf\$);
 strcpy(answer, salt);
-strcpy(answer[29], 
$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5);
-exit (strcmp((char *)crypt(foo,salt),answer));
+strcat(answer, cFAm2puLCujQ9t.0CxiFIIvFi4JyQx5UncCt/xRIX23);
+exit (strcmp((char *)crypt(rasmuslerdorf,salt),answer));
+
 #else
exit(0);
 #endif


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: fix broken sha2 configure tests: ext/standard/config.m4

[Michael Wallner]

Commit:9eaffd34c123ae5782054cd32bf6caa50ff2b7d2
Author:Michael Wallner m...@php.net Fri, 13 Sep 2013 12:54:42 
+0200
Parents:   d76959a3b976a0d9f0be994451fd7d5a6def3204
Branches:  PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=9eaffd34c123ae5782054cd32bf6caa50ff2b7d2

Log:
fix broken sha2 configure tests

see 
http://patch-tracker.debian.org/patch/series/view/php5/5.5.3+dfsg-1/fix_broken_sha2_test.patch

Changed paths:
  M  ext/standard/config.m4


Diff:
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index 2af2209..3d00d88 100644
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -182,12 +182,12 @@ AC_TRY_RUN([
 
 main() {
 #if HAVE_CRYPT
-char salt[30], answer[80];
-
-salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]='$'; salt[4]='b'; 
salt[5]='a'; salt[6]='r'; salt[7]='\0';
+char salt[21], answer[21+86];
+
+strcpy(salt,\$6\$rasmuslerdorf\$);
 strcpy(answer, salt);
-
strcpy(answer[29],$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu.);
-exit (strcmp((char *)crypt(foo,salt),answer));
+strcat(answer, 
EeHCRjm0bljalWuALHSTs1NB9ipEiLEXLhYeXdOpx22gmlmVejnVXFhd84cEKbYxCo.XuUTrW.RLraeEnsvWs/);
+exit (strcmp((char *)crypt(rasmuslerdorf,salt),answer));
 #else
exit(0);
 #endif
@@ -211,12 +211,13 @@ AC_TRY_RUN([
 
 main() {
 #if HAVE_CRYPT
-char salt[30], answer[80];
-salt[0]='$'; salt[1]='5'; salt[2]='$'; salt[3]='$'; salt[4]='s'; 
salt[5]='a'; salt[6]='l'; salt[7]='t';  salt[8]='s'; salt[9]='t'; salt[10]='r'; 
salt[11]='i'; salt[12]='n'; salt[13]='g'; salt[14]='\0';
-strcat(salt,);
+char salt[21], answer[21+43];
+
+strcpy(salt,\$5\$rasmuslerdorf\$);
 strcpy(answer, salt);
-strcpy(answer[29], 
$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5);
-exit (strcmp((char *)crypt(foo,salt),answer));
+strcat(answer, cFAm2puLCujQ9t.0CxiFIIvFi4JyQx5UncCt/xRIX23);
+exit (strcmp((char *)crypt(rasmuslerdorf,salt),answer));
+
 #else
exit(0);
 #endif


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php