cvs: php4(PHP_4_3) /ext/openssl openssl.c php_openssl.h

wez Thu May 1 06:44:18 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/openssl openssl.c php_openssl.h Log: Really fix dll linkage, and fix TSRMLS usage. Index: php4/ext/openssl/openssl.c diff -u php4/ext/openssl/openssl.c:1.52.2.11 php4/ext/openssl/openssl.c:1.52.2.12 --- php4/ext/openssl/openssl.c:1.52.2.11 Tue Apr 29 09:48:05 2003 +++ php4/ext/openssl/openssl.c Thu May 1 06:44:17 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.52.2.11 2003/04/29 13:48:05 wez Exp $ */ +/* $Id: openssl.c,v 1.52.2.12 2003/05/01 10:44:17 wez Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -505,12 +505,10 @@ return SUCCESS; } -static int php_openssl_write_rand_file(const char * file, int egdsocket, int seeded) +static int php_openssl_write_rand_file(const char * file, int egdsocket, int seeded TSRMLS_DC) { char buffer[MAXPATHLEN]; - TSRMLS_FETCH(); - if (egdsocket || !seeded) { /* if we did not manage to read the seed file, we should not write * a low-entropy seed file back */ @@ -1797,7 +1795,7 @@ } } - php_openssl_write_rand_file(randfile, egdsocket, seeded); + php_openssl_write_rand_file(randfile, egdsocket, seeded TSRMLS_CC); if (return_val == NULL) { EVP_PKEY_free(req->priv_key); @@ -3011,7 +3009,7 @@ } -PHP_OPENSSL_API int php_openssl_apply_verification_policy(SSL *ssl, X509 *peer, php_stream *stream TSRMLS_DC) +int php_openssl_apply_verification_policy(SSL *ssl, X509 *peer, php_stream *stream TSRMLS_DC) { zval **val = NULL; char *cnmatch = NULL; @@ -3099,7 +3097,7 @@ return 0; } -PHP_OPENSSL_API SSL *php_SSL_new_from_context(SSL_CTX *ctx, php_stream *stream TSRMLS_DC) +SSL *php_SSL_new_from_context(SSL_CTX *ctx, php_stream *stream TSRMLS_DC) { zval **val = NULL; char *cafile = NULL; Index: php4/ext/openssl/php_openssl.h diff -u php4/ext/openssl/php_openssl.h:1.10.8.3 php4/ext/openssl/php_openssl.h:1.10.8.4 --- php4/ext/openssl/php_openssl.h:1.10.8.3 Tue Apr 29 09:48:05 2003 +++ php4/ext/openssl/php_openssl.h Thu May 1 06:44:17 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_openssl.h,v 1.10.8.3 2003/04/29 13:48:05 wez Exp $ */ +/* $Id: php_openssl.h,v 1.10.8.4 2003/05/01 10:44:17 wez Exp $ */ #ifndef PHP_OPENSSL_H #define PHP_OPENSSL_H @@ -82,8 +82,8 @@ PHP_FUNCTION(openssl_csr_sign); #include <openssl/ssl.h> -PHP_OPENSSL_API int php_openssl_apply_verification_policy(SSL *ssl, X509 *peer, php_stream *stream TSRMLS_DC); -PHP_OPENSSL_API SSL *php_SSL_new_from_context(SSL_CTX *ctx, php_stream *stream TSRMLS_DC); +int php_openssl_apply_verification_policy(SSL *ssl, X509 *peer, php_stream *stream TSRMLS_DC); +SSL *php_SSL_new_from_context(SSL_CTX *ctx, php_stream *stream TSRMLS_DC); #else