tony2001 Wed Jul 30 11:58:44 2008 UTC
Modified files:
/php-src/ext/openssl openssl.c
Log:
fix folding
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.165&r2=1.166&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.165 php-src/ext/openssl/openssl.c:1.166
--- php-src/ext/openssl/openssl.c:1.165 Fri Jul 18 23:59:49 2008
+++ php-src/ext/openssl/openssl.c Wed Jul 30 11:58:43 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.165 2008/07/18 23:59:49 hnangelo Exp $ */
+/* $Id: openssl.c,v 1.166 2008/07/30 11:58:43 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -392,6 +392,7 @@
ZEND_ARG_INFO(0, dh_key)
ZEND_END_ARG_INFO()
/* }}} */
+
/* {{{ openssl_functions[]
*/
const zend_function_entry openssl_functions[] = {
@@ -513,11 +514,11 @@
}
/* }}} */
-/* {{{ openssl -> PHP "bridging" */
+/* openssl -> PHP "bridging" */
/* true global; readonly after module startup */
static char default_ssl_conf_filename[MAXPATHLEN];
-struct php_x509_request {
+struct php_x509_request { /* {{{ */
LHASH * global_config; /* Global SSL config */
LHASH * req_config; /* SSL config for this request */
const EVP_MD * md_alg;
@@ -534,7 +535,7 @@
EVP_PKEY * priv_key;
};
-
+/* }}} */
static X509 * php_openssl_x509_from_zval(zval ** val, int makeresource, long *
resourceval TSRMLS_DC);
static EVP_PKEY * php_openssl_evp_from_zval(zval ** val, int public_key, char
* passphrase, int makeresource, long * resourceval TSRMLS_DC);
@@ -544,7 +545,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_ascii_assoc_name_entry(zval * val, char * key, X509_NAME *
name, int shortname TSRMLS_DC) /* {{{ */
{
zval *subitem, *subentries;
@@ -707,12 +707,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;
@@ -779,13 +774,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;
@@ -4980,7 +4969,6 @@
}
/* }}} */
-
/* {{{ proto string openssl_dh_compute_key(string pub_key, resource dh_key) U
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
