summaryrefslogtreecommitdiff
path: root/ext/openssl
diff options
context:
space:
mode:
authorKalle Sommer Nielsen <kalle@php.net>2010-04-13 11:02:15 +0000
committerKalle Sommer Nielsen <kalle@php.net>2010-04-13 11:02:15 +0000
commit7ef4cdf47103c0eb348b351ba5da7c1cfc93dd58 (patch)
tree48924f2ee3aa3ed726df5599ba9106837facb76f /ext/openssl
parent1b8b6d931a65ea2d7d44adfe34005a96396dd401 (diff)
downloadphp-git-7ef4cdf47103c0eb348b351ba5da7c1cfc93dd58.tar.gz
Remove a couple TSRMLS_FETCH() calls around ext/main/sapi
Diffstat (limited to 'ext/openssl')
-rw-r--r--ext/openssl/openssl.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index b18108f7e1..b11709aa48 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -852,12 +852,10 @@ static void php_openssl_dispose_config(struct php_x509_request * req TSRMLS_DC)
}
/* }}} */
-static int php_openssl_load_rand_file(const char * file, int *egdsocket, int *seeded) /* {{{ */
+static int php_openssl_load_rand_file(const char * file, int *egdsocket, int *seeded TSRMLS_DC) /* {{{ */
{
char buffer[MAXPATHLEN];
- TSRMLS_FETCH();
-
*egdsocket = 0;
*seeded = 0;
@@ -2742,7 +2740,7 @@ static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request * req
}
randfile = CONF_get_string(req->req_config, req->section_name, "RANDFILE");
- php_openssl_load_rand_file(randfile, &egdsocket, &seeded);
+ php_openssl_load_rand_file(randfile, &egdsocket, &seeded TSRMLS_CC);
if ((req->priv_key = EVP_PKEY_new()) != NULL) {
switch(req->priv_key_type) {