Merge over vendor code.

git-svn-id: http://gallery.svn.sourceforge.net/svnroot/gallery/trunk/eval/gx/gallery3/trunk@18408 57fcd75e-5312-0410-8df3-f5eb6fbb1595

1 files changed, 31 insertions, 0 deletions

diff --git a/kohana/config/encryption.php b/kohana/config/encryption.php
new file mode 100644
index 00000000..a3740b2c
--- /dev/null
+++ b/kohana/config/encryption.php
@@ -0,0 +1,31 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * @package  Encrypt
+ *
+ * Encrypt configuration is defined in groups which allows you to easily switch
+ * between different encryption settings for different uses.
+ * Note: all groups inherit and overwrite the default group.
+ *
+ * Group Options:
+ *  key    - Encryption key used to do encryption and decryption. The default option
+ *           should never be used for a production website.
+ *
+ *           For best security, your encryption key should be at least 16 characters
+ *           long and contain letters, numbers, and symbols.
+ *           @note Do not use a hash as your key. This significantly lowers encryption entropy.
+ *
+ *  mode   - MCrypt encryption mode. By default, MCRYPT_MODE_NOFB is used. This mode
+ *           offers initialization vector support, is suited to short strings, and
+ *           produces the shortest encrypted output.
+ *           @see http://php.net/mcrypt
+ *
+ *  cipher - MCrypt encryption cipher. By default, the MCRYPT_RIJNDAEL_128 cipher is used.
+ *           This is also known as 128-bit AES.
+ *           @see http://php.net/mcrypt
+ */
+$config['default'] = array
+(
+	'key'    => 'K0H@NA+PHP_7hE-SW!FtFraM3w0R|<',
+	'mode'   => MCRYPT_MODE_NOFB,
+	'cipher' => MCRYPT_RIJNDAEL_128
+);