pajoye Wed Apr 4 22:00:52 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/openssl openssl.c
Log:
- nuke c++ comments
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.29&r2=1.98.2.5.2.30&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.29
php-src/ext/openssl/openssl.c:1.98.2.5.2.30
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.29 Wed Apr 4 21:24:01 2007
+++ php-src/ext/openssl/openssl.c Wed Apr 4 22:00:51 2007
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.29 2007/04/04 21:24:01 pajoye Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.30 2007/04/04 22:00:51 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1430,17 +1430,19 @@
/* parse extra config from args array, promote this to an extra
function */
if (args && zend_hash_find(Z_ARRVAL_P(args), "friendly_name",
sizeof("friendly_name"), (void**)&item) == SUCCESS)
friendly_name = Z_STRVAL_PP(item);
- // certpbe (default RC2-40)
- // keypbe (default 3DES)
- // friendly_caname
+ /* certpbe (default RC2-40)
+ keypbe (default 3DES)
+ friendly_caname
+ */
if (args && zend_hash_find(Z_ARRVAL_P(args), "extracerts",
sizeof("extracerts"), (void**)&item) == SUCCESS)
ca = php_array_to_X509_sk(item);
/* end parse extra config */
+ /*PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509
*cert, STACK_OF(X509) *ca,
+ int nid_key, int nid_cert, int iter,
int mac_iter, int keytype);*/
+
p12 = PKCS12_create(pass, friendly_name, priv_key, cert, ca, 0, 0, 0,
0, 0);
- //PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509
*cert, STACK_OF(X509) *ca,
- // int nid_key, int nid_cert, int iter,
int mac_iter, int keytype);
bio_out = BIO_new_file(filename, "w");
if (bio_out) {
@@ -1506,9 +1508,6 @@
/* parse extra config from args array, promote this to an extra
function */
if (args && zend_hash_find(Z_ARRVAL_P(args), "friendly_name",
sizeof("friendly_name"), (void**)&item) == SUCCESS)
friendly_name = Z_STRVAL_PP(item);
- // certpbe (default RC2-40)
- // keypbe (default 3DES)
- // friendly_caname
if (args && zend_hash_find(Z_ARRVAL_P(args), "extracerts",
sizeof("extracerts"), (void**)&item) == SUCCESS)
ca = php_array_to_X509_sk(item);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
