 |
 |
 |
 |
|
|
Date: 01/26/99
- Next message: timothy: "[PHP-DEV] CVS update: php3/functions"
- Previous message: Bug Database: "[PHP-DEV] Bug #1097 Updated: (0 =="
- Next in thread: timothy: "[PHP-DEV] CVS update: php3"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Tuesday January 26, 1999 @ 17:17
Author: timothy
Update of /repository/php3
In directory asf:/u/temp/cvs-serv27409
Modified Files:
Makefile.in acconfig.h configure.in internal_functions.c
Log Message:
Yipes! This is my first commit ever. This is to add
functions/php3_mckcrypt.c and functions/php3_mckcrypt.h
make usual changes to configure.in, etc.
add --with-mck so that you have to compile this with cybercash's
libmckcrypt.a. This adds functionality to do encryption. I have full
cybercash api, but its all done in php making use of this for the encryption.
Will post it soon as a show of how to use these functions. On the bad side
this does create new base64 functions, but there was no way to seperate them
out of cybercash's lib, so I went ahead and wrote php function names.
Index: php3/Makefile.in
diff -c php3/Makefile.in:1.284 php3/Makefile.in:1.285
*** php3/Makefile.in:1.284 Fri Jan 15 13:38:34 1999
--- php3/Makefile.in Tue Jan 26 17:17:52 1999
***************
*** 24,30 ****
# +----------------------------------------------------------------------+
#
! # $Id: Makefile.in,v 1.284 1999/01/15 18:38:34 alex Exp $
#
prefix = <email protected>@
--- 24,30 ----
# +----------------------------------------------------------------------+
#
! # $Id: Makefile.in,v 1.285 1999/01/26 22:17:52 timothy Exp $
#
prefix = <email protected>@
***************
*** 37,43 ****
AR = ar rc
BINNAME = <email protected>@
INSTALL_IT = <email protected>@
! INCLUDE = -I$(srcdir) -I. <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@
PROF_CFLAGS =
CFLAGS_SHLIB = <email protected>@
LDFLAGS_SHLIB = <email protected>@
--- 37,43 ----
AR = ar rc
BINNAME = <email protected>@
INSTALL_IT = <email protected>@
! INCLUDE = -I$(srcdir) -I. <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@
PROF_CFLAGS =
CFLAGS_SHLIB = <email protected>@
LDFLAGS_SHLIB = <email protected>@
***************
*** 93,103 ****
functions/snmp.c functions/var.c functions/interbase.c \
functions/quot_print.c functions/cyr_convert.c \
functions/sysvsem.c functions/dav.c functions/sysvshm.c \
! functions/gettext.c
FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o)
! LIBS = $(PHPLIBS) <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@
all: $(BINNAME)
--- 93,103 ----
functions/snmp.c functions/var.c functions/interbase.c \
functions/quot_print.c functions/cyr_convert.c \
functions/sysvsem.c functions/dav.c functions/sysvshm.c \
! functions/gettext.c functions/php3_mckcrypt.c
FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o)
! LIBS = $(PHPLIBS) <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@
all: $(BINNAME)
Index: php3/acconfig.h
diff -c php3/acconfig.h:1.77 php3/acconfig.h:1.78
*** php3/acconfig.h:1.77 Fri Jan 15 13:38:34 1999
--- php3/acconfig.h Tue Jan 26 17:17:52 1999
***************
*** 112,117 ****
--- 112,120 ----
/* Define if you want the LDAP directory interface */
#define HAVE_LDAP 0
+ /* Define if you want the Cybercash MCK support */
+ #define HAVE_MCK 0
+
/* Define if you want the SNMP interface */
#define HAVE_SNMP 0
Index: php3/configure.in
diff -c php3/configure.in:1.306 php3/configure.in:1.307
*** php3/configure.in:1.306 Tue Jan 19 18:58:59 1999
--- php3/configure.in Tue Jan 26 17:17:52 1999
***************
*** 1,4 ****
! dnl $Id: configure.in,v 1.306 1999/01/19 23:58:59 jimjag Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
--- 1,4 ----
! dnl $Id: configure.in,v 1.307 1999/01/26 22:17:52 timothy Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
***************
*** 67,73 ****
dnl AC_PROG_INSTALL
AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/lib/sendmail, $PATH /usr/bin /usr/sbin /usr/etc /etc /usr/ucblib)
! if test -n "$PROG_SENDMAIL"; then
AC_DEFINE(HAVE_SENDMAIL)
fi
--- 67,73 ----
dnl AC_PROG_INSTALL
AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/lib/sendmail, $PATH /usr/bin /usr/sbin /usr/etc /etc /usr/ucblib)
! If test -n "$PROG_SENDMAIL"; then
AC_DEFINE(HAVE_SENDMAIL)
fi
***************
*** 243,249 ****
withval=apxs
fi
APXS="$withval"
! APXS_LDFLAGS=" <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@"
APACHE_INCLUDE="-I`$APXS -q INCLUDEDIR`"
BINNAME=libphp3.so
INSTALL_IT="\$(APXS) -i -a -n php3 $BINNAME"
--- 243,249 ----
withval=apxs
fi
APXS="$withval"
! APXS_LDFLAGS=" <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@"
APACHE_INCLUDE="-I`$APXS -q INCLUDEDIR`"
BINNAME=libphp3.so
INSTALL_IT="\$(APXS) -i -a -n php3 $BINNAME"
***************
*** 1181,1186 ****
--- 1181,1217 ----
AC_SUBST(LDAP_LIBS)
AC_SUBST(LDAP_LFLAGS)
AC_SUBST(LDAP_INCLUDE)
+
+ AC_MSG_CHECKING(for Cybercash MCK support)
+ AC_ARG_WITH(mck,
+ [ --with-mck[=DIR] Include Cybercash MCK support. DIR is the cybercash
+ mck build directory, defaults to
+ /usr/src/mck-3.2.0.3-linux],
+ [
+ if test "$withval" != "no"; then
+ if test "$withval" = "yes"; then
+ MCK_INCDIR=/usr/src/mck-3.2.0.3-linux/c-api
+ MCK_LIBDIR=/usr/src/mck-3.2.0.3-linux/c-api/lib
+ else
+ MCK_INCDIR=$withval/c-api
+ MCK_LIBDIR=$withval/c-api/lib
+ fi
+ MCK_INCLUDE=-I$MCK_INCDIR
+ MCK_LFLAGS="-L$MCK_LIBDIR ${ld_runpath_switch}$MCK_LIBDIR"
+ MCK_LIBS="-lmckcrypto"
+
+ AC_DEFINE(HAVE_MCK)
+
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+ ],[
+ AC_MSG_RESULT(no)
+ ])
+ AC_SUBST(MCK_LIBS)
+ AC_SUBST(MCK_LFLAGS)
+ AC_SUBST(MCK_INCLUDE)
AC_MSG_CHECKING(for SNMP support)
AC_ARG_WITH(snmp,
Index: php3/internal_functions.c
diff -c php3/internal_functions.c:1.339 php3/internal_functions.c:1.340
*** php3/internal_functions.c:1.339 Sun Jan 24 18:53:16 1999
--- php3/internal_functions.c Tue Jan 26 17:17:52 1999
***************
*** 29,35 ****
*/
! /* $Id: internal_functions.c,v 1.339 1999/01/24 23:53:16 sas Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 29,35 ----
*/
! /* $Id: internal_functions.c,v 1.340 1999/01/26 22:17:52 timothy Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 101,106 ****
--- 101,107 ----
#include "functions/php3_wddx.h"
#include <netinet/in.h>
#include "functions/fsock.h"
+ #include "functions/php3_mckcrypt.h"
extern php3_ini_structure php3_ini;
extern php3_ini_structure php3_ini_master;
***************
*** 166,171 ****
--- 167,173 ----
{"System V semaphores", sysvsem_module_ptr},
{"System V shared memory", sysvshm_module_ptr},
{"DAV", phpdav_module_ptr},
+ {"MCK Crypt", mckcrypt_module,ptr},
{NULL, NULL}
};
-- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe <email protected> For help: php-dev-help <email protected>
- Next message: timothy: "[PHP-DEV] CVS update: php3/functions"
- Previous message: Bug Database: "[PHP-DEV] Bug #1097 Updated: (0 =="
- Next in thread: timothy: "[PHP-DEV] CVS update: php3"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]