diff options
Diffstat (limited to 'ext/mcrypt')
| -rw-r--r-- | ext/mcrypt/mcrypt.c | 4 | ||||
| -rw-r--r-- | ext/mcrypt/mcrypt_filter.c | 4 | ||||
| -rw-r--r-- | ext/mcrypt/php_mcrypt.h | 4 | ||||
| -rw-r--r-- | ext/mcrypt/php_mcrypt_filter.h | 4 | ||||
| -rw-r--r-- | ext/mcrypt/tests/bug43143.phpt | 3 | ||||
| -rw-r--r-- | ext/mcrypt/tests/bug46010.phpt | 2 | ||||
| -rw-r--r-- | ext/mcrypt/tests/bug55169.phpt | 5 |
7 files changed, 15 insertions, 11 deletions
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c index 7e8ef0df9..2b966a18f 100644 --- a/ext/mcrypt/mcrypt.c +++ b/ext/mcrypt/mcrypt.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | + | Copyright (c) 1997-2012 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -16,7 +16,7 @@ | Derick Rethans <derick@derickrethans.nl> | +----------------------------------------------------------------------+ */ -/* $Id: mcrypt.c 313665 2011-07-25 11:42:53Z felipe $ */ +/* $Id: mcrypt.c 321634 2012-01-01 13:15:04Z felipe $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/ext/mcrypt/mcrypt_filter.c b/ext/mcrypt/mcrypt_filter.c index 3a4ea1557..ba7ac76a7 100644 --- a/ext/mcrypt/mcrypt_filter.c +++ b/ext/mcrypt/mcrypt_filter.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | + | Copyright (c) 1997-2012 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -15,7 +15,7 @@ | Author: Sara Golemon <pollita@php.net> | +----------------------------------------------------------------------+ - $Id: mcrypt_filter.c 306939 2011-01-01 02:19:59Z felipe $ + $Id: mcrypt_filter.c 321634 2012-01-01 13:15:04Z felipe $ */ #include "php.h" diff --git a/ext/mcrypt/php_mcrypt.h b/ext/mcrypt/php_mcrypt.h index 30466afb7..3481544df 100644 --- a/ext/mcrypt/php_mcrypt.h +++ b/ext/mcrypt/php_mcrypt.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | + | Copyright (c) 1997-2012 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -16,7 +16,7 @@ | Derick Rethans <derick@derickrethans.nl> | +----------------------------------------------------------------------+ */ -/* $Id: php_mcrypt.h 306939 2011-01-01 02:19:59Z felipe $ */ +/* $Id: php_mcrypt.h 321634 2012-01-01 13:15:04Z felipe $ */ #ifndef PHP_MCRYPT_H #define PHP_MCRYPT_H diff --git a/ext/mcrypt/php_mcrypt_filter.h b/ext/mcrypt/php_mcrypt_filter.h index 38cefebf4..7843c81ee 100644 --- a/ext/mcrypt/php_mcrypt_filter.h +++ b/ext/mcrypt/php_mcrypt_filter.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | + | Copyright (c) 1997-2012 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -15,7 +15,7 @@ | Author: Sara Golemon <pollita@php.net> | +----------------------------------------------------------------------+ - $Id: php_mcrypt_filter.h 306939 2011-01-01 02:19:59Z felipe $ + $Id: php_mcrypt_filter.h 321634 2012-01-01 13:15:04Z felipe $ */ #ifndef PHP_MCRYPT_FILTER_H diff --git a/ext/mcrypt/tests/bug43143.phpt b/ext/mcrypt/tests/bug43143.phpt index 4c390439e..d9fccf3c8 100644 --- a/ext/mcrypt/tests/bug43143.phpt +++ b/ext/mcrypt/tests/bug43143.phpt @@ -1,7 +1,8 @@ --TEST-- Bug #43143 (Warning about empty IV with MCRYPT_MODE_ECB) --SKIPIF-- -<?php if (!extension_loaded("mcrypt")) print "skip"; ?> +<?php if (!extension_loaded("mcrypt")) print "skip"; +if (!extension_loaded("hash")) print "skip"; ?> --FILE-- <?php echo "ECB\n"; diff --git a/ext/mcrypt/tests/bug46010.phpt b/ext/mcrypt/tests/bug46010.phpt index bacfb5975..ddb691e36 100644 --- a/ext/mcrypt/tests/bug46010.phpt +++ b/ext/mcrypt/tests/bug46010.phpt @@ -1,5 +1,7 @@ --TEST-- Bug #46010 (warnings incorrectly generated for iv in ecb mode) +--SKIPIF-- +<?php if (!extension_loaded("mcrypt")) print "skip"; ?> --FILE-- <?php diff --git a/ext/mcrypt/tests/bug55169.phpt b/ext/mcrypt/tests/bug55169.phpt index 7bddd5087..bebcd675c 100644 --- a/ext/mcrypt/tests/bug55169.phpt +++ b/ext/mcrypt/tests/bug55169.phpt @@ -1,8 +1,9 @@ --TEST--
-mcrypt_create_iv
-https://bugs.php.net/bug.php?id=55169
+mcrypt_create_iv https://bugs.php.net/bug.php?id=55169
--CREDIT--
Ryan Biesemeyer <ryan@yaauie.com>
+--SKIPIF--
+<?php if (!extension_loaded("mcrypt")) print "skip"; ?>
--FILE--
<?php
for( $i=1; $i<=64; $i = $i*2 ){
|