From 9bc1af1e5855c8cfc6886b5aaedbcb86a2ef42d7 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikic@php.net>
Date: Mon, 13 Aug 2012 21:44:50 +0200
Subject: Rename mcrypt_cbf -> mcrypt_cfb

Also fix ECB -> CFB in the initialization vector size call (not that it
makes a difference, they have the same size).
---
 ext/mcrypt/tests/mcrypt_cbf.phpt | 23 -----------------------
 ext/mcrypt/tests/mcrypt_cfb.phpt | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 ext/mcrypt/tests/mcrypt_cbf.phpt
 create mode 100644 ext/mcrypt/tests/mcrypt_cfb.phpt

(limited to 'ext/mcrypt')

diff --git a/ext/mcrypt/tests/mcrypt_cbf.phpt b/ext/mcrypt/tests/mcrypt_cbf.phpt
deleted file mode 100644
index 8ec3cd7d3e..0000000000
--- a/ext/mcrypt/tests/mcrypt_cbf.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-mcrypt_cbf
---SKIPIF--
-<?php if (!extension_loaded("mcrypt")) print "skip"; ?>
---FILE--
-<?php
-$key      = "FooBar";
-$secret   = "PHP Testfest 2008";
-$cipher   = MCRYPT_RIJNDAEL_128;
-
-$iv       = mcrypt_create_iv(mcrypt_get_iv_size($cipher, MCRYPT_MODE_ECB), MCRYPT_RAND);
-$enc_data = mcrypt_cfb($cipher, $key, $secret, MCRYPT_ENCRYPT, $iv);
-
-// we have to trim as AES rounds the blocks and decrypt doesnt detect that
-echo trim(mcrypt_cfb($cipher, $key, $enc_data, MCRYPT_DECRYPT, $iv)) . "\n";
-
-// a warning must be issued if we don't use a IV on a AES cipher, that usually requires an IV
-mcrypt_cfb($cipher, $key, $enc_data, MCRYPT_DECRYPT);
-
---EXPECTF--
-PHP Testfest 2008
-
-Warning: mcrypt_cfb(): Attempt to use an empty IV, which is NOT recommend in %s on line %d
\ No newline at end of file
diff --git a/ext/mcrypt/tests/mcrypt_cfb.phpt b/ext/mcrypt/tests/mcrypt_cfb.phpt
new file mode 100644
index 0000000000..54919c8589
--- /dev/null
+++ b/ext/mcrypt/tests/mcrypt_cfb.phpt
@@ -0,0 +1,23 @@
+--TEST--
+mcrypt_cfb
+--SKIPIF--
+<?php if (!extension_loaded("mcrypt")) print "skip"; ?>
+--FILE--
+<?php
+$key      = "FooBar";
+$secret   = "PHP Testfest 2008";
+$cipher   = MCRYPT_RIJNDAEL_128;
+
+$iv       = mcrypt_create_iv(mcrypt_get_iv_size($cipher, MCRYPT_MODE_CFB), MCRYPT_RAND);
+$enc_data = mcrypt_cfb($cipher, $key, $secret, MCRYPT_ENCRYPT, $iv);
+
+// we have to trim as AES rounds the blocks and decrypt doesnt detect that
+echo trim(mcrypt_cfb($cipher, $key, $enc_data, MCRYPT_DECRYPT, $iv)) . "\n";
+
+// a warning must be issued if we don't use a IV on a AES cipher, that usually requires an IV
+mcrypt_cfb($cipher, $key, $enc_data, MCRYPT_DECRYPT);
+
+--EXPECTF--
+PHP Testfest 2008
+
+Warning: mcrypt_cfb(): Attempt to use an empty IV, which is NOT recommend in %s on line %d
-- 
cgit v1.2.1