cvs: php4 /ext/openssl openssl.c

wez Fri Apr 12 15:26:10 2002 EDT Modified files: /php4/ext/openssl openssl.c Log: fix build with ZE2 Index: php4/ext/openssl/openssl.c diff -u php4/ext/openssl/openssl.c:1.43 php4/ext/openssl/openssl.c:1.44 --- php4/ext/openssl/openssl.c:1.43 Wed Mar 27 19:56:17 2002 +++ php4/ext/openssl/openssl.c Fri Apr 12 15:26:07 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.43 2002/03/28 00:56:17 wez Exp $ */ +/* $Id: openssl.c,v 1.44 2002/04/12 19:26:07 wez Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -190,7 +190,7 @@ static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request * req TSRMLS_DC); -static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int shortname) +static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int shortname TSRMLS_DC) { zval * subitem; int i; @@ -818,7 +818,7 @@ add_assoc_string(return_value, "name", cert->name, 1); /* add_assoc_bool(return_value, "valid", cert->valid); */ - add_assoc_name_entry(return_value, "subject", X509_get_subject_name(cert), useshortnames); + add_assoc_name_entry(return_value, "subject", X509_get_subject_name(cert), useshortnames TSRMLS_CC); /* hash as used in CA directories to lookup cert by subject name */ { char buf[32]; @@ -826,7 +826,7 @@ add_assoc_string(return_value, "hash", buf, 1); } - add_assoc_name_entry(return_value, "issuer", X509_get_issuer_name(cert), useshortnames); + add_assoc_name_entry(return_value, "issuer", X509_get_issuer_name(cert), useshortnames TSRMLS_CC); add_assoc_long(return_value, "version", X509_get_version(cert)); add_assoc_long(return_value, "serialNumber", ASN1_INTEGER_get(X509_get_serialNumber(cert))); @@ -1107,7 +1107,7 @@ /* {{{ x509 CSR functions */ /* {{{ php_openssl_make_REQ */ -static int php_openssl_make_REQ(struct php_x509_request * req, X509_REQ * csr, zval * dn, zval * attribs) +static int php_openssl_make_REQ(struct php_x509_request * req, X509_REQ * csr, zval * dn, zval * attribs TSRMLS_DC) { STACK_OF(CONF_VALUE) * dn_sk, *attr_sk = NULL; char * str, *dn_sect, *attr_sect; @@ -1539,7 +1539,7 @@ else { csr = X509_REQ_new(); if (csr) { - if (php_openssl_make_REQ(&req, csr, dn, attribs) == SUCCESS) { + if (php_openssl_make_REQ(&req, csr, dn, attribs TSRMLS_CC) == SUCCESS) { X509V3_CTX ext_ctx; X509V3_set_ctx(&ext_ctx, NULL, NULL, csr, NULL, 0);