cvs: php4 /ext/openssl openssl.c

venaas Sun Sep 30 09:30:17 2001 EDT Modified files: /php4/ext/openssl openssl.c Log: Didn't compile, replaced some TSRMLS_C with TSRMLS_CC Index: php4/ext/openssl/openssl.c diff -u php4/ext/openssl/openssl.c:1.32 php4/ext/openssl/openssl.c:1.33 --- php4/ext/openssl/openssl.c:1.32 Tue Sep 25 17:58:11 2001 +++ php4/ext/openssl/openssl.c Sun Sep 30 09:30:16 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.32 2001/09/25 21:58:11 jeroen Exp $ */ +/* $Id: openssl.c,v 1.33 2001/09/30 13:30:16 venaas Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -342,11 +342,11 @@ } #define PHP_SSL_REQ_INIT(req) memset(req, 0, sizeof(*req)) -#define PHP_SSL_REQ_DISPOSE(req) php_openssl_dispose_config(req TSRMLS_C) -#define PHP_SSL_REQ_PARSE(req, zval) php_openssl_parse_config(req, zval TSRMLS_C) +#define PHP_SSL_REQ_DISPOSE(req) php_openssl_dispose_config(req TSRMLS_CC) +#define PHP_SSL_REQ_PARSE(req, zval) php_openssl_parse_config(req, zval TSRMLS_CC) #define PHP_SSL_CONFIG_SYNTAX_CHECK(var) if (req->var && php_openssl_config_check_syntax(#var, \ - req->config_filename, req->var, req->req_config TSRMLS_C) == FAILURE) return FAILURE + req->config_filename, req->var, req->req_config TSRMLS_CC) == FAILURE) return FAILURE #define SET_OPTIONAL_STRING_ARG(key, varname, defval) \ if (optional_args && zend_hash_find(Z_ARRVAL_P(optional_args), key, sizeof(key), (void**)&item) == SUCCESS) \ @@ -389,7 +389,7 @@ BIO_free(oid_bio); } } - if (add_oid_section(req TSRMLS_C) == FAILURE) + if (add_oid_section(req TSRMLS_CC) == FAILURE) return FAILURE; SET_OPTIONAL_STRING_ARG("digest_alg", req->digest_name, @@ -1744,7 +1744,7 @@ if (PHP_SSL_REQ_PARSE(&req, args) == SUCCESS) { - if (php_openssl_generate_private_key(&req TSRMLS_C)) { + if (php_openssl_generate_private_key(&req TSRMLS_CC)) { /* pass back a key resource */ RETVAL_RESOURCE(zend_list_insert(req.priv_key, le_key)); /* make sure the cleanup code doesn't zap it! */ @@ -1773,7 +1773,7 @@ RETVAL_FALSE; - key = php_openssl_evp_from_zval(&zpkey, 0, passphrase, 0, &key_resource TSRMLS_C); + key = php_openssl_evp_from_zval(&zpkey, 0, passphrase, 0, &key_resource TSRMLS_CC); if (key == NULL) { zend_error(E_WARNING, "cannot get key from parameter 1"); @@ -1824,7 +1824,7 @@ RETVAL_FALSE; - key = php_openssl_evp_from_zval(&zpkey, 0, passphrase, 0, &key_resource TSRMLS_C); + key = php_openssl_evp_from_zval(&zpkey, 0, passphrase, 0, &key_resource TSRMLS_CC); if (key == NULL) { zend_error(E_WARNING, "cannot get key from parameter 1");