[PHP4BETA] CVS update: php4/ext/mcrypt

Date: Saturday May 1, 1999 @ 10:41 Author: sas Update of /repository/php4/ext/mcrypt In directory php:/tmp/cvs-serv27129/ext/mcrypt Modified Files: mcrypt.c php_mcrypt.h Log Message: func name changes, remove arbitrary limit Index: php4/ext/mcrypt/mcrypt.c diff -u php4/ext/mcrypt/mcrypt.c:1.13 php4/ext/mcrypt/mcrypt.c:1.14 --- php4/ext/mcrypt/mcrypt.c:1.13 Sat May 1 07:14:22 1999 +++ php4/ext/mcrypt/mcrypt.c Sat May 1 10:41:46 1999 @@ -43,7 +43,7 @@ PHP_FE(mcrypt_cbc, NULL) PHP_FE(mcrypt_cfb, NULL) PHP_FE(mcrypt_ofb, NULL) - PHP_FE(mcrypt_get_algorithms_name, NULL) + PHP_FE(mcrypt_get_cipher_name, NULL) PHP_FE(mcrypt_get_block_size, NULL) PHP_FE(mcrypt_get_key_size, NULL) PHP_FE(mcrypt_create_iv, NULL) @@ -215,9 +215,9 @@ RETURN_STRINGL(iv, size->value.lval, 0); } -/* proto mcrypt_get_algorithms_name(int cipher) +/* proto mcrypt_get_cipher_name(int cipher) get the name of cipher */ -PHP_FUNCTION(mcrypt_get_algorithms_name) +PHP_FUNCTION(mcrypt_get_cipher_name) { pval *cipher; char *str, *nstr; @@ -322,15 +322,14 @@ } MCRYPT_CONVERT; MCRYPT_SIZE; - if(ac > 4 && mode == 0) { + if(ac > 4) { MCRYPT_CHECK_IV; } td = init_mcrypt_cbc(cipher->value.lval, key->value.str.val, key->value.str.len); MCRYPT_CHECK_TD_CPY; - /* iv may be only used in encryption */ - if(ac > 4 && mode == 0) { + if(ac > 4) { mcrypt(td, iv->value.str.val); } Index: php4/ext/mcrypt/php_mcrypt.h diff -u php4/ext/mcrypt/php_mcrypt.h:1.8 php4/ext/mcrypt/php_mcrypt.h:1.9 --- php4/ext/mcrypt/php_mcrypt.h:1.8 Sat May 1 07:14:22 1999 +++ php4/ext/mcrypt/php_mcrypt.h Sat May 1 10:41:46 1999 @@ -16,7 +16,7 @@ PHP_FUNCTION(mcrypt_cbc); PHP_FUNCTION(mcrypt_cfb); PHP_FUNCTION(mcrypt_ofb); -PHP_FUNCTION(mcrypt_get_algorithms_name); +PHP_FUNCTION(mcrypt_get_cipher_name); PHP_FUNCTION(mcrypt_get_block_size); PHP_FUNCTION(mcrypt_get_key_size); PHP_FUNCTION(mcrypt_create_iv); -- PHP 4 Beta