cvs: php4 / acinclude.m4 /ext/openssl openssl.c

venaas Sun Jan 7 03:36:15 2001 EDT Modified files: /php4/ext/openssl openssl.c /php4 acinclude.m4 Log: Made OpenSSL extension work with 0.9.5 and changed version check to 0.9.5 Index: php4/ext/openssl/openssl.c diff -u php4/ext/openssl/openssl.c:1.5 php4/ext/openssl/openssl.c:1.6 --- php4/ext/openssl/openssl.c:1.5 Fri Nov 17 11:49:12 2000 +++ php4/ext/openssl/openssl.c Sun Jan 7 03:36:14 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.5 2000/11/17 19:49:12 venaas Exp $ */ +/* $Id: openssl.c,v 1.6 2001/01/07 11:36:14 venaas Exp $ */ #include "php.h" #include "php_openssl.h" @@ -403,6 +403,7 @@ i++; } +#if OPENSSL_VERSION_NUMBER >= 0x0090600fL if (!EVP_EncryptInit(&ctx,EVP_rc4(),NULL,NULL)) { for (i=0; i<nkeys; i++) { efree(eks[i]); @@ -412,6 +413,9 @@ efree(pkeys); RETURN_FALSE; } +#else + EVP_EncryptInit(&ctx,EVP_rc4(),NULL,NULL); +#endif #if 0 /* Need this if allow ciphers that require initialization vector */ @@ -443,9 +447,12 @@ RETURN_FALSE; } - if (!EVP_SealInit(&ctx, EVP_rc4(), eks, eksl, NULL, pkeys, nkeys) || - !EVP_SealUpdate(&ctx, buf, &len1, Z_STRVAL_PP(data), - Z_STRLEN_PP(data))) { + if (!EVP_SealInit(&ctx, EVP_rc4(), eks, eksl, NULL, pkeys, nkeys) +#if OPENSSL_VERSION_NUMBER >= 0x0090600fL + || !EVP_SealUpdate(&ctx, buf, &len1, Z_STRVAL_PP(data), + Z_STRLEN_PP(data)) +#endif + ) { efree(buf); for (i=0; i<nkeys; i++) { efree(eks[i]); @@ -456,6 +463,9 @@ RETURN_FALSE; } +#if OPENSSL_VERSION_NUMBER < 0x0090600fL + EVP_SealUpdate(&ctx, buf, &len1, Z_STRVAL_PP(data), Z_STRLEN_PP(data)); +#endif EVP_SealFinal(&ctx, buf + len1, &len2); efree(pkeys); @@ -536,12 +546,23 @@ RETURN_FALSE; } - if (!EVP_OpenInit(&ctx, EVP_rc4(), Z_STRVAL_PP(ekey), - Z_STRLEN_PP(ekey), NULL, pkey) || - !EVP_OpenUpdate(&ctx, buf, &len1, Z_STRVAL_PP(data), - Z_STRLEN_PP(data)) || - !EVP_OpenFinal(&ctx, buf + len1, &len2) || - (len1 + len2 == 0)) { + if (EVP_OpenInit(&ctx, EVP_rc4(), Z_STRVAL_PP(ekey), + Z_STRLEN_PP(ekey), NULL, pkey) +#if OPENSSL_VERSION_NUMBER >= 0x0090600fL + && EVP_OpenUpdate(&ctx, buf, &len1, Z_STRVAL_PP(data), + Z_STRLEN_PP(data)) +#endif + ) { +#if OPENSSL_VERSION_NUMBER < 0x0090600fL + EVP_OpenUpdate(&ctx, buf, &len1, Z_STRVAL_PP(data), + Z_STRLEN_PP(data)); +#endif + if (!EVP_OpenFinal(&ctx, buf + len1, &len2) || + (len1 + len2 == 0)) { + efree(buf); + RETURN_FALSE; + } + } else { efree(buf); RETURN_FALSE; } Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.119 php4/acinclude.m4:1.120 --- php4/acinclude.m4:1.119 Wed Jan 3 10:12:06 2001 +++ php4/acinclude.m4 Sun Jan 7 03:36:15 2001 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.119 2001/01/03 18:12:06 sniper Exp $ +dnl $Id: acinclude.m4,v 1.120 2001/01/07 11:36:15 venaas Exp $ dnl dnl This file contains local autoconf functions. @@ -25,13 +25,13 @@ AC_MSG_CHECKING(for OpenSSL version) AC_EGREP_CPP(yes,[ #include <openssl/opensslv.h> - #if OPENSSL_VERSION_NUMBER >= 0x0090600fL + #if OPENSSL_VERSION_NUMBER >= 0x0090500fL yes #endif ],[ - AC_MSG_RESULT(>= 0.9.6) + AC_MSG_RESULT(>= 0.9.5) ],[ - AC_MSG_ERROR(OpenSSL version 0.9.6 or greater required.) + AC_MSG_ERROR(OpenSSL version 0.9.5 or greater required.) ]) CPPFLAGS=$old_CPPFLAGS