Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

fix ws & folding

experimental/5.2-WITH_DRCP
Antony Dovgal 19 years ago
parent
184b2e5d20
commit
79e53b202c
1 changed files with 12 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      ext/mcrypt/mcrypt.c

48
ext/mcrypt/mcrypt.c
View File

@ -44,7 +44,7 @@ typedef struct _php_mcrypt {
zend_bool init;
} php_mcrypt;
zend_function_entry mcrypt_functions[] = {
zend_function_entry mcrypt_functions[] = { /* {{{ */
PHP_FE(mcrypt_ecb, NULL)
PHP_FE(mcrypt_cbc, NULL)
PHP_FE(mcrypt_cfb, NULL)
@ -89,6 +89,7 @@ zend_function_entry mcrypt_functions[] = {
PHP_FE(mcrypt_module_close, NULL)
{NULL, NULL, NULL}
};
/* }}} */
static PHP_MINFO_FUNCTION(mcrypt);
static PHP_MINIT_FUNCTION(mcrypt);
@ -236,7 +237,7 @@ PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("mcrypt.modes_dir", NULL, PHP_INI_ALL, OnUpdateString, modes_dir, zend_mcrypt_globals, mcrypt_globals)
PHP_INI_END()
static void php_mcrypt_module_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
static void php_mcrypt_module_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
{
php_mcrypt *pm = (php_mcrypt *) rsrc->ptr;
if (pm) {
@ -246,9 +247,9 @@ static void php_mcrypt_module_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
pm = NULL;
}
}
/* }}} */
static PHP_MINIT_FUNCTION(mcrypt)
static PHP_MINIT_FUNCTION(mcrypt) /* {{{ */
{
le_mcrypt = zend_register_list_destructors_ex(php_mcrypt_module_dtor, NULL, "mcrypt", module_number);
@ -303,16 +304,18 @@ static PHP_MINIT_FUNCTION(mcrypt)
REGISTER_INI_ENTRIES();
return SUCCESS;
}
/* }}} */
static PHP_MSHUTDOWN_FUNCTION(mcrypt)
static PHP_MSHUTDOWN_FUNCTION(mcrypt) /* {{{ */
{
UNREGISTER_INI_ENTRIES();
return SUCCESS;
}
/* }}} */
#include "ext/standard/php_smart_str.h"
PHP_MINFO_FUNCTION(mcrypt)
PHP_MINFO_FUNCTION(mcrypt) /* {{{ */
{
char **modules;
char mcrypt_api_no[16];
@ -356,6 +359,7 @@ PHP_MINFO_FUNCTION(mcrypt)
DISPLAY_INI_ENTRIES();
}
/* }}} */
typedef enum {
RANDOM = 0,
@ -399,7 +403,6 @@ PHP_FUNCTION(mcrypt_module_open)
}
/* }}} */
/* {{{ proto int mcrypt_generic_init(resource td, string key, string iv)
This function initializes all buffers for the specific module */
PHP_FUNCTION(mcrypt_generic_init)
@ -474,7 +477,6 @@ PHP_FUNCTION(mcrypt_generic_init)
}
/* }}} */
/* {{{ proto string mcrypt_generic(resource td, string data)
This function encrypts the plaintext */
PHP_FUNCTION(mcrypt_generic)
@ -519,7 +521,6 @@ PHP_FUNCTION(mcrypt_generic)
}
/* }}} */
/* {{{ proto string mdecrypt_generic(resource td, string data)
This function decrypts the plaintext */
PHP_FUNCTION(mdecrypt_generic)
@ -563,7 +564,6 @@ PHP_FUNCTION(mdecrypt_generic)
}
/* }}} */
/* {{{ proto array mcrypt_enc_get_supported_key_sizes(resource td)
This function decrypts the crypttext */
PHP_FUNCTION(mcrypt_enc_get_supported_key_sizes)
@ -584,7 +584,6 @@ PHP_FUNCTION(mcrypt_enc_get_supported_key_sizes)
}
/* }}} */
/* {{{ proto int mcrypt_enc_self_test(resource td)
This function runs the self test on the algorithm specified by the descriptor td */
PHP_FUNCTION(mcrypt_enc_self_test)
@ -604,7 +603,6 @@ PHP_FUNCTION(mcrypt_module_close)
}
/* }}} */
/* {{{ proto bool mcrypt_generic_deinit(resource td)
This function terminates encrypt specified by the descriptor td */
PHP_FUNCTION(mcrypt_generic_deinit)
@ -619,7 +617,6 @@ PHP_FUNCTION(mcrypt_generic_deinit)
}
/* }}} */
/* {{{ proto bool mcrypt_enc_is_block_algorithm_mode(resource td)
Returns TRUE if the mode is for use with block algorithms */
PHP_FUNCTION(mcrypt_enc_is_block_algorithm_mode)
@ -634,7 +631,6 @@ PHP_FUNCTION(mcrypt_enc_is_block_algorithm_mode)
}
/* }}} */
/* {{{ proto bool mcrypt_enc_is_block_algorithm(resource td)
Returns TRUE if the alrogithm is a block algorithms */
PHP_FUNCTION(mcrypt_enc_is_block_algorithm)
@ -649,7 +645,6 @@ PHP_FUNCTION(mcrypt_enc_is_block_algorithm)
}
/* }}} */
/* {{{ proto bool mcrypt_enc_is_block_mode(resource td)
Returns TRUE if the mode outputs blocks */
PHP_FUNCTION(mcrypt_enc_is_block_mode)
@ -664,7 +659,6 @@ PHP_FUNCTION(mcrypt_enc_is_block_mode)
}
/* }}} */
/* {{{ proto int mcrypt_enc_get_block_size(resource td)
Returns the block size of the cipher specified by the descriptor td */
PHP_FUNCTION(mcrypt_enc_get_block_size)
@ -674,7 +668,6 @@ PHP_FUNCTION(mcrypt_enc_get_block_size)
}
/* }}} */
/* {{{ proto int mcrypt_enc_get_key_size(resource td)
Returns the maximum supported key size in bytes of the algorithm specified by the descriptor td */
PHP_FUNCTION(mcrypt_enc_get_key_size)
@ -684,7 +677,6 @@ PHP_FUNCTION(mcrypt_enc_get_key_size)
}
/* }}} */
/* {{{ proto int mcrypt_enc_get_iv_size(resource td)
Returns the size of the IV in bytes of the algorithm specified by the descriptor td */
PHP_FUNCTION(mcrypt_enc_get_iv_size)
@ -694,7 +686,6 @@ PHP_FUNCTION(mcrypt_enc_get_iv_size)
}
/* }}} */
/* {{{ proto string mcrypt_enc_get_algorithms_name(resource td)
Returns the name of the algorithm specified by the descriptor td */
PHP_FUNCTION(mcrypt_enc_get_algorithms_name)
@ -708,7 +699,6 @@ PHP_FUNCTION(mcrypt_enc_get_algorithms_name)
}
/* }}} */
/* {{{ proto string mcrypt_enc_get_modes_name(resource td)
Returns the name of the mode specified by the descriptor td */
PHP_FUNCTION(mcrypt_enc_get_modes_name)
@ -722,7 +712,6 @@ PHP_FUNCTION(mcrypt_enc_get_modes_name)
}
/* }}} */
/* {{{ proto bool mcrypt_module_self_test(string algorithm [, string lib_dir])
Does a self test of the module "module" */
PHP_FUNCTION(mcrypt_module_self_test)
@ -737,7 +726,6 @@ PHP_FUNCTION(mcrypt_module_self_test)
}
/* }}} */
/* {{{ proto bool mcrypt_module_is_block_algorithm_mode(string mode [, string lib_dir])
Returns TRUE if the mode is for use with block algorithms */
PHP_FUNCTION(mcrypt_module_is_block_algorithm_mode)
@ -752,7 +740,6 @@ PHP_FUNCTION(mcrypt_module_is_block_algorithm_mode)
}
/* }}} */
/* {{{ proto bool mcrypt_module_is_block_algorithm(string algorithm [, string lib_dir])
Returns TRUE if the algorithm is a block algorithm */
PHP_FUNCTION(mcrypt_module_is_block_algorithm)
@ -767,7 +754,6 @@ PHP_FUNCTION(mcrypt_module_is_block_algorithm)
}
/* }}} */
/* {{{ proto bool mcrypt_module_is_block_mode(string mode [, string lib_dir])
Returns TRUE if the mode outputs blocks of bytes */
PHP_FUNCTION(mcrypt_module_is_block_mode)
@ -782,7 +768,6 @@ PHP_FUNCTION(mcrypt_module_is_block_mode)
}
/* }}} */
/* {{{ proto int mcrypt_module_get_algo_block_size(string algorithm [, string lib_dir])
Returns the block size of the algorithm */
PHP_FUNCTION(mcrypt_module_get_algo_block_size)
@ -793,7 +778,6 @@ PHP_FUNCTION(mcrypt_module_get_algo_block_size)
}
/* }}} */
/* {{{ proto int mcrypt_module_get_algo_key_size(string algorithm [, string lib_dir])
Returns the maximum supported key size of the algorithm */
PHP_FUNCTION(mcrypt_module_get_algo_key_size)
@ -804,7 +788,6 @@ PHP_FUNCTION(mcrypt_module_get_algo_key_size)
}
/* }}} */
/* {{{ proto array mcrypt_module_get_supported_key_sizes(string algorithm [, string lib_dir])
This function decrypts the crypttext */
PHP_FUNCTION(mcrypt_module_get_supported_key_sizes)
@ -824,7 +807,6 @@ PHP_FUNCTION(mcrypt_module_get_supported_key_sizes)
}
/* }}} */
/* {{{ proto array mcrypt_list_algorithms([string lib_dir])
List all algorithms in "module_dir" */
PHP_FUNCTION(mcrypt_list_algorithms)
@ -852,7 +834,6 @@ PHP_FUNCTION(mcrypt_list_algorithms)
}
/* }}} */
/* {{{ proto array mcrypt_list_modes([string lib_dir])
List all modes "module_dir" */
PHP_FUNCTION(mcrypt_list_modes)
@ -880,7 +861,6 @@ PHP_FUNCTION(mcrypt_list_modes)
}
/* }}} */
/* {{{ proto int mcrypt_get_key_size(string cipher, string module)
Get the key size of cipher */
PHP_FUNCTION(mcrypt_get_key_size)
@ -910,7 +890,6 @@ PHP_FUNCTION(mcrypt_get_key_size)
}
/* }}} */
/* {{{ proto int mcrypt_get_block_size(string cipher, string module)
Get the key size of cipher */
PHP_FUNCTION(mcrypt_get_block_size)
@ -940,7 +919,6 @@ PHP_FUNCTION(mcrypt_get_block_size)
}
/* }}} */
/* {{{ proto int mcrypt_get_iv_size(string cipher, string module)
Get the IV size of cipher (Usually the same as the blocksize) */
PHP_FUNCTION(mcrypt_get_iv_size)
@ -970,7 +948,6 @@ PHP_FUNCTION(mcrypt_get_iv_size)
}
/* }}} */
/* {{{ proto string mcrypt_get_cipher_name(string cipher)
Get the key size of cipher */
PHP_FUNCTION(mcrypt_get_cipher_name)
@ -1012,8 +989,7 @@ PHP_FUNCTION(mcrypt_get_cipher_name)
}
/* }}} */
static void php_mcrypt_do_crypt (char* cipher, zval **key, zval **data, char *mode, zval **iv, int argc, int dencrypt, zval* return_value TSRMLS_DC)
static void php_mcrypt_do_crypt (char* cipher, zval **key, zval **data, char *mode, zval **iv, int argc, int dencrypt, zval* return_value TSRMLS_DC) /* {{{ */
{
char *cipher_dir_string;
char *module_dir_string;
@ -1116,6 +1092,7 @@ static void php_mcrypt_do_crypt (char* cipher, zval **key, zval **data, char *mo
}
efree (data_s);
}
/* }}} */
/* {{{ proto string mcrypt_encrypt(string cipher, string key, string data, string mode, string iv)
OFB crypt/decrypt data using key key with cipher cipher starting with iv */
@ -1229,7 +1206,6 @@ PHP_FUNCTION(mcrypt_ofb)
}
/* }}} */
/* {{{ proto string mcrypt_create_iv(int size, int source)
Create an initialization vector (IV) */
PHP_FUNCTION(mcrypt_create_iv)

Write Preview
Loading…
Cancel
Save