CVS update: php3

Date: Monday September 21, 1998 @ 18:35 Author: rasmus Update of /repository/php3 In directory asf:/u2/tmp/cvs-serv4901 Modified Files: acconfig.h aclocal.m4 config.h.in Log Message: Ok, these are finally working. Now to look at the crypt code to actually make use of these defines. Index: php3/acconfig.h diff -c php3/acconfig.h:1.65 php3/acconfig.h:1.66 *** php3/acconfig.h:1.65 Sat Sep 19 16:17:28 1998 --- php3/acconfig.h Mon Sep 21 18:35:50 1998 *************** *** 16,21 **** --- 16,27 ---- /* type check for in_addr_t */ #undef in_addr_t + /* crypt capability checks */ + #undef PHP3_STD_DES_CRYPT + #undef PHP3_EXT_DES_CRYPT + #undef PHP3_MD5_CRYPT + #undef PHP3_BLOWFISH_CRYPT + /* Define if you have dirent.h but opendir() resides in libc rather than in libdir */ /* This will cause HAVE_DIRENT_H defined twice sometimes, but it should be problem */ #define HAVE_DIRENT_H 0 Index: php3/aclocal.m4 diff -c php3/aclocal.m4:1.24 php3/aclocal.m4:1.25 *** php3/aclocal.m4:1.24 Mon Sep 21 18:04:30 1998 --- php3/aclocal.m4 Mon Sep 21 18:35:50 1998 *************** *** 1,4 **** ! dnl $Id: aclocal.m4,v 1.24 1998/09/21 22:04:30 rasmus Exp $ dnl dnl This file contains local autoconf functions. --- 1,4 ---- ! dnl $Id: aclocal.m4,v 1.25 1998/09/21 22:35:50 rasmus Exp $ dnl dnl This file contains local autoconf functions. *************** *** 121,133 **** main() { exit (strcmp((char *)crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M")); }],[ ! AC_DEFINE(STD_DES_CRYPT,1) AC_MSG_RESULT(ok) ],[ ! AC_DEFINE(STD_DES_CRYPT,0) AC_MSG_RESULT(fail) ],[ ! AC_DEFINE(STD_DES_CRYPT,1) AC_MSG_RESULT(cannot check, guessing ok) ]) --- 121,133 ---- main() { exit (strcmp((char *)crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M")); }],[ ! AC_DEFINE(PHP3_STD_DES_CRYPT,1) AC_MSG_RESULT(ok) ],[ ! AC_DEFINE(PHP3_STD_DES_CRYPT,0) AC_MSG_RESULT(fail) ],[ ! AC_DEFINE(PHP3_STD_DES_CRYPT,1) AC_MSG_RESULT(cannot check, guessing ok) ]) *************** *** 136,148 **** main() { exit (strcmp((char *)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc")); }],[ ! AC_DEFINE(EXT_DES_CRYPT,1) AC_MSG_RESULT(ok) ],[ ! AC_DEFINE(EXT_DES_CRYPT,0) AC_MSG_RESULT(fail) ],[ ! AC_DEFINE(EXT_DES_CRYPT,0) AC_MSG_RESULT(cannot check, guessing fail) ]) --- 136,148 ---- main() { exit (strcmp((char *)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc")); }],[ ! AC_DEFINE(PHP3_EXT_DES_CRYPT,1) AC_MSG_RESULT(ok) ],[ ! AC_DEFINE(PHP3_EXT_DES_CRYPT,0) AC_MSG_RESULT(fail) ],[ ! AC_DEFINE(PHP3_EXT_DES_CRYPT,0) AC_MSG_RESULT(cannot check, guessing fail) ]) *************** *** 160,193 **** strcat(answer,"rISCgZzpwk3UhDidwXvin0"); exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); }],[ ! AC_DEFINE(MD5_CRYPT,1) AC_MSG_RESULT(ok) ],[ ! AC_DEFINE(MD5_CRYPT,0) AC_MSG_RESULT(fail) ],[ ! AC_DEFINE(MD5_CRYPT,0) AC_MSG_RESULT(cannot check, guessing fail) ]) AC_MSG_CHECKING([for Blowfish crypt]) AC_TRY_RUN([ main() { ! char salt[25], answer[60]; salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0'; ! strcat(salt,"rasmuslerdorf"); ! strncpy(answer,salt,19); ! strcat(answer,"..........mSZzvO8z3s/MMTixItx1MGqktlZgPja"); exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); }],[ ! AC_DEFINE(BLOW_CRYPT,1) AC_MSG_RESULT(ok) ],[ ! AC_DEFINE(BLOW_CRYPT,0) AC_MSG_RESULT(fail) ],[ ! AC_DEFINE(BLOW_CRYPT,0) AC_MSG_RESULT(cannot check, guessing fail) ]) ]) --- 160,193 ---- strcat(answer,"rISCgZzpwk3UhDidwXvin0"); exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); }],[ ! AC_DEFINE(PHP3_MD5_CRYPT,1) AC_MSG_RESULT(ok) ],[ ! AC_DEFINE(PHP3_MD5_CRYPT,0) AC_MSG_RESULT(fail) ],[ ! AC_DEFINE(PHP3_MD5_CRYPT,0) AC_MSG_RESULT(cannot check, guessing fail) ]) AC_MSG_CHECKING([for Blowfish crypt]) AC_TRY_RUN([ main() { ! char salt[25], 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[16],"O............gl95GkTKn53Of.H4YchXl5PwvvW.5ri"); exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); }],[ ! AC_DEFINE(PHP3_BLOWFISH_CRYPT,1) AC_MSG_RESULT(ok) ],[ ! AC_DEFINE(PHP3_BLOWFISH_CRYPT,0) AC_MSG_RESULT(fail) ],[ ! AC_DEFINE(PHP3_BLOWFISH_CRYPT,0) AC_MSG_RESULT(cannot check, guessing fail) ]) ]) Index: php3/config.h.in diff -c php3/config.h.in:1.115 php3/config.h.in:1.116 *** php3/config.h.in:1.115 Sat Sep 19 16:17:28 1998 --- php3/config.h.in Mon Sep 21 18:35:51 1998 *************** *** 83,88 **** --- 83,94 ---- /* type check for in_addr_t */ #undef in_addr_t + /* crypt capability checks */ + #undef PHP3_STD_DES_CRYPT + #undef PHP3_EXT_DES_CRYPT + #undef PHP3_MD5_CRYPT + #undef PHP3_BLOWFISH_CRYPT + /* Define if you have the resolv library (-lresolv). */ #define HAVE_LIBRESOLV 0 -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net