tony2001 Wed Jul 30 11:59:05 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/openssl openssl.c Log: fix folding http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.41.2.15&r2=1.98.2.5.2.41.2.16&diff_format=u Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.15 php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.16 --- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.15 Tue Jul 15 03:20:44 2008 +++ php-src/ext/openssl/openssl.c Wed Jul 30 11:59:05 2008 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.98.2.5.2.41.2.15 2008/07/15 03:20:44 hnangelo Exp $ */ +/* $Id: openssl.c,v 1.98.2.5.2.41.2.16 2008/07/30 11:59:05 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -395,6 +395,7 @@ ZEND_ARG_INFO(0, dh_key) ZEND_END_ARG_INFO() /* }}} */ + /* {{{ openssl_functions[] */ const zend_function_entry openssl_functions[] = { @@ -530,7 +531,7 @@ } /* }}} */ -/* {{{ openssl -> PHP "bridging" */ +/* openssl -> PHP "bridging" */ /* true global; readonly after module startup */ static char default_ssl_conf_filename[MAXPATHLEN]; @@ -561,7 +562,6 @@ static X509_REQ * php_openssl_csr_from_zval(zval ** val, int makeresource, long * resourceval TSRMLS_DC); 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 TSRMLS_DC) /* {{{ */ { zval *subitem, *subentries; @@ -712,12 +712,7 @@ } /* }}} */ -static inline int php_openssl_config_check_syntax( - const char * section_label, - const char * config_filename, - const char * section, - LHASH * config TSRMLS_DC - ) /* {{{ */ +static inline int php_openssl_config_check_syntax(const char * section_label, const char * config_filename, const char * section, LHASH * config TSRMLS_DC) /* {{{ */ { X509V3_CTX ctx; @@ -780,13 +775,7 @@ else \ varname = defval - - -static int php_openssl_parse_config( - struct php_x509_request * req, - zval * optional_args - TSRMLS_DC - ) /* {{{ */ +static int php_openssl_parse_config(struct php_x509_request * req, zval * optional_args TSRMLS_DC) /* {{{ */ { char * str; zval ** item; @@ -1686,9 +1675,8 @@ /* }}} */ - /* Pop all X509 from Stack and free them, free the stack afterwards */ -static void php_sk_X509_free(STACK_OF(X509) * sk) +static void php_sk_X509_free(STACK_OF(X509) * sk) /* {{{ */ { for (;;) { X509* x = sk_X509_pop(sk); @@ -1697,8 +1685,9 @@ } sk_X509_free(sk); } +/* }}} */ -static STACK_OF(X509) * php_array_to_X509_sk(zval ** zcerts TSRMLS_DC) +static STACK_OF(X509) * php_array_to_X509_sk(zval ** zcerts TSRMLS_DC) /* {{{ */ { HashPosition hpos; zval ** zcertval; @@ -1750,6 +1739,7 @@ clean_exit: return sk; } +/* }}} */ /* {{{ proto bool openssl_pkcs12_export_to_file(mixed x509, string filename, mixed priv_key, string pass[, array args]) Creates and exports a PKCS to file */ @@ -4715,7 +4705,6 @@ } /* }}} */ - /* {{{ proto string openssl_dh_compute_key(string pub_key, resource dh_key) Computes shared sicret for public value of remote DH key and local DH key */ PHP_FUNCTION(openssl_dh_compute_key)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php