cvs: php4 /ext/mcrypt mcrypt.c php_mcrypt.h

derick Sun Sep 23 10:14:28 2001 EDT Modified files: /php4/ext/mcrypt mcrypt.c php_mcrypt.h Log: - Added mcrypt_generic_deinit and added a warning about mcrypt_generic_end being deprecated. - Reordened constants, and added MCRYPT_3DES to the 2.4 set of constants Index: php4/ext/mcrypt/mcrypt.c diff -u php4/ext/mcrypt/mcrypt.c:1.62 php4/ext/mcrypt/mcrypt.c:1.63 --- php4/ext/mcrypt/mcrypt.c:1.62 Sun Sep 9 09:28:55 2001 +++ php4/ext/mcrypt/mcrypt.c Sun Sep 23 10:14:27 2001 @@ -59,6 +59,9 @@ PHP_FE(mcrypt_generic, NULL) PHP_FE(mdecrypt_generic, NULL) PHP_FE(mcrypt_generic_end, NULL) +#if HAVE_MCRYPT_GENERIC_DEINIT + PHP_FE(mcrypt_generic_deinit, NULL) +#endif PHP_FE(mcrypt_enc_self_test, NULL) PHP_FE(mcrypt_enc_is_block_algorithm_mode, NULL) PHP_FE(mcrypt_enc_is_block_algorithm, NULL) @@ -273,40 +276,41 @@ /* ciphers */ #if HAVE_LIBMCRYPT22 - MCRYPT_ENTRY2(BLOWFISH_448); - MCRYPT_ENTRY2(DES); MCRYPT_ENTRY2(3DES); MCRYPT_ENTRY2(3WAY); - MCRYPT_ENTRY2(GOST); - MCRYPT_ENTRY2(SAFER_64); - MCRYPT_ENTRY2(SAFER_128); - MCRYPT_ENTRY2(CAST_128); - MCRYPT_ENTRY2(XTEA); - MCRYPT_ENTRY2(RC2_1024); - MCRYPT_ENTRY2(TWOFISH_128); - MCRYPT_ENTRY2(TWOFISH_192); - MCRYPT_ENTRY2(TWOFISH_256); MCRYPT_ENTRY2(BLOWFISH_128); MCRYPT_ENTRY2(BLOWFISH_192); MCRYPT_ENTRY2(BLOWFISH_256); + MCRYPT_ENTRY2(BLOWFISH_448); + MCRYPT_ENTRY2(CAST_128); MCRYPT_ENTRY2(CAST_256); - MCRYPT_ENTRY2(SAFERPLUS); + MCRYPT_ENTRY2(DES); + MCRYPT_ENTRY2(GOST); + MCRYPT_ENTRY2(IDEA); MCRYPT_ENTRY2(LOKI97); - MCRYPT_ENTRY2(SERPENT_128); - MCRYPT_ENTRY2(SERPENT_192); - MCRYPT_ENTRY2(SERPENT_256); MCRYPT_ENTRY2(RIJNDAEL_128); MCRYPT_ENTRY2(RIJNDAEL_192); MCRYPT_ENTRY2(RIJNDAEL_256); - MCRYPT_ENTRY2(RC2_256); MCRYPT_ENTRY2(RC2_128); - MCRYPT_ENTRY2(RC6_256); - MCRYPT_ENTRY2(IDEA); + MCRYPT_ENTRY2(RC2_256); + MCRYPT_ENTRY2(RC2_1024); + MCRYPT_ENTRY2(RC4); MCRYPT_ENTRY2(RC6_128); MCRYPT_ENTRY2(RC6_192); - MCRYPT_ENTRY2(RC4); + MCRYPT_ENTRY2(RC6_256); + MCRYPT_ENTRY2(SAFER_64); + MCRYPT_ENTRY2(SAFER_128); + MCRYPT_ENTRY2(SAFERPLUS); + MCRYPT_ENTRY2(SERPENT_128); + MCRYPT_ENTRY2(SERPENT_192); + MCRYPT_ENTRY2(SERPENT_256); + MCRYPT_ENTRY2(TWOFISH_128); + MCRYPT_ENTRY2(TWOFISH_192); + MCRYPT_ENTRY2(TWOFISH_256); + MCRYPT_ENTRY2(XTEA); #endif #if HAVE_LIBMCRYPT24 + MCRYPT_ENTRY2_2_4(3DES, "tripledes"); MCRYPT_ENTRY2_2_4(ARCFOUR_IV, "arcfour-iv"); MCRYPT_ENTRY2_2_4(ARCFOUR, "arcfour"); MCRYPT_ENTRY2_2_4(BLOWFISH, "blowfish"); @@ -638,6 +642,7 @@ } /* }}} */ + /* {{{ proto bool mcrypt_generic_end(resource td) This function terminates encrypt specified by the descriptor td */ PHP_FUNCTION(mcrypt_generic_end) @@ -647,6 +652,9 @@ MCRYPT_GET_TD_ARG +#if HAVE_MCRYPT_GENERIC_DEINIT + php_error(E_WARNING, "mcrypt_generic_end is deprecated, please use mcrypt_generic_deinit"); +#endif if (mcrypt_generic_end (td) < 0) { php_error (E_WARNING, "could not terminate encryption specifier"); RETURN_FALSE @@ -654,6 +662,28 @@ RETURN_TRUE } /* }}} */ + + +#if HAVE_MCRYPT_GENERIC_DEINIT + +/* {{{ proto bool mcrypt_generic_deinit(resource td) + This function terminates encrypt specified by the descriptor td */ +PHP_FUNCTION(mcrypt_generic_deinit) +{ + zval **mcryptind; + MCRYPT td; + + MCRYPT_GET_TD_ARG + + if (mcrypt_generic_deinit (td) < 0) { + php_error (E_WARNING, "could not terminate encryption specifier"); + RETURN_FALSE + } + RETURN_TRUE +} +/* }}} */ + +#endif /* {{{ proto bool mcrypt_enc_is_block_algorithm_mode(resource td) Index: php4/ext/mcrypt/php_mcrypt.h diff -u php4/ext/mcrypt/php_mcrypt.h:1.17 php4/ext/mcrypt/php_mcrypt.h:1.18 --- php4/ext/mcrypt/php_mcrypt.h:1.17 Sat Jul 28 07:35:58 2001 +++ php4/ext/mcrypt/php_mcrypt.h Sun Sep 23 10:14:27 2001 @@ -41,6 +41,9 @@ PHP_FUNCTION(mcrypt_generic); PHP_FUNCTION(mdecrypt_generic); PHP_FUNCTION(mcrypt_generic_end); +#if HAVE_MCRYPT_GENERIC_DEINIT +PHP_FUNCTION(mcrypt_generic_deinit); +#endif PHP_FUNCTION(mcrypt_enc_self_test); PHP_FUNCTION(mcrypt_enc_is_block_algorithm_mode); PHP_FUNCTION(mcrypt_enc_is_block_algorithm);