fix remaining 's' args for openssl

Author: weltling

ext/openssl/openssl.c

@@ -1546,7 +1546,8 @@ PHP_FUNCTION(openssl_spki_new)
    Verifies spki returns boolean */
 PHP_FUNCTION(openssl_spki_verify)
 {
-	int spkstr_len, i = 0;
+	size_t spkstr_len;
+	int i = 0;
 	char *spkstr = NULL, * spkstr_cleaned = NULL;
 
 	EVP_PKEY *pkey = NULL;
@@ -1606,7 +1607,7 @@ PHP_FUNCTION(openssl_spki_verify)
    Exports public key from existing spki to var */
 PHP_FUNCTION(openssl_spki_export)
 {
-	int spkstr_len;
+	size_t spkstr_len;
 	char *spkstr = NULL, * spkstr_cleaned = NULL, * s = NULL;
 
 	EVP_PKEY *pkey = NULL;
@@ -1666,7 +1667,7 @@ PHP_FUNCTION(openssl_spki_export)
    Exports spkac challenge from existing spki to var */
 PHP_FUNCTION(openssl_spki_export_challenge)
 {
-	int spkstr_len;
+	size_t spkstr_len;
 	char *spkstr = NULL, * spkstr_cleaned = NULL;
 
 	NETSCAPE_SPKI *spki = NULL;
@@ -2139,7 +2140,8 @@ PHP_FUNCTION(openssl_x509_checkpurpose)
 	STACK_OF(X509) * untrustedchain = NULL;
 	zend_long purpose;
 	char * untrusted = NULL;
-	size_t untrusted_len = 0, ret;
+	size_t untrusted_len = 0;
+	int ret;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zl|a!s", &zcert, &purpose, &zcainfo, &untrusted, &untrusted_len) == FAILURE) {
 		return;
@@ -2793,7 +2795,8 @@ PHP_FUNCTION(openssl_csr_export_to_file)
 	X509_REQ * csr;
 	zval * zcsr = NULL;
 	zend_bool notext = 1;
-	char * filename = NULL; size_t filename_len;
+	char * filename = NULL;
+	size_t filename_len;
 	BIO * bio_out;
 	zend_resource *csr_resource;
 
@@ -3587,8 +3590,10 @@ PHP_FUNCTION(openssl_pkey_export_to_file)
 {
 	struct php_x509_request req;
 	zval * zpkey, * args = NULL;
-	char * passphrase = NULL; size_t passphrase_len = 0;
-	char * filename = NULL; int filename_len = 0;
+	char * passphrase = NULL;
+	size_t passphrase_len = 0;
+	char * filename = NULL;
+	size_t filename_len = 0;
 	zend_resource *key_resource = NULL;
 	EVP_PKEY * key;
 	BIO * bio_out = NULL;
@@ -3745,7 +3750,7 @@ PHP_FUNCTION(openssl_pkey_get_private)
 	zval *cert;
 	EVP_PKEY *pkey;
 	char * passphrase = "";
-	int passphrase_len = sizeof("")-1;
+	size_t passphrase_len = sizeof("")-1;
 	zend_resource *res;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|s", &cert, &passphrase, &passphrase_len) == FAILURE) {
@@ -3869,9 +3874,12 @@ PHP_FUNCTION(openssl_pkey_get_details)
 PHP_FUNCTION(openssl_pbkdf2)
 {
 	zend_long key_length = 0, iterations = 0;
-	char *password; size_t password_len;
-	char *salt; size_t salt_len;
-	char *method; int method_len = 0;
+	char *password;
+	size_t password_len;
+	char *salt;
+	size_t salt_len;
+	char *method;
+	size_t method_len = 0;
 	zend_string *out_buffer;
 
 	const EVP_MD *digest;
@@ -3926,10 +3934,14 @@ PHP_FUNCTION(openssl_pkcs7_verify)
 	PKCS7 * p7 = NULL;
 	BIO * in = NULL, * datain = NULL, * dataout = NULL;
 	zend_long flags = 0;
-	char * filename; size_t filename_len;
-	char * extracerts = NULL; size_t extracerts_len = 0;
-	char * signersfilename = NULL; size_t signersfilename_len = 0;
-	char * datafilename = NULL; size_t datafilename_len = 0;
+	char * filename;
+	size_t filename_len;
+	char * extracerts = NULL;
+	size_t extracerts_len = 0;
+	char * signersfilename = NULL;
+	size_t signersfilename_len = 0;
+	char * datafilename = NULL;
+	size_t datafilename_len = 0;
 
 	RETVAL_LONG(-1);
 
@@ -4038,8 +4050,10 @@ PHP_FUNCTION(openssl_pkcs7_encrypt)
 	const EVP_CIPHER *cipher = NULL;
 	zend_long cipherid = PHP_OPENSSL_CIPHER_DEFAULT;
 	zend_string * strindex;
-	char * infilename = NULL;	size_t infilename_len;
-	char * outfilename = NULL;	size_t outfilename_len;
+	char * infilename = NULL;
+	size_t infilename_len;
+	char * outfilename = NULL;
+	size_t outfilename_len;
 
 	RETVAL_FALSE;
 
@@ -4163,9 +4177,12 @@ PHP_FUNCTION(openssl_pkcs7_sign)
 	STACK_OF(X509) *others = NULL;
 	zend_resource *certresource = NULL, *keyresource = NULL;
 	zend_string * strindex;
-	char * infilename;	size_t infilename_len;
-	char * outfilename;	size_t outfilename_len;
-	char * extracertsfilename = NULL; size_t extracertsfilename_len;
+	char * infilename;
+	size_t infilename_len;
+	char * outfilename;
+	size_t outfilename_len;
+	char * extracertsfilename = NULL;
+	size_t extracertsfilename_len;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ppzza!|lp",
 				&infilename, &infilename_len, &outfilename, &outfilename_len,
@@ -4263,8 +4280,10 @@ PHP_FUNCTION(openssl_pkcs7_decrypt)
 	zend_resource *certresval, *keyresval;
 	BIO * in = NULL, * out = NULL, * datain = NULL;
 	PKCS7 * p7 = NULL;
-	char * infilename;	size_t infilename_len;
-	char * outfilename;	size_t outfilename_len;
+	char * infilename;
+	size_t infilename_len;
+	char * outfilename;
+	size_t outfilename_len;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ppz|z", &infilename, &infilename_len,
 				&outfilename, &outfilename_len, &recipcert, &recipkey) == FAILURE) {
@@ -4664,8 +4683,10 @@ PHP_FUNCTION(openssl_verify)
 	EVP_MD_CTX     md_ctx;
 	const EVP_MD *mdtype;
 	zend_resource *keyresource = NULL;
-	char * data;	size_t data_len;
-	char * signature;	size_t signature_len;
+	char * data;
+	size_t data_len;
+	char * signature;
+	size_t signature_len;
 	zval *method = NULL;
 	zend_long signature_algo = OPENSSL_ALGO_SHA1;
 
@@ -4717,9 +4738,10 @@ PHP_FUNCTION(openssl_seal)
 	zend_resource ** key_resources;	/* so we know what to cleanup */
 	int i, len1, len2, *eksl, nkeys;
 	unsigned char *buf = NULL, **eks;
-	char * data; size_t data_len;
+	char * data;
+	size_t data_len;
 	char *method =NULL;
-	int method_len = 0;
+	size_t method_len = 0;
 	const EVP_CIPHER *cipher;
 	EVP_CIPHER_CTX ctx;
 
@@ -4844,10 +4866,12 @@ PHP_FUNCTION(openssl_open)
 	unsigned char *buf;
 	zend_resource *keyresource = NULL;
 	EVP_CIPHER_CTX ctx;
-	char * data;	size_t data_len;
-	char * ekey;	size_t ekey_len;
+	char * data;
+	size_t data_len;
+	char * ekey;
+	size_t ekey_len;
 	char *method =NULL;
-	int method_len = 0;
+	size_t method_len = 0;
 	const EVP_CIPHER *cipher;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz/sz|s", &data, &data_len, &opendata, &ekey, &ekey_len, &privkey, &method, &method_len) == FAILURE) {
@@ -4946,7 +4970,7 @@ PHP_FUNCTION(openssl_digest)
 {
 	zend_bool raw_output = 0;
 	char *data, *method;
-	int data_len, method_len;
+	size_t data_len, method_len;
 	const EVP_MD *mdtype;
 	EVP_MD_CTX md_ctx;
 	unsigned int siglen;