diff options
author | Anton Blanchard <anton@samba.org> | 2016-03-03 17:28:34 +0100 |
---|---|---|
committer | Nikita Popov <nikic@php.net> | 2016-03-03 17:28:34 +0100 |
commit | ccd215a51788dd8971baf47ea90224888b3a022f (patch) | |
tree | e52976564154ace663408657fbd730ae90871b00 | |
parent | 08fce8e2c5de358b9552adf94302f0f798a48d89 (diff) | |
download | php-git-ccd215a51788dd8971baf47ea90224888b3a022f.tar.gz |
Additional improvements to crypt() detection code
Reformat to normalize tabs vs spaces, return 1 if crypt.h not
defined, fix C99 compliance.
-rw-r--r-- | ext/standard/config.m4 | 103 |
1 files changed, 53 insertions, 50 deletions
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index 2a4218b370..6e0c92197f 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -69,12 +69,12 @@ AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[ #include <crypt.h> #endif -main() { +int main() { #if HAVE_CRYPT - char* encrypted = crypt("rasmuslerdorf","rl"); - exit (!encrypted || strcmp(encrypted,"rl.3StKT.4T8M")); + char *encrypted = crypt("rasmuslerdorf","rl"); + exit(!encrypted || strcmp(encrypted,"rl.3StKT.4T8M")); #else - exit(0); + exit(1); #endif }],[ ac_cv_crypt_des=yes @@ -94,12 +94,12 @@ AC_CACHE_CHECK(for extended DES crypt, ac_cv_crypt_ext_des,[ #include <crypt.h> #endif -main() { +int main() { #if HAVE_CRYPT - char* encrypted = crypt("rasmuslerdorf","_J9..rasm"); - exit (!encrypted || strcmp(encrypted,"_J9..rasmBYk8r9AiWNc")); + char *encrypted = crypt("rasmuslerdorf","_J9..rasm"); + exit(!encrypted || strcmp(encrypted,"_J9..rasmBYk8r9AiWNc")); #else - exit(0); + exit(1); #endif }],[ ac_cv_crypt_ext_des=yes @@ -119,21 +119,22 @@ AC_TRY_RUN([ #include <crypt.h> #endif -main() { +int main() { #if HAVE_CRYPT - char salt[15], answer[40]; - - salt[0]='$'; salt[1]='1'; salt[2]='$'; - salt[3]='r'; salt[4]='a'; salt[5]='s'; - salt[6]='m'; salt[7]='u'; salt[8]='s'; - salt[9]='l'; salt[10]='e'; salt[11]='$'; - salt[12]='\0'; - strcpy(answer,salt); - strcat(answer,"rISCgZzpwk3UhDidwXvin0"); - char* encrypted = crypt("rasmuslerdorf",salt); - exit (!encrypted || strcmp(encrypted,answer)); + char salt[15], answer[40]; + char *encrypted; + + salt[0]='$'; salt[1]='1'; salt[2]='$'; + salt[3]='r'; salt[4]='a'; salt[5]='s'; + salt[6]='m'; salt[7]='u'; salt[8]='s'; + salt[9]='l'; salt[10]='e'; salt[11]='$'; + salt[12]='\0'; + strcpy(answer,salt); + strcat(answer,"rISCgZzpwk3UhDidwXvin0"); + encrypted = crypt("rasmuslerdorf",salt); + exit(!encrypted || strcmp(encrypted,answer)); #else - exit(0); + exit(1); #endif }],[ ac_cv_crypt_md5=yes @@ -153,18 +154,19 @@ AC_TRY_RUN([ #include <crypt.h> #endif -main() { +int main() { #if HAVE_CRYPT - char salt[30], answer[70]; - - salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0'; - strcat(salt,"rasmuslerd............"); - strcpy(answer,salt); - strcpy(&answer[29],"nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra"); - char* encrypted = crypt("rasmuslerdorf",salt); - exit (!encrypted || strcmp(encrypted,answer)); + char salt[30], answer[70]; + char *encrypted; + + salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0'; + strcat(salt,"rasmuslerd............"); + strcpy(answer,salt); + strcpy(&answer[29],"nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra"); + encrypted = crypt("rasmuslerdorf",salt); + exit(!encrypted || strcmp(encrypted,answer)); #else - exit(0); + exit(1); #endif }],[ ac_cv_crypt_blowfish=yes @@ -184,17 +186,18 @@ AC_TRY_RUN([ #include <crypt.h> #endif -main() { +int main() { #if HAVE_CRYPT - char salt[21], answer[21+86]; - - strcpy(salt,"\$6\$rasmuslerdorf\$"); - strcpy(answer, salt); - strcat(answer, "EeHCRjm0bljalWuALHSTs1NB9ipEiLEXLhYeXdOpx22gmlmVejnVXFhd84cEKbYxCo.XuUTrW.RLraeEnsvWs/"); - char* encrypted = crypt("rasmuslerdorf",salt); - exit (!encrypted || strcmp(encrypted,answer)); + char salt[21], answer[21+86]; + char *encrypted; + + strcpy(salt,"\$6\$rasmuslerdorf\$"); + strcpy(answer, salt); + strcat(answer, "EeHCRjm0bljalWuALHSTs1NB9ipEiLEXLhYeXdOpx22gmlmVejnVXFhd84cEKbYxCo.XuUTrW.RLraeEnsvWs/"); + encrypted = crypt("rasmuslerdorf",salt); + exit(!encrypted || strcmp(encrypted,answer)); #else - exit(0); + exit(1); #endif }],[ ac_cv_crypt_sha512=yes @@ -214,18 +217,18 @@ AC_TRY_RUN([ #include <crypt.h> #endif -main() { +int main() { #if HAVE_CRYPT - char salt[21], answer[21+43]; - - strcpy(salt,"\$5\$rasmuslerdorf\$"); - strcpy(answer, salt); - strcat(answer, "cFAm2puLCujQ9t.0CxiFIIvFi4JyQx5UncCt/xRIX23"); - char* encrypted = crypt("rasmuslerdorf",salt); - exit (!encrypted || strcmp(encrypted,answer)); - + char salt[21], answer[21+43]; + char *encrypted; + + strcpy(salt,"\$5\$rasmuslerdorf\$"); + strcpy(answer, salt); + strcat(answer, "cFAm2puLCujQ9t.0CxiFIIvFi4JyQx5UncCt/xRIX23"); + encrypted = crypt("rasmuslerdorf",salt); + exit(!encrypted || strcmp(encrypted,answer)); #else - exit(0); + exit(1); #endif }],[ ac_cv_crypt_sha256=yes |