Skip to content

Commit 2e3132b

Browse files
authored
Autotools: Sync CS in ext/standard (#15560)
- Overquoted arguments reduced - Added missing quotes in algorithms checks - Synced indentations for algorithms checks
1 parent 01c6b48 commit 2e3132b

File tree

1 file changed

+43
-60
lines changed

1 file changed

+43
-60
lines changed

ext/standard/config.m4

Lines changed: 43 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ AC_SEARCH_LIBS([crypt_r], [crypt],
104104
PHP_CRYPT_R_STYLE
105105
AC_CHECK_HEADERS([crypt.h])
106106
107-
AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[
108-
AC_RUN_IFELSE([AC_LANG_SOURCE([[
107+
AC_CACHE_CHECK([for standard DES crypt], [ac_cv_crypt_des],
108+
[AC_RUN_IFELSE([AC_LANG_SOURCE([
109109
#ifdef HAVE_UNISTD_H
110110
#include <unistd.h>
111111
#endif
@@ -120,16 +120,13 @@ AC_CHECK_HEADERS([crypt.h])
120120
int main(void) {
121121
char *encrypted = crypt("rasmuslerdorf","rl");
122122
return !encrypted || strcmp(encrypted,"rl.3StKT.4T8M");
123-
}]])],[
124-
ac_cv_crypt_des=yes
125-
],[
126-
ac_cv_crypt_des=no
127-
],[
128-
ac_cv_crypt_des=yes
129-
])])
130-
131-
AC_CACHE_CHECK(for extended DES crypt, ac_cv_crypt_ext_des,[
132-
AC_RUN_IFELSE([AC_LANG_SOURCE([[
123+
}])],
124+
[ac_cv_crypt_des=yes],
125+
[ac_cv_crypt_des=no],
126+
[ac_cv_crypt_des=yes])])
127+
128+
AC_CACHE_CHECK([for extended DES crypt], [ac_cv_crypt_ext_des],
129+
[AC_RUN_IFELSE([AC_LANG_SOURCE([
133130
#ifdef HAVE_UNISTD_H
134131
#include <unistd.h>
135132
#endif
@@ -144,16 +141,13 @@ int main(void) {
144141
int main(void) {
145142
char *encrypted = crypt("rasmuslerdorf","_J9..rasm");
146143
return !encrypted || strcmp(encrypted,"_J9..rasmBYk8r9AiWNc");
147-
}]])],[
148-
ac_cv_crypt_ext_des=yes
149-
],[
150-
ac_cv_crypt_ext_des=no
151-
],[
152-
ac_cv_crypt_ext_des=no
153-
])])
154-
155-
AC_CACHE_CHECK(for MD5 crypt, ac_cv_crypt_md5,[
156-
AC_RUN_IFELSE([AC_LANG_SOURCE([[
144+
}])],
145+
[ac_cv_crypt_ext_des=yes],
146+
[ac_cv_crypt_ext_des=no],
147+
[ac_cv_crypt_ext_des=no])])
148+
149+
AC_CACHE_CHECK([for MD5 crypt], [ac_cv_crypt_md5],
150+
[AC_RUN_IFELSE([AC_LANG_SOURCE([[
157151
#ifdef HAVE_UNISTD_H
158152
#include <unistd.h>
159153
#endif
@@ -178,16 +172,13 @@ int main(void) {
178172
strcat(answer,"rISCgZzpwk3UhDidwXvin0");
179173
encrypted = crypt("rasmuslerdorf",salt);
180174
return !encrypted || strcmp(encrypted,answer);
181-
}]])],[
182-
ac_cv_crypt_md5=yes
183-
],[
184-
ac_cv_crypt_md5=no
185-
],[
186-
ac_cv_crypt_md5=no
187-
])])
188-
189-
AC_CACHE_CHECK(for Blowfish crypt, ac_cv_crypt_blowfish,[
190-
AC_RUN_IFELSE([AC_LANG_SOURCE([[
175+
}]])],
176+
[ac_cv_crypt_md5=yes],
177+
[ac_cv_crypt_md5=no],
178+
[ac_cv_crypt_md5=no])])
179+
180+
AC_CACHE_CHECK([for Blowfish crypt], [ac_cv_crypt_blowfish],
181+
[AC_RUN_IFELSE([AC_LANG_SOURCE([[
191182
#ifdef HAVE_UNISTD_H
192183
#include <unistd.h>
193184
#endif
@@ -203,22 +194,20 @@ int main(void) {
203194
char salt[30], answer[70];
204195
char *encrypted;
205196
206-
salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0';
197+
salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$';
198+
salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0';
207199
strcat(salt,"rasmuslerd............");
208200
strcpy(answer,salt);
209201
strcpy(&answer[29],"nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra");
210202
encrypted = crypt("rasmuslerdorf",salt);
211203
return !encrypted || strcmp(encrypted,answer);
212-
}]])],[
213-
ac_cv_crypt_blowfish=yes
214-
],[
215-
ac_cv_crypt_blowfish=no
216-
],[
217-
ac_cv_crypt_blowfish=no
218-
])])
219-
220-
AC_CACHE_CHECK(for SHA512 crypt, ac_cv_crypt_sha512,[
221-
AC_RUN_IFELSE([AC_LANG_SOURCE([[
204+
}]])],
205+
[ac_cv_crypt_blowfish=yes],
206+
[ac_cv_crypt_blowfish=no],
207+
[ac_cv_crypt_blowfish=no])])
208+
209+
AC_CACHE_CHECK([for SHA512 crypt], [ac_cv_crypt_sha512],
210+
[AC_RUN_IFELSE([AC_LANG_SOURCE([[
222211
#ifdef HAVE_UNISTD_H
223212
#include <unistd.h>
224213
#endif
@@ -239,16 +228,13 @@ int main(void) {
239228
strcat(answer, "EeHCRjm0bljalWuALHSTs1NB9ipEiLEXLhYeXdOpx22gmlmVejnVXFhd84cEKbYxCo.XuUTrW.RLraeEnsvWs/");
240229
encrypted = crypt("rasmuslerdorf",salt);
241230
return !encrypted || strcmp(encrypted,answer);
242-
}]])],[
243-
ac_cv_crypt_sha512=yes
244-
],[
245-
ac_cv_crypt_sha512=no
246-
],[
247-
ac_cv_crypt_sha512=no
248-
])])
249-
250-
AC_CACHE_CHECK(for SHA256 crypt, ac_cv_crypt_sha256,[
251-
AC_RUN_IFELSE([AC_LANG_SOURCE([[
231+
}]])],
232+
[ac_cv_crypt_sha512=yes],
233+
[ac_cv_crypt_sha512=no],
234+
[ac_cv_crypt_sha512=no])])
235+
236+
AC_CACHE_CHECK([for SHA256 crypt], [ac_cv_crypt_sha256],
237+
[AC_RUN_IFELSE([AC_LANG_SOURCE([[
252238
#ifdef HAVE_UNISTD_H
253239
#include <unistd.h>
254240
#endif
@@ -269,13 +255,10 @@ int main(void) {
269255
strcat(answer, "cFAm2puLCujQ9t.0CxiFIIvFi4JyQx5UncCt/xRIX23");
270256
encrypted = crypt("rasmuslerdorf",salt);
271257
return !encrypted || strcmp(encrypted,answer);
272-
}]])],[
273-
ac_cv_crypt_sha256=yes
274-
],[
275-
ac_cv_crypt_sha256=no
276-
],[
277-
ac_cv_crypt_sha256=no
278-
])])
258+
}]])],
259+
[ac_cv_crypt_sha256=yes],
260+
[ac_cv_crypt_sha256=no],
261+
[ac_cv_crypt_sha256=no])])
279262
280263
if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "$ac_cv_crypt_md5" = "no" || test "$ac_cv_crypt_sha512" = "no" || test "$ac_cv_crypt_sha256" = "no"; then
281264
AC_MSG_FAILURE([Cannot use external libcrypt as some algo are missing.])

0 commit comments

Comments
 (0)